diff --git a/admin-gui/pom.xml b/admin-gui/pom.xml
index 690a888c..ea2599bb 100644
--- a/admin-gui/pom.xml
+++ b/admin-gui/pom.xml
@@ -21,12 +21,11 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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">
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-admin-gui</artifactId>
diff --git a/api/pom.xml b/api/pom.xml
index 4a58fce1..622d27c3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-integration-api</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index a06a52dc..04f6147f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-common</artifactId>
diff --git a/consumer/pom.xml b/consumer/pom.xml
index 684e53a6..323437d7 100644
--- a/consumer/pom.xml
+++ b/consumer/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-consumer</artifactId>
diff --git a/cxf-integration/pom.xml b/cxf-integration/pom.xml
index 162d84b6..0f62192c 100644
--- a/cxf-integration/pom.xml
+++ b/cxf-integration/pom.xml
@@ -27,7 +27,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
 
    <artifactId>wsrp-cxf-integration</artifactId>
diff --git a/examples/policy/pom.xml b/examples/policy/pom.xml
index bc13765c..0eee04d4 100644
--- a/examples/policy/pom.xml
+++ b/examples/policy/pom.xml
@@ -1,11 +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">
+<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">
    <parent>
       <artifactId>wsrp-examples</artifactId>
       <groupId>org.gatein.wsrp</groupId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 3555435f..add1d5f8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,11 +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">
+<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">
    <parent>
       <artifactId>wsrp-parent</artifactId>
       <groupId>org.gatein.wsrp</groupId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
diff --git a/hibernate-impl/pom.xml b/hibernate-impl/pom.xml
index e1583e5b..449c2b96 100644
--- a/hibernate-impl/pom.xml
+++ b/hibernate-impl/pom.xml
@@ -28,7 +28,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
 
    <groupId>org.gatein.wsrp</groupId>
diff --git a/jcr-impl/pom.xml b/jcr-impl/pom.xml
index 47fb23a5..2a5c43bf 100644
--- a/jcr-impl/pom.xml
+++ b/jcr-impl/pom.xml
@@ -26,7 +26,7 @@
    <parent>
       <artifactId>wsrp-parent</artifactId>
       <groupId>org.gatein.wsrp</groupId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 413a2c3f..c5e445ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +36,7 @@
 
    <groupId>org.gatein.wsrp</groupId>
    <artifactId>wsrp-parent</artifactId>
-   <version>2.2.0-Beta05-SNAPSHOT</version>
+   <version>2.2.0.Beta05</version>
 
    <packaging>pom</packaging>
 
diff --git a/producer/pom.xml b/producer/pom.xml
index 141ef58a..a0561b63 100644
--- a/producer/pom.xml
+++ b/producer/pom.xml
@@ -21,12 +21,11 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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">
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-producer-lib</artifactId>
diff --git a/test/pom.xml b/test/pom.xml
index 4c9ef970..ed0bb3ee 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -26,7 +26,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/ws-security/jboss5/pom.xml b/ws-security/jboss5/pom.xml
index 80ca0b28..5f1ddfd0 100644
--- a/ws-security/jboss5/pom.xml
+++ b/ws-security/jboss5/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-wss-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-wss-jboss5</artifactId>
diff --git a/ws-security/jboss7/pom.xml b/ws-security/jboss7/pom.xml
index 8a2fc8eb..03f539d5 100644
--- a/ws-security/jboss7/pom.xml
+++ b/ws-security/jboss7/pom.xml
@@ -21,12 +21,11 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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">
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-wss-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-wss-jboss7</artifactId>
diff --git a/ws-security/pom.xml b/ws-security/pom.xml
index a034a635..b020d506 100644
--- a/ws-security/pom.xml
+++ b/ws-security/pom.xml
@@ -27,7 +27,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
 
    <artifactId>wsrp-wss-parent</artifactId>
diff --git a/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml b/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
index 19ab78d5..db385f20 100644
--- a/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
+++ b/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-wss-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-producer-jb5wss</artifactId>
diff --git a/ws-security/wss/pom.xml b/ws-security/wss/pom.xml
index 9913e0e1..59b4edf1 100644
--- a/ws-security/wss/pom.xml
+++ b/ws-security/wss/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-wss-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-wss</artifactId>
diff --git a/wsrp-producer-war/pom.xml b/wsrp-producer-war/pom.xml
index 719c82d0..f8848b6d 100644
--- a/wsrp-producer-war/pom.xml
+++ b/wsrp-producer-war/pom.xml
@@ -22,12 +22,11 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
@@ -42,198 +41,198 @@
       <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs>
    </properties>
 
-   <profiles>
-      <profile>
-         <id>default</id>
-         <activation>
-            <activeByDefault>true</activeByDefault>
-         </activation>
-         <properties>
-            <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs>
-         </properties>
-      </profile>
-      <profile>
-         <id>cargo-debug</id>
-         <properties>
-            <!-- add the jdwp setup for the tests -->
-            <cargo.jvmargs.debug>-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
-            </cargo.jvmargs.debug>
-            <cargo.jvmargs>${cargo.jvmargs.default} ${cargo.jvmargs.debug}</cargo.jvmargs>
-         </properties>
-      </profile>
-      <profile>
-         <!-- uses a zip of jboss as instead of an exploded directory -->
-         <id>server-url</id>
-         <activation>
-            <property>
-               <name>jboss.zip.url</name>
-            </property>
-         </activation>
-         <properties>
-            <jboss.systemPath>${jboss.zip.url}</jboss.systemPath>
-            <JBOSS_5_1_0_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_5_1_0_HOME>
-         </properties>
-         <dependencies>
-            <dependency>
-               <groupId>org.jboss.jbossas</groupId>
-               <artifactId>jboss-as-distribution</artifactId>
-               <version>5.1.0.GA</version>
-               <scope>system</scope>
-               <type>zip</type>
-               <systemPath>${jboss.systemPath}</systemPath>
-            </dependency>
-         </dependencies>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <version>2.1</version>
-                  <executions>
-                     <execution>
-                        <id>dependency-unpack</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                           <includeGroupIds>org.jboss.jbossas</includeGroupIds>
-                           <includeArtifactIds>jboss-as-distribution</includeArtifactIds>
-                           <outputDirectory>${project.build.directory}/cargo/servers</outputDirectory>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>test-server</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-maven2-plugin</artifactId>
-                  <version>1.0.1</version>
-                  <configuration>
-                     <wait>true</wait>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>integration-tests-enabled</id>
-         <activation>
-            <property>
-               <name>!skipTests</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-maven2-plugin</artifactId>
-                  <version>1.0.1</version>
-                  <executions>
-                     <execution>
-                        <id>pre-integration-start-server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                           <goal>start</goal>
-                        </goals>
-                     </execution>
-                     <execution>
-                        <id>post-integration-stop-server</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                           <goal>stop</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <configuration>
-                     <finalName>test</finalName>
-                     <appendAssemblyId>true</appendAssemblyId>
-                     <!-- we don't want to add these archives into the repo -->
-                     <attach>false</attach>
-                     <outputDirectory>${project.build.directory}/test-archives</outputDirectory>
-                     <descriptors>
-                        <descriptor>src/test/assembly/test-producer.xml</descriptor>
-                        <descriptor>src/test/assembly/test-markup-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-session-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-basic-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-resource-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-portletstate-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-eventswithobject-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-events-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-portletmodes-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-prp-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-state-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-resourceserving-portlet.xml</descriptor>
-                        <descriptor>src/test/assembly/test-windowstates-portlet.xml</descriptor>
-                     </descriptors>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>assemble</id>
-                        <!-- note that package phase happens after the test phase and before the integration test phase -->
-                        <phase>package</phase>
-                        <goals>
-                           <goal>single</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <dependencies>
-                     <dependency>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>jboss-packaging-maven-plugin</artifactId>
-                        <version>2.1.1</version>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-               <plugin>
-                  <!-- Copy Google Portlet samples from PC module to test-archives so that they can be used in tests -->
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <version>2.1</version>
-                  <executions>
-                     <execution>
-                        <id>copy</id>
-                        <goals>
-                           <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.gatein.pc</groupId>
-                                 <artifactId>pc-samples</artifactId>
-                                 <version>2.3.0-Beta06</version>
-                                 <classifier>google-portlet</classifier>
-                                 <type>war</type>
-                                 <destFileName>google-portlet.war</destFileName>
-                                 <outputDirectory>${project.build.directory}/test-archives</outputDirectory>
-                              </artifactItem>
-                           </artifactItems>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
+<!--   <profiles>
+        <profile>
+           <id>default</id>
+           <activation>
+              <activeByDefault>true</activeByDefault>
+           </activation>
+           <properties>
+              <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs>
+           </properties>
+        </profile>
+        <profile>
+           <id>cargo-debug</id>
+           <properties>
+              &lt;!&ndash; add the jdwp setup for the tests &ndash;&gt;
+              <cargo.jvmargs.debug>-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
+              </cargo.jvmargs.debug>
+              <cargo.jvmargs>${cargo.jvmargs.default} ${cargo.jvmargs.debug}</cargo.jvmargs>
+           </properties>
+        </profile>
+        <profile>
+           &lt;!&ndash; uses a zip of jboss as instead of an exploded directory &ndash;&gt;
+           <id>server-url</id>
+           <activation>
+              <property>
+                 <name>jboss.zip.url</name>
+              </property>
+           </activation>
+           <properties>
+              <jboss.systemPath>${jboss.zip.url}</jboss.systemPath>
+              <JBOSS_5_1_0_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_5_1_0_HOME>
+           </properties>
+           <dependencies>
+              <dependency>
+                 <groupId>org.jboss.jbossas</groupId>
+                 <artifactId>jboss-as-distribution</artifactId>
+                 <version>5.1.0.GA</version>
+                 <scope>system</scope>
+                 <type>zip</type>
+                 <systemPath>${jboss.systemPath}</systemPath>
+              </dependency>
+           </dependencies>
+           <build>
+              <plugins>
+                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.1</version>
+                    <executions>
+                       <execution>
+                          <id>dependency-unpack</id>
+                          <phase>process-test-resources</phase>
+                          <goals>
+                             <goal>unpack-dependencies</goal>
+                          </goals>
+                          <configuration>
+                             <includeGroupIds>org.jboss.jbossas</includeGroupIds>
+                             <includeArtifactIds>jboss-as-distribution</includeArtifactIds>
+                             <outputDirectory>${project.build.directory}/cargo/servers</outputDirectory>
+                          </configuration>
+                       </execution>
+                    </executions>
+                 </plugin>
+              </plugins>
+           </build>
+        </profile>
+        <profile>
+           <id>test-server</id>
+           <build>
+              <plugins>
+                 <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven2-plugin</artifactId>
+                    <version>1.0.1</version>
+                    <configuration>
+                       <wait>true</wait>
+                    </configuration>
+                 </plugin>
+              </plugins>
+           </build>
+        </profile>
+        <profile>
+           <id>integration-tests-enabled</id>
+           <activation>
+              <property>
+                 <name>!skipTests</name>
+              </property>
+           </activation>
+           <build>
+              <plugins>
+                 <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven2-plugin</artifactId>
+                    <version>1.0.1</version>
+                    <executions>
+                       <execution>
+                          <id>pre-integration-start-server</id>
+                          <phase>pre-integration-test</phase>
+                          <goals>
+                             <goal>start</goal>
+                          </goals>
+                       </execution>
+                       <execution>
+                          <id>post-integration-stop-server</id>
+                          <phase>post-integration-test</phase>
+                          <goals>
+                             <goal>stop</goal>
+                          </goals>
+                       </execution>
+                    </executions>
+                 </plugin>
+                 <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <configuration>
+                       <finalName>test</finalName>
+                       <appendAssemblyId>true</appendAssemblyId>
+                       &lt;!&ndash; we don't want to add these archives into the repo &ndash;&gt;
+                       <attach>false</attach>
+                       <outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+                       <descriptors>
+                          <descriptor>src/test/assembly/test-producer.xml</descriptor>
+                          <descriptor>src/test/assembly/test-markup-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-session-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-basic-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-resource-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-portletstate-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-eventswithobject-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-events-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-portletmodes-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-prp-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-state-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-resourceserving-portlet.xml</descriptor>
+                          <descriptor>src/test/assembly/test-windowstates-portlet.xml</descriptor>
+                       </descriptors>
+                    </configuration>
+                    <executions>
+                       <execution>
+                          <id>assemble</id>
+                          &lt;!&ndash; note that package phase happens after the test phase and before the integration test phase &ndash;&gt;
+                          <phase>package</phase>
+                          <goals>
+                             <goal>single</goal>
+                          </goals>
+                       </execution>
+                    </executions>
+                    <dependencies>
+                       <dependency>
+                          <groupId>org.codehaus.mojo</groupId>
+                          <artifactId>jboss-packaging-maven-plugin</artifactId>
+                          <version>2.1.1</version>
+                       </dependency>
+                    </dependencies>
+                 </plugin>
+                 <plugin>
+                    &lt;!&ndash; Copy Google Portlet samples from PC module to test-archives so that they can be used in tests &ndash;&gt;
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.1</version>
+                    <executions>
+                       <execution>
+                          <id>copy</id>
+                          <goals>
+                             <goal>copy</goal>
+                          </goals>
+                          <configuration>
+                             <artifactItems>
+                                <artifactItem>
+                                   <groupId>org.gatein.pc</groupId>
+                                   <artifactId>pc-samples</artifactId>
+                                   <version>2.3.0-Beta06</version>
+                                   <classifier>google-portlet</classifier>
+                                   <type>war</type>
+                                   <destFileName>google-portlet.war</destFileName>
+                                   <outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+                                </artifactItem>
+                             </artifactItems>
+                          </configuration>
+                       </execution>
+                    </executions>
+                 </plugin>
+              </plugins>
+           </build>
+        </profile>
+     </profiles>-->
 
    <dependencies>
       <dependency>
@@ -506,7 +505,7 @@
                      <goal>test</goal>
                   </goals>
                   <configuration>
-                     <skip>${skipTests}</skip>
+                     <skip>true</skip>
                      <includes>
                         <include>org/gatein/wsrp/protocol/v1/MarkupTestCase.class</include>
                         <include>org/gatein/wsrp/protocol/v1/PortletManagementTestCase.class</include>
diff --git a/wsrp1-ws/pom.xml b/wsrp1-ws/pom.xml
index cce7450e..efc2ec44 100644
--- a/wsrp1-ws/pom.xml
+++ b/wsrp1-ws/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-wsrp1-ws</artifactId>
diff --git a/wsrp2-ws/pom.xml b/wsrp2-ws/pom.xml
index b131f6c5..0c6210df 100644
--- a/wsrp2-ws/pom.xml
+++ b/wsrp2-ws/pom.xml
@@ -26,7 +26,7 @@
    <parent>
       <artifactId>wsrp-parent</artifactId>
       <groupId>org.gatein.wsrp</groupId>
-      <version>2.2.0-Beta05-SNAPSHOT</version>
+      <version>2.2.0.Beta05</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>wsrp-wsrp2-ws</artifactId>