diff --git a/as-modules/pom.xml b/as-modules/pom.xml
index a4d5ea56e5ad..1834436794b4 100644
--- a/as-modules/pom.xml
+++ b/as-modules/pom.xml
@@ -1,10 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -84,4 +84,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/bom/pom.xml b/bom/pom.xml
index 7deb9ee009fc..2133e92d64af 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1,10 +1,9 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-bom</artifactId>
-   <version>6.0.0-SNAPSHOT</version>
+   <version>6.0.0.Alpha4</version>
    <packaging>pom</packaging>
    <name>Infinispan BOM</name>
    <description>Infinispan BOM module</description>
@@ -53,7 +52,7 @@
    </issueManagement>
 
    <properties>
-      <!-- Versions for dependencies -->
+      
       <version.protostream>1.0.0.Alpha4</version.protostream>
       <version.aesh>0.33.1</version.aesh>
       <version.antlr>3.4</version.antlr>
@@ -86,7 +85,7 @@
 
    <dependencyManagement>
       <dependencies>
-         <!-- Infinispan module versions -->
+         
          <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>infinispan-cachestore-jdbc</artifactId>
@@ -188,7 +187,7 @@
             <artifactId>infinispan-jcache</artifactId>
             <version>${project.version}</version>
          </dependency>
-         <!-- Infinispan core modules dependencies -->
+         
          <dependency>
             <groupId>gnu-getopt</groupId>
             <artifactId>getopt</artifactId>
@@ -239,7 +238,7 @@
             <artifactId>org.osgi.core</artifactId>
             <version>${version.osgi}</version>
          </dependency>
-         <!-- Infinispan RHQ module dependencies -->
+         
          <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-domain</artifactId>
@@ -271,7 +270,7 @@
             <artifactId>rhq-core-native-system</artifactId>
             <version>${version.rhq}</version>
          </dependency>
-         <!-- Infinispan Query module dependencies -->
+         
          <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search-engine</artifactId>
@@ -287,7 +286,7 @@
             <artifactId>hibernate-search-infinispan</artifactId>
             <version>${version.hibernate.search}</version>
          </dependency>
-         <!-- Infinispan Remote Query module dependencies -->
+         
          <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream</artifactId>
@@ -298,7 +297,7 @@
             <artifactId>sample-domain-implementation</artifactId>
             <version>${version.protostream}</version>
          </dependency>
-         <!-- Infinispan Protocols module dependencies -->
+         
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
@@ -316,5 +315,4 @@
          </dependency>
       </dependencies>
    </dependencyManagement>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/cachestore/jdbc/pom.xml b/cachestore/jdbc/pom.xml
index 91c53583f913..4e0225ad2b18 100644
--- a/cachestore/jdbc/pom.xml
+++ b/cachestore/jdbc/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -28,7 +26,7 @@
          <scope>test</scope>
       </dependency>
 
-      <!-- for testing against MySQL -->
+      
       <dependency>
          <groupId>mysql</groupId>
          <artifactId>mysql-connector-java</artifactId>
@@ -52,9 +50,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <!-- Run the test with a single thread, otherwise the suite might hang due to a
-            concurrency issue in c3p0: https://sourceforge.net/p/c3p0/bugs/119/. Once this is fixed
-             this can be switched back to parallel execution -->
+            
             <configuration>
                <threadCount>1</threadCount>
             </configuration>
@@ -62,4 +58,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/cachestore/pom.xml b/cachestore/pom.xml
index e0122ce9ef8e..121883b43bde 100644
--- a/cachestore/pom.xml
+++ b/cachestore/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-parent</artifactId>
@@ -26,4 +24,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 6f192dadad0b..5776690fa8a2 100644
--- a/cachestore/remote/pom.xml
+++ b/cachestore/remote/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-remote</artifactId>
@@ -59,4 +57,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 0cc94ac6dcb6..d4c85f0762f4 100644
--- a/cdi/extension/pom.xml
+++ b/cdi/extension/pom.xml
@@ -1,14 +1,12 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -32,15 +30,15 @@
       </developer>
    </developers>
 
-   <!--<properties>-->
-      <!--&lt;!&ndash; Version 0.6 version has this issue:-->
-      <!--https://github.com/jsr107/jsr107spec/pull/59-->
+   
+      
+      
 
-      <!--Upgrade to 0.6 once that issue has been fixed-->
-      <!--See https://issues.jboss.org/browse/ISPN-2855-->
-      <!--&ndash;&gt;-->
-      <!--<version.javax.cache>0.4</version.javax.cache>-->
-   <!--</properties>-->
+      
+      
+      
+      
+   
 
    <dependencies>
       <dependency>
@@ -64,13 +62,13 @@
          <artifactId>infinispan-jcache</artifactId>
       </dependency>
 
-      <!-- Logging dependency -->
+      
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
       </dependency>
 
-      <!-- Test dependencies -->
+      
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
@@ -117,7 +115,7 @@
    </dependencies>
    <build>
       <plugins>
-         <!-- Disable parallel execution of tests ARQ-127 -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -214,4 +212,4 @@
          </dependencies>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/cli/cli-client/pom.xml b/cli/cli-client/pom.xml
index a37175c3025d..05187ad2d0f5 100644
--- a/cli/cli-client/pom.xml
+++ b/cli/cli-client/pom.xml
@@ -1,10 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -67,4 +67,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cli/cli-server/pom.xml b/cli/cli-server/pom.xml
index 666af1d075fe..22c92473d7d3 100644
--- a/cli/cli-server/pom.xml
+++ b/cli/cli-server/pom.xml
@@ -1,10 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -13,7 +13,7 @@
    <name>Infinispan CLI Server</name>
    <description>Infinispan CLI Server 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>
@@ -113,4 +113,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 612e88990deb..f1c858e9f5ed 100644
--- a/client/hotrod-client/pom.xml
+++ b/client/hotrod-client/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -102,4 +100,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/commons/pom.xml b/commons/pom.xml
index 9424a31ffab3..c4d281215f64 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -1,13 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -41,7 +38,7 @@
 
    <build>
       <plugins>
-         <!-- compiler to use -XDignore.symbol.file to suppress warnings regarding the use of sun.misc.Unsafe -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
@@ -52,7 +49,7 @@
                <encoding>UTF-8</encoding>
                <compilerArgument>-AtranslationFilesPath=${project.basedir}/target/generated-translation-files</compilerArgument>
                <compilerArgument>-XDignore.symbol.file</compilerArgument>
-               <!-- Forking is necessary to allow for the compiler args to be picked up. -->
+               
                <fork>true</fork>
             </configuration>
          </plugin>
@@ -69,5 +66,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index fd25cac0efc9..49d768957acc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -31,10 +29,7 @@
          <artifactId>jgroups</artifactId>
       </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.spec.javax.transaction</groupId>
          <artifactId>jboss-transaction-api_1.1_spec</artifactId>
@@ -96,7 +91,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>
@@ -113,7 +108,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -130,7 +125,7 @@
                                 </goals>
                             </pluginExecutionFilter>
                             <action>
-                                <ignore></ignore>
+                                <ignore />
                             </action>
                         </pluginExecution>
                      </pluginExecutions>
@@ -154,4 +149,4 @@
       </plugins>
    </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 cdd3df4bbcad..db199fb08212 100644
--- a/core/src/main/java/org/infinispan/Version.java
+++ b/core/src/main/java/org/infinispan/Version.java
@@ -16,8 +16,8 @@ public class Version {
    private static final String MAJOR = "6";
    private static final String MINOR = "0";
    private static final String MICRO = "0";
-   private static final String MODIFIER = "SNAPSHOT";
-   private static final boolean SNAPSHOT = true;
+   private static final String MODIFIER = "Alpha4";
+   private static final boolean SNAPSHOT = false;
 
    public static final String VERSION = String.format("%s.%s.%s%s%s", MAJOR, MINOR, MICRO, SNAPSHOT ? "-" : ".", MODIFIER);
    public static final String CODENAME = "Infinium";
diff --git a/demos/directory/pom.xml b/demos/directory/pom.xml
index c8fd24c130e4..79f535e8a16d 100644
--- a/demos/directory/pom.xml
+++ b/demos/directory/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -43,4 +41,4 @@
       </dependency>
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/distexec/pom.xml b/demos/distexec/pom.xml
index 934db442b22b..67efd6e804b1 100644
--- a/demos/distexec/pom.xml
+++ b/demos/distexec/pom.xml
@@ -1,11 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -50,4 +50,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 0d2649e10727..818b45168d38 100644
--- a/demos/ec2-ui/pom.xml
+++ b/demos/ec2-ui/pom.xml
@@ -1,11 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -48,4 +48,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 5f2c6481a8fb..7d2eb00952dd 100644
--- a/demos/ec2/pom.xml
+++ b/demos/ec2/pom.xml
@@ -1,11 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -59,4 +59,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 6fd9366e29e7..d6e70a613d2a 100644
--- a/demos/gridfs-webdav/pom.xml
+++ b/demos/gridfs-webdav/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-gridfs-webdav</artifactId>
@@ -22,7 +21,7 @@
          <groupId>net.sf.webdav-servlet</groupId>
          <artifactId>webdav-servlet</artifactId>
       </dependency>
-      <!-- required by Webdav-Servlet -->
+      
       <dependency>
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
@@ -33,4 +32,4 @@
          <artifactId>log4j</artifactId>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/gui/pom.xml b/demos/gui/pom.xml
index 8d91a40b7c55..cb1e35dd3395 100644
--- a/demos/gui/pom.xml
+++ b/demos/gui/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -50,4 +48,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 ac02ebabefbf..d77f476a3774 100644
--- a/demos/lucene-directory-demo/pom.xml
+++ b/demos/lucene-directory-demo/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -25,9 +24,7 @@
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>
-      <!-- Hack to make Eclipse happy when opening multiple modules at once:
-         the eclipse project related to infinispan-lucene-directory does not
-         contain the actual classes packaged in its jar -->
+      
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-lucene-v3</artifactId>
@@ -38,7 +35,7 @@
    <build>
       <plugins>
       
-         <!-- Creates executable scripts -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>appassembler-maven-plugin</artifactId>
@@ -54,7 +51,7 @@
             </configuration>
          </plugin>
          
-         <!-- Testing Configuration -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -68,4 +65,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 f39034ebd87e..bc898ea3d193 100644
--- a/demos/nearcache-client/pom.xml
+++ b/demos/nearcache-client/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -77,15 +75,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>
@@ -94,7 +85,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>
@@ -106,14 +97,13 @@
    </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>
             <configuration>
-               <!-- No web.xml needed in Java EE 6 -->
+               
                <failOnMissingWebXml>false</failOnMissingWebXml>
                <archive>
                   <manifest>
@@ -123,15 +113,14 @@
             </configuration>
          </plugin>
 
-         <!-- JBoss AS plugin to deploy war -->
+         
          <plugin>
             <groupId>org.jboss.as.plugins</groupId>
             <artifactId>jboss-as-maven-plugin</artifactId>
             <version>7.1.0.Beta1b</version>
          </plugin>
 
-         <!-- Compiler plugin enforces Java 1.6 compatibility and activates
-            annotation processors -->
+         
          <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <version>2.3.2</version>
@@ -143,4 +132,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demos/nearcache/pom.xml b/demos/nearcache/pom.xml
index d55649526bd8..c3939742ed9b 100644
--- a/demos/nearcache/pom.xml
+++ b/demos/nearcache/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -39,7 +37,7 @@
          <artifactId>netty</artifactId>
       </dependency>
 
-      <!-- HornetQ dependencies -->
+      
       <dependency>
           <groupId>org.hornetq</groupId>
           <artifactId>hornetq-bootstrap</artifactId>
@@ -82,4 +80,4 @@
 
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extended-statistics/pom.xml b/extended-statistics/pom.xml
index 75fc0762f031..07c12b39cf68 100644
--- a/extended-statistics/pom.xml
+++ b/extended-statistics/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.Alpha4</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,4 +32,4 @@
             <version>2.2.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/integrationtests/as-integration/pom.xml b/integrationtests/as-integration/pom.xml
index 6a5809911088..d4b12f4649de 100755
--- a/integrationtests/as-integration/pom.xml
+++ b/integrationtests/as-integration/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -15,7 +14,7 @@
    <description>Integration tests: AS Module Integration Tests</description>
    
    <properties>
-      <eap.dir></eap.dir>
+      <eap.dir />
    </properties>
 
    <dependencies>
@@ -88,7 +87,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
             <configuration>
-               <!-- Force use of JUnit, since TestNG+Arquillian break in wonderful ways -->
+               
                <testNGArtifactName>none:none</testNGArtifactName>
             </configuration>
             <executions>
@@ -142,7 +141,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
             <executions>
-               <!-- Copy the AS configuration files so we can use our custom configurations -->
+               
                <execution>
                   <id>configure-as-node</id>
                   <phase>pre-integration-test</phase>
@@ -164,4 +163,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/integrationtests/compatibility-mode-it/pom.xml b/integrationtests/compatibility-mode-it/pom.xml
index 7331feb611ca..f4b6cb3609ac 100644
--- a/integrationtests/compatibility-mode-it/pom.xml
+++ b/integrationtests/compatibility-mode-it/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
diff --git a/integrationtests/luceneintegration/pom.xml b/integrationtests/luceneintegration/pom.xml
index f008b91b5b91..033b2492f5e3 100644
--- a/integrationtests/luceneintegration/pom.xml
+++ b/integrationtests/luceneintegration/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -38,4 +37,4 @@
       </dependency>
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/jcache/pom.xml b/jcache/pom.xml
index f128b863b426..15f4e6472a81 100644
--- a/jcache/pom.xml
+++ b/jcache/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -15,8 +13,7 @@
    <name>Infinispan JCACHE (JSR-107) implementation</name>
    <description>JCACHE (JSR-107) implementation using Infinispan</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>
@@ -80,7 +77,7 @@
             </configuration>
          </plugin>
 
-         <!-- Disable parallel execution of tests ARQ-127 -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -90,8 +87,7 @@
             </configuration>
          </plugin>
 
-         <!-- Use invoker plugin to run TCK tests once Infinispan JSR-107
-              implementation has been built and installed in the repo -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
@@ -109,10 +105,10 @@
                   <goal>package</goal>
                </goals>
                <properties>
-                  <!-- Skip tests parent's tests are skipped -->
+                  
                   <maven.test.skip.exec>${maven.test.skip.exec}</maven.test.skip.exec>
                   <skipTests>${skipTests}</skipTests>
-                  <!-- If logging enabled by client, pass it on -->
+                  
                   <log4j.configuration>${log4j.configuration}</log4j.configuration>
                </properties>
             </configuration>
@@ -167,4 +163,4 @@
       </profile>
    </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/jcache/src/it/tck-runner/pom.xml b/jcache/src/it/tck-runner/pom.xml
index 47792481cb00..f50782ba4249 100644
--- a/jcache/src/it/tck-runner/pom.xml
+++ b/jcache/src/it/tck-runner/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../../../parent/pom.xml</relativePath>
    </parent>
 
@@ -32,10 +30,7 @@
          <scope>test</scope>
       </dependency>
 
-      <!--
-         Order is important here! hamcrest-library needs to be defined before cache-tests:
-         http://stackoverflow.com/questions/7869711/getting-nosuchmethoderror-org-hamcrest-matcher-describemismatch-when-running
-      -->
+      
       <dependency>
          <groupId>org.hamcrest</groupId>
          <artifactId>hamcrest-library</artifactId>
@@ -75,7 +70,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
-               <!--Required because JUnit will not detect tests simply included in a dep-->
+               
                <execution>
                   <id>copy-cache-tests</id>
                   <goals>
@@ -150,10 +145,9 @@
 
    <profiles>
 
-      <!--To run all tests do not specify any profile-->
+      
 
-      <!-- Profile for running basic tests.
-           Use mvn -P test-basic-cache clean install -->
+      
       <profile>
          <id>test-basic-cache</id>
          <build>
@@ -174,8 +168,7 @@
          </build>
       </profile>
 
-      <!-- Profile for running optional tests.
-           Use mvn -P test-optional-cache clean install -->
+      
       <profile>
          <id>test-optional-cache</id>
          <build>
@@ -195,4 +188,4 @@
 
    </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/license/pom.xml b/license/pom.xml
index 137b5882145c..1aa6cd7c6ab4 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -1,6 +1,6 @@
-<?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>
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <version>6.0.0.Alpha4</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/lucene-directory/pom.xml b/lucene/lucene-directory/pom.xml
index 111aa04edd57..ebde69553ed5 100644
--- a/lucene/lucene-directory/pom.xml
+++ b/lucene/lucene-directory/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-lucene-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.Alpha4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,13 +23,13 @@
         <dependency>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-lucene-v3</artifactId>
-            <!-- Not actually needed: we just want to make sure the reactor builds it first -->
+            
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-lucene-v4</artifactId>
-            <!-- Not actually needed: we just want to make sure the reactor builds it first -->
+            
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -82,4 +81,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/lucene/lucene-v3/pom.xml b/lucene/lucene-v3/pom.xml
index 0f51f645e9b5..ed66cda6eca1 100644
--- a/lucene/lucene-v3/pom.xml
+++ b/lucene/lucene-v3/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-lucene-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -46,4 +45,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/lucene/lucene-v4/pom.xml b/lucene/lucene-v4/pom.xml
index b5456d3e6513..c17e91310e11 100644
--- a/lucene/lucene-v4/pom.xml
+++ b/lucene/lucene-v4/pom.xml
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-lucene-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -64,4 +63,4 @@
       </dependency>
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/lucene/pom.xml b/lucene/pom.xml
index 26ea9c791e02..978260b0fa84 100644
--- a/lucene/pom.xml
+++ b/lucene/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-lucene-parent</artifactId>
@@ -46,4 +44,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index 393d9025be00..f6246960f850 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,9 +1,9 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
    <packaging>pom</packaging>
    <name>Infinispan Common Parent</name>
    <description>Infinispan common parent POM module</description>
@@ -85,7 +85,7 @@
       <packaging>jar</packaging>
       <module.skipComponentMetaDataProcessing>true</module.skipComponentMetaDataProcessing>
       <module.metadata.isCoreModule>false</module.metadata.isCoreModule>
-      <!-- Versions for dependencies -->
+      
       <version.antlr>3.4</version.antlr>
       <version.arquillian>1.0.3.Final</version.arquillian>
       <version.arquillian.container.managed>7.2.0.Final</version.arquillian.container.managed>
@@ -618,7 +618,7 @@
       </dependencies>
    </dependencyManagement>
    <dependencies>
-      <!-- used to serialize non-serializable objects for a dummy marshaller -->
+      
       <dependency>
          <groupId>com.thoughtworks.xstream</groupId>
          <artifactId>xstream</artifactId>
@@ -913,7 +913,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-pmd-plugin</artifactId>
-               <!-- See also reporting plugins -->
+               
                <version>2.7.1</version>
                <configuration>
                   <minimumTokens>100</minimumTokens>
@@ -954,7 +954,7 @@
                <artifactId>ideauidesigner-maven-plugin</artifactId>
                <version>1.0-beta-1</version>
             </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>
@@ -973,7 +973,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -986,7 +986,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -999,7 +999,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -1012,7 +1012,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -1026,7 +1026,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -1039,7 +1039,7 @@
                               </goals>
                            </pluginExecutionFilter>
                            <action>
-                              <ignore></ignore>
+                              <ignore />
                            </action>
                         </pluginExecution>
                      </pluginExecutions>
@@ -1145,7 +1145,7 @@
                </instructions>
             </configuration>
          </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>
@@ -1160,13 +1160,13 @@
                   <configuration>
                      <skip>${module.skipComponentMetaDataProcessing}</skip>
                      <target>
-                        <copy file="${basedir}/src/main/resources/${project.artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}"></copy>
+                        <copy file="${basedir}/src/main/resources/${project.artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}" />
                      </target>
                   </configuration>
                </execution>
             </executions>
          </plugin>
-         <!-- 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>
@@ -1178,7 +1178,7 @@
                <compilerArgument>-AtranslationFilesPath=${project.basedir}/target/generated-translation-files</compilerArgument>
             </configuration>
          </plugin>
-         <!-- eclipse project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-eclipse-plugin</artifactId>
@@ -1188,7 +1188,7 @@
                <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
             </configuration>
          </plugin>
-         <!-- IntelliJ project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-idea-plugin</artifactId>
@@ -1249,7 +1249,7 @@
                <encoding>UTF-8</encoding>
             </configuration>
          </plugin>
-         <!-- ensure parallel test execution -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -1273,11 +1273,11 @@
                      <value>${testNGListener}</value>
                   </property>
                </properties>
-               <!-- -Dsun.nio.ch.bugLevel needed because of http://bugs.sun.com/view_bug.do?bug_id=6427854 -->
+               
                <argLine>-Xmx1024m -XX:MaxPermSize=256m -Dsun.nio.ch.bugLevel</argLine>
             </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>
@@ -1309,11 +1309,11 @@
    </build>
    <reporting>
       <plugins>
-         <!-- 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.7.1</version>
          </plugin>
          <plugin>
@@ -1321,7 +1321,7 @@
             <artifactId>maven-surefire-report-plugin</artifactId>
             <version>2.12.2</version>
          </plugin>
-         <!-- Findbugs report -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
@@ -1343,7 +1343,7 @@
 
          <build>
             <plugins>
-               <!-- generate target/runtime-classpath.txt, to be included in bundle -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-dependency-plugin</artifactId>
@@ -1374,7 +1374,7 @@
          </activation>
          <build>
             <plugins>
-               <!-- Make sure we generate src jars too -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-source-plugin</artifactId>
@@ -1393,7 +1393,7 @@
             </plugins>
          </build>
          <properties>
-            <!-- By default create OSGI bundles -->
+            
             <packaging>bundle</packaging>
          </properties>
       </profile>
@@ -1413,7 +1413,7 @@
                   <artifactId>maven-surefire-plugin</artifactId>
                   <configuration>
                      <systemPropertyVariables>
-                           <!-- this is picked up in the log4j xml which prepends it to each module's log file-->
+                           
                            <infinispan.module-name>${project.artifactId}</infinispan.module-name>
                      </systemPropertyVariables>
                   </configuration>
@@ -1488,8 +1488,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>
@@ -1520,7 +1519,7 @@
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-dependency-plugin</artifactId>
                   <executions>
-                     <!-- Copy the ant tasks jar. Needed for ts.jacoco.report-ant . -->
+                     
                      <execution>
                         <id>jacoco-dependency-ant</id>
                         <goals>
@@ -1558,7 +1557,7 @@
                   </executions>
                </plugin>
 
-               <!-- Starting jacoco agent for recording code coverage. -->
+               
                <plugin>
                   <groupId>org.jacoco</groupId>
                   <artifactId>jacoco-maven-plugin</artifactId>
@@ -1574,7 +1573,7 @@
                   </configuration>
                </plugin>
 
-               <!-- Overriding surefire configuration, for attaching jacoco agent to command line. -->
+               
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-surefire-plugin</artifactId>
@@ -1619,8 +1618,8 @@
                         </goals>
                         <configuration>
                            <target combine.self="override">
-                              <!-- Execute an ant task within maven -->
-                              <taskdef name="report" classname="org.jacoco.ant.ReportTask">
+                              
+                              <taskdef classname="org.jacoco.ant.ReportTask" name="report">
                                  <classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
                                  <classpath path="target/jacoco-jars/org.jacoco.core.jar" />
                                  <classpath path="target/jacoco-jars/org.jacoco.report.jar" />
@@ -1635,12 +1634,12 @@
 
                               <echo message="Generating JaCoCo Reports" />
                               <report>
-                                 <!-- Specifying the execution data files locations. -->
+                                 
                                  <executiondata>
                                     <fileset dir="${dir.ispn}" includes="**/target/jacoco.exec" />
                                  </executiondata>
 
-                                 <!-- Defining the report structure with class and source files. -->
+                                 
                                  <structure name="${reportTitle}">
                                     <classfiles>
                                        <fileset dir="${dir.ispn}">
@@ -1650,13 +1649,13 @@
                                     <sourcefiles encoding="UTF-8">
                                        <mappedresources>
                                           <fileset dir="${dir.ispn}" includes="**/src/main/java/**/*.java" />
-                                          <mapper type="regexp" from="^(.*/java/)(.*)$" to="\2"/>
+                                          <mapper from="^(.*/java/)(.*)$" to="\2" type="regexp" />
                                        </mappedresources>
                                     </sourcefiles>
 
                                  </structure>
 
-                                 <!-- Only HTML report is generated with specified path. -->
+                                 
                                  <html destdir="${dir.report}" />
                               </report>
                            </target>
@@ -1830,7 +1829,7 @@
                            <value>${testNGListener}</value>
                         </property>
                      </properties>
-                     <!-- -Dsun.nio.ch.bugLevel needed because of http://bugs.sun.com/view_bug.do?bug_id=6427854 -->
+                     
                      <argLine>-Xmx1024m -XX:MaxPermSize=256m -Dsun.nio.ch.bugLevel</argLine>
                   </configuration>
                </plugin>
@@ -1839,4 +1838,4 @@
       </profile>
 
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 84b037bff5e0..3d6d5ed9b7e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>parent/pom.xml</relativePath>
    </parent>
 
@@ -81,9 +79,7 @@
                         </goals>
                         <configuration>
                            <quiet>true</quiet>
-                           <!-- In case 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>
@@ -91,20 +87,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>
@@ -141,7 +137,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>
@@ -149,8 +145,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>
@@ -196,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>
@@ -217,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>
@@ -252,14 +247,14 @@ pageTracker._trackPageview();
                         </goals>
                         <configuration>
                            <target>
-                              <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                              <property name="plugin_classpath" refid="maven.plugin.classpath" />
                               <path id="xsd.fileset.path">
-                                 <fileset dir="${basedir}" casesensitive="yes">
-                                    <include name="core/src/main/resources/schema/*.xsd" /> <!-- make sure core comes first -->
+                                 <fileset casesensitive="yes" dir="${basedir}">
+                                    <include name="core/src/main/resources/schema/*.xsd" /> 
                                     <include name="cachestore/*/src/main/resources/schema/*.xsd" />
                                  </fileset>
                               </path>
-                              <pathconvert property="xsd.fileset" refid="xsd.fileset.path" pathsep=" "/>
+                              <pathconvert pathsep=" " property="xsd.fileset" refid="xsd.fileset.path" />
                               <echo message="xsds ${xsd.fileset}" />
                               <java classname="org.infinispan.tools.xsd.XSDoc">
                                  <arg value="-o" />
@@ -285,4 +280,4 @@ pageTracker._trackPageview();
          </build>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/query-dsl/pom.xml b/query-dsl/pom.xml
index ac64b490d914..a4adf56bcb51 100644
--- a/query-dsl/pom.xml
+++ b/query-dsl/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -38,4 +36,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/query/pom.xml b/query/pom.xml
index df80d9c82d91..0e2817e25119 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -15,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>
@@ -62,9 +60,7 @@
          <artifactId>infinispan-lucene-directory</artifactId>
       </dependency>
 
-      <!-- Hack to make Eclipse happy when opening multiple modules at once:
-         the eclipse project related to infinispan-lucene-directory does not
-         contain the actual classes packaged in its jar -->
+      
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-lucene-v3</artifactId>
@@ -94,4 +90,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/remote-query/remote-query-client/pom.xml b/remote-query/remote-query-client/pom.xml
index 060f83cbcfb2..a463ba73e4c2 100644
--- a/remote-query/remote-query-client/pom.xml
+++ b/remote-query/remote-query-client/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -37,4 +35,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/remote-query/remote-query-server/pom.xml b/remote-query/remote-query-server/pom.xml
index cfcea3bce7d1..d4ae30da0376 100644
--- a/remote-query/remote-query-server/pom.xml
+++ b/remote-query/remote-query-server/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-remote-query-server</artifactId>
@@ -14,7 +12,7 @@
    <name>Infinispan Remote Query Server</name>
    <description>Infinispan Remote Query Server 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>
@@ -69,4 +67,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 7224b7b8d55e..234778a15c87 100644
--- a/rhq-plugin/pom.xml
+++ b/rhq-plugin/pom.xml
@@ -1,16 +1,12 @@
-<?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"
-      >
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -67,7 +63,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- We need to force the version defined in parent pom for this indirect dependency -->
+      
       <dependency>
          <groupId>commons-collections</groupId>
          <artifactId>commons-collections</artifactId>
@@ -80,7 +76,7 @@
          <scope>provided</scope>
       </dependency>
       
-      <!-- Dependencies for plugin descriptor generation -->
+      
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
@@ -140,41 +136,14 @@
             </executions>
          </plugin>
          
-         <!-- <plugin>
-             <artifactId>maven-dependency-plugin</artifactId>
-             <executions>
-                 <execution>
-                     <id>copy-infinispan-rhq-plugin-jar</id>
-                     <phase>process-resources</phase>
-                     <goals>
-                         <goal>copy</goal>
-                     </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>
-                                 <version>${project.version}</version>
-                             </artifactItem>
-                             <artifactItem>
-                                <groupId>org.jboss.logging</groupId>
-                                <artifactId>jboss-logging</artifactId>
-                                <version>${version.jboss.logging}</version>
-                             </artifactItem>
-                         </artifactItems>
-                         <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin> -->
+         
  
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
                <doclet>org.infinispan.tools.rhq.RhqPluginXmlGenerator</doclet>
-               <!--<additionalJOption>-J-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</additionalJOption>-->
+               
                <docletArtifact>
                   <groupId>org.infinispan</groupId>
                   <artifactId>infinispan-tools</artifactId>
@@ -219,11 +188,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>
@@ -236,18 +204,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>
@@ -261,10 +225,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>
@@ -280,4 +243,4 @@
 
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/core/pom.xml b/server/core/pom.xml
index bbe8dd02f2fe..fce198b80926 100644
--- a/server/core/pom.xml
+++ b/server/core/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -15,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>
@@ -56,4 +54,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 113bb27a86be..eab9fdcc5ae0 100644
--- a/server/hotrod/pom.xml
+++ b/server/hotrod/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -55,4 +53,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 733fb4f838e6..147d70b79913 100644
--- a/server/memcached/pom.xml
+++ b/server/memcached/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -57,4 +55,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index 8a7f2904b06b..ed5298b801a0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    
@@ -61,4 +59,4 @@
          </build>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/rest/pom.xml b/server/rest/pom.xml
index 5e01902bfc6b..ac211dc2d93e 100644
--- a/server/rest/pom.xml
+++ b/server/rest/pom.xml
@@ -1,12 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -33,8 +32,7 @@
          <plugin>
             <artifactId>maven-war-plugin</artifactId>
             <configuration>
-               <!-- we also pack WEB-INF/classes separately so JDG can use infinispan-server-rest-x.y.z-classes.jar
-               to build a custom server war rather than use the war generated here -->
+               
                <attachClasses>true</attachClasses>
             </configuration>
          </plugin>
@@ -69,7 +67,7 @@
         <artifactId>infinispan-server-core</artifactId>
       </dependency>
 
-      <!-- and now for unit and integration tests -->
+      
       <dependency>
          <groupId>org.mortbay.jetty</groupId>
          <artifactId>jetty-embedded</artifactId>
@@ -83,4 +81,4 @@
       </dependency>
 
    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/server/websocket/pom.xml b/server/websocket/pom.xml
index 5b6d7dd8c226..59be768abae2 100644
--- a/server/websocket/pom.xml
+++ b/server/websocket/pom.xml
@@ -1,12 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -44,4 +43,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring/pom.xml b/spring/pom.xml
index b2bffa761c78..935a84701171 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -1,11 +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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -14,7 +14,7 @@
 
    <name>Infinispan Spring Integration</name>
    <description>
-        <![CDATA[
+        
                  The Infinispan Spring Integration project provides Spring 
                  integration for Infinispan, a high performance distributed cache.
                  Its primary features are
@@ -38,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>
@@ -67,12 +67,12 @@
       </developer>
    </developers>
 
-   <!-- =================================================== -->
-   <!-- Project Dependencies -->
-   <!-- =================================================== -->
+   
+   
+   
 
    <dependencies>
-      <!--Compile time dependencies -->
+      
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-context</artifactId>
@@ -83,7 +83,7 @@
          <artifactId>infinispan-core</artifactId>
          <scope>compile</scope>
       </dependency>
-      <!-- Made the RHQ dependency non-transitive in case we only need the remote cache -->
+      
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-client-hotrod</artifactId>
@@ -97,7 +97,7 @@
          </exclusions>
       </dependency>
 
-      <!--Runtime dependencies -->
+      
       <dependency>
          <groupId>commons-pool</groupId>
          <artifactId>commons-pool</artifactId>
@@ -130,7 +130,7 @@
          <scope>runtime</scope>
       </dependency>
 
-      <!--Test Dependencies -->
+      
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
@@ -176,9 +176,9 @@
       </dependency>
    </dependencies>
 
-   <!-- =================================================== -->
-   <!-- Project Plugins -->
-   <!-- =================================================== -->
+   
+   
+   
 
    <build>
       <plugins>
@@ -196,4 +196,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/tools/pom.xml b/tools/pom.xml
index 7a548e5213e9..d761b1c8d073 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -93,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 ba80da35d31d..1c77e1efc48e 100644
--- a/tree/pom.xml
+++ b/tree/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
+      <version>6.0.0.Alpha4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -44,4 +42,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file