diff --git a/cachestore/bdbje/pom.xml b/cachestore/bdbje/pom.xml
index ffe789947b5a..fd663a2810fe 100644
--- a/cachestore/bdbje/pom.xml
+++ b/cachestore/bdbje/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -60,4 +36,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/cassandra/pom.xml b/cachestore/cassandra/pom.xml
index 7f13f0afd4ea..c745346d2427 100644
--- a/cachestore/cassandra/pom.xml
+++ b/cachestore/cassandra/pom.xml
@@ -1,33 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-cachestore-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0.CR2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>infinispan-cachestore-cassandra</artifactId>
@@ -95,4 +72,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/cloud/pom.xml b/cachestore/cloud/pom.xml
index 8a7736e339c7..a509be5fde5b 100644
--- a/cachestore/cloud/pom.xml
+++ b/cachestore/cloud/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-cloud</artifactId>
@@ -57,8 +33,8 @@
          <version>${version.jclouds}</version>
       </dependency>
 
-      <!-- =========================================================== -->
-      <!-- optional cloud provider plug-ins.  You'd need at least one! -->
+      
+      
       <dependency>
          <groupId>org.jclouds</groupId>
          <artifactId>jclouds-allblobstore</artifactId>
@@ -66,7 +42,7 @@
          <optional>true</optional>
       </dependency>
 
-      <!-- =========================================================== -->
+      
 
       <dependency>
          <groupId>org.apache.commons</groupId>
@@ -128,4 +104,4 @@
          </properties>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/jdbc/pom.xml b/cachestore/jdbc/pom.xml
index e189c2bc61f0..a1bca80e6d95 100644
--- a/cachestore/jdbc/pom.xml
+++ b/cachestore/jdbc/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -52,7 +28,7 @@
          <scope>test</scope>
       </dependency>
 
-      <!-- for testing against MySQL -->
+      
       <dependency>
          <groupId>mysql</groupId>
          <artifactId>mysql-connector-java</artifactId>
@@ -77,4 +53,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/jdbm/pom.xml b/cachestore/jdbm/pom.xml
index d1f89d3dc4e3..28ac3a5b1ced 100755
--- a/cachestore/jdbm/pom.xml
+++ b/cachestore/jdbm/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-jdbm</artifactId>
@@ -40,7 +16,7 @@
 
    <dependencies>
       <dependency>
-         <!-- Contains fixes not officially released by JDBM group -->
+         
          <groupId>org.apache.directory.server</groupId>
          <artifactId>apacheds-jdbm</artifactId>
          <version>${version.apacheds.jdbm}</version>
@@ -73,4 +49,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/pom.xml b/cachestore/pom.xml
index 020c63b7bd9c..03e94f138f66 100644
--- a/cachestore/pom.xml
+++ b/cachestore/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-parent</artifactId>
@@ -50,4 +26,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/remote/pom.xml b/cachestore/remote/pom.xml
index d3834f8f56ba..94528b374251 100644
--- a/cachestore/remote/pom.xml
+++ b/cachestore/remote/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-remote</artifactId>
@@ -87,4 +63,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cdi/extension/pom.xml b/cdi/extension/pom.xml
index 2b460c3c895a..77d5df4f78d5 100644
--- a/cdi/extension/pom.xml
+++ b/cdi/extension/pom.xml
@@ -1,36 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -40,7 +16,7 @@
    <description>Infinispan CDI support module</description>
 
    <properties>
-      <!-- version of slf4j needed by Weld -->
+      
       <version.slf4j>1.5.10</version.slf4j>
       <version.testng.arquillian>5.14.6</version.testng.arquillian>
    </properties>
@@ -87,14 +63,14 @@
          <version>${project.version}</version>
       </dependency>
 
-      <!-- Logging dependency -->
+      
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
          <version>${version.jboss.logging}</version>
       </dependency>
 
-      <!-- Test dependencies -->
+      
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
@@ -141,7 +117,7 @@
    </dependencies>
    <build>
       <plugins>
-         <!-- Disable parallel execution of tests ARQ-127 -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -241,4 +217,4 @@
          </dependencies>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/cdi/tck-runner/pom.xml b/cdi/tck-runner/pom.xml
index ef43e76e4f79..d1c022edf80c 100644
--- a/cdi/tck-runner/pom.xml
+++ b/cdi/tck-runner/pom.xml
@@ -1,36 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -54,7 +30,7 @@
    </developers>
 
    <dependencies>
-      <!-- JCache annotations implementation -->
+      
       <dependency>
          <groupId>org.infinispan</groupId>
          <artifactId>infinispan-cdi</artifactId>
@@ -62,7 +38,7 @@
          <scope>test</scope>
       </dependency>
 
-      <!-- JCache TCK -->
+      
       <dependency>
          <groupId>javax.cache</groupId>
          <artifactId>cache-tests</artifactId>
@@ -86,7 +62,7 @@
    </dependencies>
    <build>
       <plugins>
-         <!-- Unpack JCache TCK classes -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -102,7 +78,7 @@
             <configuration>
                <includeArtifactIds>cache-tests</includeArtifactIds>
                <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-               <!-- Remove other files packaged with the TCK (e.g. beans.xml) -->
+               
                <includes>**/*.class</includes>
             </configuration>
          </plugin>
@@ -129,4 +105,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/client/hotrod-client/pom.xml b/client/hotrod-client/pom.xml
index 7ac958944cc5..1e40ba5a953c 100644
--- a/client/hotrod-client/pom.xml
+++ b/client/hotrod-client/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -109,4 +85,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 5f460d63914e..ea08f76f39cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,35 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -49,10 +25,7 @@
          <version>${version.jgroups}</version>
       </dependency>
 
-      <!--
-         For the JTA 1.1 API; consuming projects can safely
-         exclude this and replace with any valid source of this API, such as a Java EE app server. 
-         -->
+      
       <dependency>
          <groupId>org.jboss.javaee</groupId>
          <artifactId>jboss-transaction-api</artifactId>
@@ -157,11 +130,7 @@
    </dependencies>
    <build>
       <plugins>
-         <!--
-        Generates XML schema for Infinispan configuration files
-        Run with mvn exec:java
-        For more details see:
-        http://mojo.codehaus.org/exec-maven-plugin/usage.html -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -185,7 +154,7 @@
       <pluginManagement>
          <plugins>
             <plugin>
-               <!-- This plugin's configuration is used in m2e only. -->
+               
                <groupId>org.eclipse.m2e</groupId>
                <artifactId>lifecycle-mapping</artifactId>
                <version>1.0.0</version>
@@ -202,7 +171,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -219,7 +188,7 @@
                                 </goals>
                             </pluginExecutionFilter>
                             <action>
-                                <ignore></ignore>
+                                <ignore />
                             </action>
                         </pluginExecution>
                      </pluginExecutions>
@@ -229,4 +198,4 @@
          </plugins>
       </pluginManagement>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/core/src/main/java/org/infinispan/Version.java b/core/src/main/java/org/infinispan/Version.java
index 2738a3bc13f9..86fb8f3d9629 100644
--- a/core/src/main/java/org/infinispan/Version.java
+++ b/core/src/main/java/org/infinispan/Version.java
@@ -38,8 +38,8 @@ public class Version {
    private static final String MAJOR = "5";
    private static final String MINOR = "1";
    private static final String MICRO = "0";
-   private static final String MODIFIER = "SNAPSHOT";
-   private static final boolean SNAPSHOT = true;
+   private static final String MODIFIER = "CR2";
+   private static final boolean SNAPSHOT = false;
 
    public static String VERSION = String.format("%s.%s.%s%s%s", MAJOR, MINOR, MICRO, SNAPSHOT ? "-" : ".", MODIFIER);
    public static String CODENAME = "Brahma";
diff --git a/demos/directory/pom.xml b/demos/directory/pom.xml
index cccc19315164..bb88ec92b18d 100644
--- a/demos/directory/pom.xml
+++ b/demos/directory/pom.xml
@@ -1,35 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -66,4 +42,4 @@
       </dependency>
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/distexec/pom.xml b/demos/distexec/pom.xml
index c9f0ae27e106..a7aeed4030be 100644
--- a/demos/distexec/pom.xml
+++ b/demos/distexec/pom.xml
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0.CR2</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -52,4 +52,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/ec2-ui/pom.xml b/demos/ec2-ui/pom.xml
index 24cf31d6f9dc..8c8ba8aade05 100644
--- a/demos/ec2-ui/pom.xml
+++ b/demos/ec2-ui/pom.xml
@@ -1,33 +1,11 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0.CR2</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
@@ -75,4 +53,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/ec2/pom.xml b/demos/ec2/pom.xml
index 02ce67985abe..dc1c3d6930c8 100644
--- a/demos/ec2/pom.xml
+++ b/demos/ec2/pom.xml
@@ -1,33 +1,11 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0.CR2</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
@@ -85,4 +63,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/gridfs-webdav/pom.xml b/demos/gridfs-webdav/pom.xml
index 7a8b913efff0..ea0ec9dc40c3 100644
--- a/demos/gridfs-webdav/pom.xml
+++ b/demos/gridfs-webdav/pom.xml
@@ -1,33 +1,11 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -49,7 +27,7 @@
          <version>${version.webdav.servlet}</version>
       </dependency>
 
-      <!-- required by Webdav-Servlet -->
+      
       <dependency>
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
@@ -60,4 +38,4 @@
 
 
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/gui/pom.xml b/demos/gui/pom.xml
index 9c73cd374989..880c814847da 100644
--- a/demos/gui/pom.xml
+++ b/demos/gui/pom.xml
@@ -1,35 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -75,4 +51,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/lucene-directory-demo/pom.xml b/demos/lucene-directory-demo/pom.xml
index ea30591bd9cc..1d4ec1700436 100644
--- a/demos/lucene-directory-demo/pom.xml
+++ b/demos/lucene-directory-demo/pom.xml
@@ -1,34 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -54,7 +31,7 @@
    <build>
       <plugins>
       
-         <!-- Creates executable scripts -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>appassembler-maven-plugin</artifactId>
@@ -71,7 +48,7 @@
             </configuration>
          </plugin>
          
-         <!-- Testing Configuration -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -97,4 +74,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/nearcache-client/pom.xml b/demos/nearcache-client/pom.xml
index a6cb9306666c..17f49a541410 100644
--- a/demos/nearcache-client/pom.xml
+++ b/demos/nearcache-client/pom.xml
@@ -1,30 +1,11 @@
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -99,15 +80,8 @@
 
       <dependencyManagement>
       <dependencies>
-         <!-- Define the version of JBoss' Java EE 6 APIs we want to use -->
-         <!-- JBoss distributes a complete set of Java EE 6 APIs including
-            a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
-            a collection) of artifacts. We use this here so that we always get the correct
-            versions of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can
-            read this as the JBoss stack of the Java EE 6 Web Profile APIs), and we use
-            version 2.0.0.Final which is the latest release of the stack. You can actually
-            use this stack with any version of JBoss AS that implements Java EE 6, not
-            just JBoss AS 7! -->
+         
+         
          <dependency>
             <groupId>org.jboss.spec</groupId>
             <artifactId>jboss-javaee-web-6.0</artifactId>
@@ -116,7 +90,7 @@
             <scope>import</scope>
          </dependency>
 
-         <!-- Define the versions of Arquillian dependencies we want to use -->
+         
          <dependency>
             <groupId>org.jboss.arquillian</groupId>
             <artifactId>arquillian-bom</artifactId>
@@ -128,15 +102,14 @@
    </dependencyManagement>
 
    <build>
-      <!-- Set the name of the war, used as the context root when the app
-         is deployed -->
+      
       <finalName>infinispan-nearcache</finalName>
       <plugins>
          <plugin>
             <artifactId>maven-war-plugin</artifactId>
             <version>2.1.1</version>
             <configuration>
-               <!-- No web.xml needed in Java EE 6 -->
+               
                <failOnMissingWebXml>false</failOnMissingWebXml>
                <archive>
                   <manifest>
@@ -146,7 +119,7 @@
             </configuration>
          </plugin>
 
-         <!-- JBoss AS plugin to deploy war -->
+         
          <plugin>
             <groupId>org.jboss.as.plugins</groupId>
             <artifactId>jboss-as-maven-plugin</artifactId>
@@ -156,8 +129,7 @@
             </configuration>
          </plugin>
 
-         <!-- Compiler plugin enforces Java 1.6 compatibility and activates
-            annotation processors -->
+         
          <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <version>2.3.2</version>
@@ -169,4 +141,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/nearcache/pom.xml b/demos/nearcache/pom.xml
index 644dce404340..a64acbe5b5ab 100644
--- a/demos/nearcache/pom.xml
+++ b/demos/nearcache/pom.xml
@@ -1,30 +1,11 @@
-<!--
-  ~ Copyright 2011 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this library; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -60,7 +41,7 @@
          <version>${version.netty}</version>
       </dependency>
 
-      <!-- HornetQ dependencies -->
+      
       <dependency>
           <groupId>org.hornetq</groupId>
           <artifactId>hornetq-bootstrap</artifactId>
@@ -105,4 +86,4 @@
 
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/license/pom.xml b/license/pom.xml
index 89d6c9b49a41..a1eb6bd82530 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <version>2-SNAPSHOT</version>
+   <version>5.1.0.CR2</version>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-license</artifactId>
@@ -28,7 +28,7 @@
       </plugins>
       <pluginManagement>
          <plugins>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            
             <plugin>
                <groupId>org.eclipse.m2e</groupId>
                <artifactId>lifecycle-mapping</artifactId>
@@ -50,7 +50,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                      </pluginExecutions>
@@ -61,7 +61,7 @@
       </pluginManagement>
    </build>
    
-   <!-- SCM and Distribution Management -->
+   
 
    <scm>
       <connection>scm:git:git://github.com/infinispan/infinispan.git</connection>
@@ -83,4 +83,4 @@
    </distributionManagement>
    
 
-</project>
+</project>
\ No newline at end of file
diff --git a/lucene-directory/pom.xml b/lucene-directory/pom.xml
index 89376a57194a..409e319e8e99 100644
--- a/lucene-directory/pom.xml
+++ b/lucene-directory/pom.xml
@@ -1,34 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -116,4 +93,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index 185dca3ca9f5..0d0c2fb91ba8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,32 +1,9 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-parent</artifactId>
-   <version>5.1.0-SNAPSHOT</version>
+   <version>5.1.0.CR2</version>
    <name>Infinispan Common Parent</name>
    <description>Infinispan common parent POM module</description>
    <url>http://www.infinispan.org</url>
@@ -100,7 +77,7 @@
       <packaging>jar</packaging>
       <module.skipComponentMetaDataProcessing>true</module.skipComponentMetaDataProcessing>
       <module.metadata.isCoreModule>false</module.metadata.isCoreModule>
-      <!-- Versions for dependencies -->
+      
       <version.apacheds.jdbm>1.5.7</version.apacheds.jdbm>
       <version.arquillian>1.0.0.CR5</version.arquillian>
       <version.arquillian.container.weld>1.0.0.CR2</version.arquillian.container.weld>
@@ -164,13 +141,7 @@
       <version.org.codehaus.woodstox.woodstox-core-asl>4.1.1</version.org.codehaus.woodstox.woodstox-core-asl>
       <version.org.jboss.staxmapper>1.0.0.Final</version.org.jboss.staxmapper>
       
-      <!-- 
-         The Felix Bundle plugin used has an incompatibility with Maven's Source plugin. 
-         Hence this workaround to use an older version of the Bundle plugin.  See
-
-            http://comments.gmane.org/gmane.comp.apache.felix.devel/22887
-
-         for details. -->
+      
       <version.maven.bundle>2.3.4</version.maven.bundle>
       <version.maven.source>2.1.2</version.maven.source>
    </properties>
@@ -373,12 +344,7 @@
          <version>${version.jboss.logging.processor}</version>
          <scope>provided</scope>
       </dependency>
-      <!-- As of v3.0.4, the RHQ annotations have a retention policy of COMPILE,
-           which means they are no longer required at runtime. However, 
-           because of a Sun compiler bug http://bugs.sun.com/view_bug.do?bug_id=6550655
-           it still needs to be present when using the Infinispan artifacts. This
-           doesn't happen when using Java 7. Please add exclusions accordingly
-           if you don't want to pull this in -->
+      
       <dependency>
          <groupId>org.rhq.helpers</groupId>
          <artifactId>rhq-pluginAnnotations</artifactId>
@@ -391,7 +357,7 @@
          </exclusions>
       </dependency>
 
-      <!-- used to serialize non-serializable objects for a dummy marshaller -->
+      
       <dependency>
          <groupId>com.thoughtworks.xstream</groupId>
          <artifactId>xstream</artifactId>
@@ -416,7 +382,7 @@
       <directory>${buildDirectory}</directory>
 
       <plugins>
-         <!-- by default, compile to JDK 1.6 compatibility (individual modules and/or user can override) -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
@@ -429,7 +395,7 @@
             </configuration>
          </plugin>
 
-         <!-- Scan module for components and persist these into a data file, for use at runtime -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -456,7 +422,7 @@
             </executions>
          </plugin>
 
-         <!-- Copy the resulting persisted metadata into the build directory for packaging into the jar -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -471,7 +437,7 @@
                   <configuration>
                      <skip>${module.skipComponentMetaDataProcessing}</skip>
                      <tasks>
-                        <copy file="${basedir}/src/main/resources/${artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}"/>
+                        <copy file="${basedir}/src/main/resources/${artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}" />
                      </tasks>
                   </configuration>
                </execution>
@@ -493,7 +459,7 @@
             </configuration>
          </plugin>
 
-         <!-- ensure parallel test execution -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -527,7 +493,7 @@
                <argLine>-Xmx1024m -XX:MaxPermSize=1024m</argLine>
             </configuration>
          </plugin>
-         <!-- eclipse project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-eclipse-plugin</artifactId>
@@ -537,7 +503,7 @@
                <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
             </configuration>
          </plugin>
-         <!-- IntelliJ project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-idea-plugin</artifactId>
@@ -649,7 +615,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-pmd-plugin</artifactId>
-               <!-- See also reporting plugins -->
+               
                <version>2.6</version>
                <configuration>
                   <minimumTokens>100</minimumTokens>
@@ -658,7 +624,7 @@
                   <sourceEncoding>utf-8</sourceEncoding>
                </configuration>
             </plugin>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            
             <plugin>
                <groupId>org.eclipse.m2e</groupId>
                <artifactId>lifecycle-mapping</artifactId>
@@ -676,7 +642,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -689,7 +655,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -702,7 +668,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -715,7 +681,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -729,7 +695,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -744,7 +710,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                      </pluginExecutions>
@@ -762,7 +728,7 @@
             <artifactId>maven-surefire-report-plugin</artifactId>
             <version>2.4.3-JBOSS</version>
          </plugin>
-         <!-- Findbugs report -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
@@ -773,11 +739,11 @@
                <xmlOutputDirectory>target</xmlOutputDirectory>
             </configuration>
          </plugin>
-         <!-- PMD report -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-pmd-plugin</artifactId>
-            <!-- Needs to be re-defined and configured in pluginManagement section -->
+            
             <version>2.6</version>
          </plugin>
       </plugins>
@@ -830,12 +796,12 @@
             <activeByDefault>true</activeByDefault>
          </activation>
          <properties>
-            <!-- By default create OSGI bundles -->
+            
             <packaging>bundle</packaging>
          </properties>
          <build>
             <plugins>
-               <!-- enforce java 1.6 and maven 2.1.0 -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-enforcer-plugin</artifactId>
@@ -859,7 +825,7 @@
                      </execution>
                   </executions>
                </plugin>
-               <!-- Make sure we generate src jars too -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-source-plugin</artifactId>
@@ -921,7 +887,7 @@
          </properties>
       </profile>
       <profile>
-         <!-- we are still likely compatible with the 2.9.x Lucene version: test for that -->
+         
          <id>useOlderLuceneVersion</id>
          <activation>
             <activeByDefault>false</activeByDefault>
@@ -947,8 +913,7 @@
          </activation>
          <build>
             <plugins>
-               <!-- Redefine surefire plugin to avoid external log4j settings
-               not being discovered when passed as command line arguments -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-surefire-plugin</artifactId>
@@ -993,4 +958,4 @@
          </properties>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7b6df67cb92f..daf1206bae0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,35 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>parent/pom.xml</relativePath>
    </parent>
 
@@ -100,9 +76,7 @@
                         </goals>
                         <configuration>
                            <quiet>true</quiet>
-                           <!-- In case you anyone needs to trace javadoc issues
-                           <additionalJOption>-J-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</additionalJOption>
-                           -->
+                           
                            <stylesheetfile>${basedir}/src/javadoc/stylesheet.css</stylesheetfile>
                            <javadocDirectory>${basedir}/src/javadoc</javadocDirectory>
                            <docfilessubdirs>true</docfilessubdirs>
@@ -110,20 +84,20 @@
                               <link>http://java.sun.com/javase/6/docs/api/</link>
                               <link>http://java.sun.com/javaee/5/docs/api/</link>
                            </links>
-                           <footer><![CDATA[
--->
-                      <!-- Google Analytics -->
-<!--
-<script type='text/javascript'>
+                           <footer>
+--&gt;
+                      &lt;!-- Google Analytics --&gt;
+&lt;!--
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-                     ]]></footer>
+} catch(err) {}&lt;/script&gt;
+                     </footer>
                         </configuration>
                      </execution>
                   </executions>
@@ -162,7 +136,7 @@ pageTracker._trackPageview();
                      <outputDirectory>${buildDirectory}/distribution</outputDirectory>
                      <workDirectory>${buildDirectory}/assembly/work</workDirectory>
 
-                     <!-- Do not attach ZIP files to the Maven repository -->
+                     
                      <attach>false</attach>
                   </configuration>
                </plugin>
@@ -170,8 +144,7 @@ pageTracker._trackPageview();
          </build>
       </profile>
 
-      <!-- This profile is an scaled down version of the distribution profile which should only be used to speed up
-      testing of distribution zip files. It doesn't generate any documentation and only generates the -all.zip distribution -->
+      
       <profile>
          <id>minimal-distribution</id>
          <activation>
@@ -218,7 +191,7 @@ pageTracker._trackPageview();
          </build>
       </profile>
 
-      <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+      
       <profile>
          <id>jmxdoc</id>
          <activation>
@@ -239,18 +212,18 @@ pageTracker._trackPageview();
                         <artifactId>infinispan-tools</artifactId>
                         <version>${project.version}</version>
                      </docletArtifact>
-                     <footer><![CDATA[
-                <!-- Google Analytics -->
-<script type='text/javascript'>
+                     <footer>
+                &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-               ]]></footer>
+} catch(err) {}&lt;/script&gt;
+               </footer>
                   </configuration>
                   <executions>
                      <execution>
@@ -266,7 +239,7 @@ pageTracker._trackPageview();
          </build>
       </profile>
 
-      <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+      
       <profile>
          <id>configdoc</id>
          <activation>
@@ -282,30 +255,24 @@ pageTracker._trackPageview();
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <configuration>
                      <doclet>org.infinispan.tools.doclet.config.ConfigDoclet</doclet>
-                     <!-- To debug config generation, simply uncomment this line
-                     and when the build hangs in the config generation while
-                     building the distribution, add a remote debugger for port 8000.
-
-                     <additionalJOption>-J-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</additionalJOption>
-
-                     -->
+                     
                      <docletArtifact>
                         <groupId>org.infinispan</groupId>
                         <artifactId>infinispan-tools</artifactId>
                         <version>${project.version}</version>
                      </docletArtifact>
-                     <footer><![CDATA[
-                <!-- Google Analytics -->
-<script type='text/javascript'>
+                     <footer>
+                &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-               ]]></footer>
+} catch(err) {}&lt;/script&gt;
+               </footer>
                   </configuration>
                   <executions>
                      <execution>
@@ -330,7 +297,7 @@ pageTracker._trackPageview();
                         </goals>
                         <configuration>
                            <tasks>
-                              <copy file="tools/src/main/resources/stylesheet2.css" todir="${buildDirectory}/site/apidocs"/>
+                              <copy file="tools/src/main/resources/stylesheet2.css" todir="${buildDirectory}/site/apidocs" />
                            </tasks>
                         </configuration>
                      </execution>
@@ -341,4 +308,4 @@ pageTracker._trackPageview();
       </profile>
 
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/query/pom.xml b/query/pom.xml
index c4ccc13838a6..d9a30f8073ea 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -37,7 +13,7 @@
    <name>Infinispan Query API</name>
    <description>Infinispan Query API module</description>
 
-   <!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
+   
    <properties>
       <module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
    </properties>
@@ -92,4 +68,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/rhq-plugin/pom.xml b/rhq-plugin/pom.xml
index c7500e89c32d..1e6e7352a7f4 100644
--- a/rhq-plugin/pom.xml
+++ b/rhq-plugin/pom.xml
@@ -1,36 +1,12 @@
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project
-      xmlns="http://maven.apache.org/POM/4.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-      >
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -74,14 +50,7 @@
          <scope>provided</scope>
       </dependency>
       
-<!--  
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-pluginGen</artifactId>
-         <version>${version.rhq.plugingen}</version>
-         <scope>provided</scope>
-      </dependency>
- -->  
+  
 
       <dependency>
          <groupId>mc4j</groupId>
@@ -90,7 +59,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- TODO: This is beyond horrible.  Surely we don't need these dependencies!! -->
+      
 
       <dependency>
          <groupId>org.hibernate</groupId>
@@ -113,7 +82,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- END unnenessary deps -->
+      
 
       <dependency>
          <groupId>${project.groupId}</groupId>
@@ -181,7 +150,7 @@
                      </goals>
                      <configuration>
                          <artifactItems>
-                             <!-- TODO include other needed external jars that should go into your jar file -->
+                             
                              <artifactItem>
                                  <groupId>org.infinispan</groupId>
                                  <artifactId>infinispan-core</artifactId>
@@ -221,24 +190,7 @@
             </executions>
          </plugin>
          
-         <!--
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-               <execution>
-                  <phase>process-classes</phase>
-                  <goals>
-                     <goal>java</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <mainClass>org.infinispan.rhq.util.RhqPluginDescriptorGenerator</mainClass>
-            </configuration>
-         </plugin>
-         -->
+         
 
       </plugins>
    </build>
@@ -268,11 +220,10 @@
                         <phase>compile</phase>
                         <configuration>
                            <tasks>
-                              <mkdir dir="${rhq.deploymentDir}"/>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <mkdir dir="${rhq.deploymentDir}" />
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Updating ${deployment.file}...</echo>
-                              <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/>
+                              <jar basedir="${project.build.outputDirectory}" destfile="${deployment.file}" />
                            </tasks>
                         </configuration>
                         <goals>
@@ -285,18 +236,14 @@
                         <phase>package</phase>
                         <configuration>
                            <tasks>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Updating META-INF dir in ${deployment.file}...</echo>
-                              <unjar src="${project.build.directory}/${project.build.finalName}.jar"
-                                     dest="${project.build.outputDirectory}">
+                              <unjar dest="${project.build.outputDirectory}" src="${project.build.directory}/${project.build.finalName}.jar">
                                  <patternset>
-                                    <include name="META-INF/**"/>
+                                    <include name="META-INF/**" />
                                  </patternset>
                               </unjar>
-                              <jar destfile="${deployment.file}"
-                                   manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
-                                   update="true">
+                              <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
                               </jar>
                            </tasks>
                         </configuration>
@@ -310,10 +257,9 @@
                         <phase>clean</phase>
                         <configuration>
                            <tasks>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Deleting ${deployment.file}...</echo>
-                              <delete file="${deployment.file}"/>
+                              <delete file="${deployment.file}" />
                            </tasks>
                         </configuration>
                         <goals>
@@ -329,4 +275,4 @@
 
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/core/pom.xml b/server/core/pom.xml
index d73729e78fdc..b5ce359f792b 100644
--- a/server/core/pom.xml
+++ b/server/core/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -37,7 +13,7 @@
    <name>Infinispan Server - Core Components</name>
    <description>Infinispan Server - Core Components</description>
 
-   <!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
+   
    <properties>
       <module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
    </properties>
@@ -106,4 +82,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/hotrod/pom.xml b/server/hotrod/pom.xml
index dc39e6afdc17..4b46339e2aa6 100644
--- a/server/hotrod/pom.xml
+++ b/server/hotrod/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -101,4 +77,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/memcached/pom.xml b/server/memcached/pom.xml
index bfd97fecbe7f..eb08ce3e42aa 100644
--- a/server/memcached/pom.xml
+++ b/server/memcached/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -101,4 +77,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index e1eddb8f42a1..d7f11c6af1b4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    
@@ -57,4 +33,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/rest/pom.xml b/server/rest/pom.xml
index e8a42913f6d4..69afc0e6691b 100644
--- a/server/rest/pom.xml
+++ b/server/rest/pom.xml
@@ -1,33 +1,11 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -120,7 +98,7 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- and now for unit and integration tests -->
+      
       <dependency>
          <groupId>org.mortbay.jetty</groupId>
          <artifactId>jetty-embedded</artifactId>
@@ -136,4 +114,4 @@
       </dependency>
 
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/websocket/pom.xml b/server/websocket/pom.xml
index f0180477784f..8095498beaf4 100644
--- a/server/websocket/pom.xml
+++ b/server/websocket/pom.xml
@@ -1,33 +1,11 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -68,4 +46,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring/pom.xml b/spring/pom.xml
index 546f4c4fee36..7c97926738f0 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -13,7 +14,7 @@
 
    <name>Infinispan Spring Integration</name>
    <description>
-        <![CDATA[
+        
                  The Infinispan Spring Integration project provides Spring 
                  integration for Infinispna, a high performance distributed cache.
                  Its primary features are
@@ -37,12 +38,12 @@
                  In addition, Infinispan Spring Integration offers various FactoryBeans
                  for facilitating creation of Infinispan core classes - Cache, CacheManager,
                  ... - within a Spring context.
-        ]]>
+        
     </description>
 
-	<!-- =================================================== -->
-	<!-- Developers section -->
-	<!-- =================================================== -->
+	
+	
+	
 
    <developers>
       <developer>
@@ -66,27 +67,27 @@
        </developer>
    </developers>
 
-	<!-- =================================================== -->
-	<!-- Global properties -->
-	<!-- =================================================== -->
+	
+	
+	
 
    <properties>
-		<!-- Make the build platform independent: http://maven.apache.org/general.html#encoding-warning -->
+		
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- ######################################################### -->
-		<!-- Dependency versions -->
-		<!-- ######################################################### -->
-		<!-- Spring -->
+		
+		
+		
+		
       <version.spring>3.1.0.RC1</version.spring>
       <version.commons.dbcp>1.4</version.commons.dbcp>
    </properties>
 
-	<!-- =================================================== -->
-	<!-- Project Dependencies -->
-	<!-- =================================================== -->
+	
+	
+	
 
    <dependencies>
-		<!--Compile time dependencies -->
+		
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-context</artifactId>
@@ -99,7 +100,7 @@
          <version>${project.version}</version>
          <scope>compile</scope>
       </dependency>
-      <!-- Made the RHQ dependency non-transitive in case we only need the remote cache -->
+      
       <dependency>
          <groupId>org.rhq.helpers</groupId>
          <artifactId>rhq-pluginAnnotations</artifactId>
@@ -120,7 +121,7 @@
          </exclusions>
       </dependency>
 
-		<!--Runtime dependencies -->
+		
       <dependency>
          <groupId>commons-pool</groupId>
          <artifactId>commons-pool</artifactId>
@@ -177,7 +178,7 @@
          <scope>runtime</scope>
       </dependency>
 
-		<!--Test Dependencies -->
+		
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
@@ -231,9 +232,9 @@
       </dependency>
    </dependencies>
 
-	<!-- =================================================== -->
-	<!-- Project Plugins -->
-	<!-- =================================================== -->
+	
+	
+	
 
    <build>
       <plugins>
@@ -252,4 +253,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/tools/pom.xml b/tools/pom.xml
index e5388434ae2c..e77410aa529b 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,35 +1,11 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -115,4 +91,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/tree/pom.xml b/tree/pom.xml
index d69534f7d097..1cc1514d7c55 100644
--- a/tree/pom.xml
+++ b/tree/pom.xml
@@ -1,34 +1,10 @@
-<?xml version="1.0"?>
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2009 Red Hat Inc. and/or its affiliates and other
-  ~ contributors as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a full listing of
-  ~ individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>5.1.0.CR2</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -76,4 +52,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file