[maven-release-plugin] prepare release geronimo-2.1.5

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/branches/2.1@931094 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assemblies/geronimo-boilerplate-minimal/pom.xml b/assemblies/geronimo-boilerplate-minimal/pom.xml
index 9584025..b4ef2f4 100644
--- a/assemblies/geronimo-boilerplate-minimal/pom.xml
+++ b/assemblies/geronimo-boilerplate-minimal/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>
@@ -280,13 +280,13 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.outputDirectory}/contents/schema"/>
+                                <mkdir dir="${project.build.outputDirectory}/contents/schema" />
                                 <copy todir="${project.build.outputDirectory}/contents/schema">
                                     <fileset dir="${project.build.directory}/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
                             </tasks>
                         </configuration>
@@ -301,7 +301,7 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying README, RELEASE_NOTES, and DISCLAIMER txt files ${project.basedir}/../.. to underlay - ${project.build.outputDirectory}/contents</echo>
-                                <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true" >
+                                <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true">
                                     <fileset dir="${project.basedir}/../..">
                                         <include name="README.txt" />
                                         <include name="RELEASE_NOTES-${pom.version}.txt" />
@@ -322,10 +322,10 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.outputDirectory}"/>
+                                <mkdir dir="${project.build.outputDirectory}" />
                                 <copy todir="${project.build.outputDirectory}">
                                     <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
-                                        <include name="**"/>
+                                        <include name="**" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/assemblies/geronimo-framework/pom.xml b/assemblies/geronimo-framework/pom.xml
index c15e4ca..17fee45 100644
--- a/assemblies/geronimo-framework/pom.xml
+++ b/assemblies/geronimo-framework/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-framework</artifactId>
@@ -152,13 +152,13 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/schema"/>
+                                <mkdir dir="${project.build.directory}/schema" />
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/assemblies/geronimo-jetty6-javaee5/pom.xml b/assemblies/geronimo-jetty6-javaee5/pom.xml
index ed393bc..524974c 100644
--- a/assemblies/geronimo-jetty6-javaee5/pom.xml
+++ b/assemblies/geronimo-jetty6-javaee5/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jetty6-javaee5</artifactId>
@@ -627,7 +627,7 @@
                         <configuration>
                             <tasks>
                                 <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
+                                <mkdir dir="${project.build.directory}/assembly" />
                                 <copy todir="${project.build.directory}/assembly">
                                     <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
                                     </fileset>
@@ -644,19 +644,18 @@
                         <configuration>
                             <tasks>
                                 <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
+                                <mkdir dir="${project.build.directory}/schema" />
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
-                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" 
-                                      fork="yes" failonerror="true">
-                                   <classpath refid="maven.runtime.classpath"/>
-                                   <arg value="${project.build.directory}/assembly"/>
-                                   <arg value="gsh-wsgen.properties"/>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-wsgen.properties" />
                                 </java>
                             </tasks>
                         </configuration>
diff --git a/assemblies/geronimo-jetty6-minimal/pom.xml b/assemblies/geronimo-jetty6-minimal/pom.xml
index 3d43a39..aa35812 100644
--- a/assemblies/geronimo-jetty6-minimal/pom.xml
+++ b/assemblies/geronimo-jetty6-minimal/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jetty6-minimal</artifactId>
@@ -295,7 +295,7 @@
                         <configuration>
                             <tasks>
                                 <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
+                                <mkdir dir="${project.build.directory}/assembly" />
                                 <copy todir="${project.build.directory}/assembly">
                                     <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
                                     </fileset>
@@ -312,13 +312,13 @@
                         <configuration>
                             <tasks>
                                 <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
+                                <mkdir dir="${project.build.directory}/schema" />
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/assemblies/geronimo-tomcat6-javaee5/pom.xml b/assemblies/geronimo-tomcat6-javaee5/pom.xml
index b53f3ba..28c2300 100644
--- a/assemblies/geronimo-tomcat6-javaee5/pom.xml
+++ b/assemblies/geronimo-tomcat6-javaee5/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-tomcat6-javaee5</artifactId>
@@ -627,16 +627,15 @@
                         <configuration>
                             <tasks>
                                 <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
+                                <mkdir dir="${project.build.directory}/assembly" />
                                 <copy todir="${project.build.directory}/assembly">
                                     <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
                                     </fileset>
                                 </copy>
-                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" 
-                                      fork="yes" failonerror="true">
-                                   <classpath refid="maven.runtime.classpath"/>
-                                   <arg value="${project.build.directory}/assembly"/>
-                                   <arg value="gsh-wsgen.properties"/>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-wsgen.properties" />
                                 </java>
                             </tasks>
                         </configuration>
@@ -650,13 +649,13 @@
                         <configuration>
                             <tasks>
                                 <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
+                                <mkdir dir="${project.build.directory}/schema" />
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/assemblies/geronimo-tomcat6-minimal/pom.xml b/assemblies/geronimo-tomcat6-minimal/pom.xml
index bbda74b..c9a00fd 100644
--- a/assemblies/geronimo-tomcat6-minimal/pom.xml
+++ b/assemblies/geronimo-tomcat6-minimal/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-tomcat6-minimal</artifactId>
@@ -295,7 +295,7 @@
                         <configuration>
                             <tasks>
                                 <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
+                                <mkdir dir="${project.build.directory}/assembly" />
                                 <copy todir="${project.build.directory}/assembly">
                                     <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
                                     </fileset>
@@ -312,13 +312,13 @@
                         <configuration>
                             <tasks>
                                 <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
+                                <mkdir dir="${project.build.directory}/schema" />
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
+                                        <include name="**/*.xsd" />
+                                        <include name="**/*.dtd" />
                                     </fileset>
-                                    <mapper type="flatten"/>
+                                    <mapper type="flatten" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index 2d52416..7627c77 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>
diff --git a/buildsupport/buildsupport-maven-plugin/pom.xml b/buildsupport/buildsupport-maven-plugin/pom.xml
index 5675515..bc3cb00 100644
--- a/buildsupport/buildsupport-maven-plugin/pom.xml
+++ b/buildsupport/buildsupport-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>buildsupport-maven-plugin</artifactId>
diff --git a/buildsupport/car-maven-plugin/pom.xml b/buildsupport/car-maven-plugin/pom.xml
index a40188c..932cc28 100644
--- a/buildsupport/car-maven-plugin/pom.xml
+++ b/buildsupport/car-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>car-maven-plugin</artifactId>
diff --git a/buildsupport/geronimo-assembly-archetype/pom.xml b/buildsupport/geronimo-assembly-archetype/pom.xml
index 776afc3..6403f23 100644
--- a/buildsupport/geronimo-assembly-archetype/pom.xml
+++ b/buildsupport/geronimo-assembly-archetype/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>buildsupport</artifactId>
     <groupId>org.apache.geronimo.buildsupport</groupId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-assembly-archetype</artifactId>
diff --git a/buildsupport/geronimo-maven-plugin/pom.xml b/buildsupport/geronimo-maven-plugin/pom.xml
index 0a1799c..4836d30 100644
--- a/buildsupport/geronimo-maven-plugin/pom.xml
+++ b/buildsupport/geronimo-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-maven-plugin</artifactId>
diff --git a/buildsupport/geronimo-plugin-archetype/pom.xml b/buildsupport/geronimo-plugin-archetype/pom.xml
index 3e5368e..2b87f34 100644
--- a/buildsupport/geronimo-plugin-archetype/pom.xml
+++ b/buildsupport/geronimo-plugin-archetype/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>buildsupport</artifactId>
     <groupId>org.apache.geronimo.buildsupport</groupId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-plugin-archetype</artifactId>
diff --git a/buildsupport/pom.xml b/buildsupport/pom.xml
index 96200fd..415dcf5 100644
--- a/buildsupport/pom.xml
+++ b/buildsupport/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport</groupId>
diff --git a/buildsupport/testsuite-archetype-plugin/pom.xml b/buildsupport/testsuite-archetype-plugin/pom.xml
index 06c7f67..88e109a 100644
--- a/buildsupport/testsuite-archetype-plugin/pom.xml
+++ b/buildsupport/testsuite-archetype-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-archetype-testsuite</artifactId>
diff --git a/buildsupport/testsuite-maven-plugin/pom.xml b/buildsupport/testsuite-maven-plugin/pom.xml
index e26a74c..df29021 100644
--- a/buildsupport/testsuite-maven-plugin/pom.xml
+++ b/buildsupport/testsuite-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>testsuite-maven-plugin</artifactId>
diff --git a/framework/configs/client-system/pom.xml b/framework/configs/client-system/pom.xml
index f188cbb..9733048 100644
--- a/framework/configs/client-system/pom.xml
+++ b/framework/configs/client-system/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>client-system</artifactId>
@@ -191,7 +191,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
                         </plugin-artifact>
diff --git a/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml b/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
index a4d0027..9fef2db 100644
--- a/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
diff --git a/framework/configs/geronimo-gbean-deployer/pom.xml b/framework/configs/geronimo-gbean-deployer/pom.xml
index e4f0849..874645e 100644
--- a/framework/configs/geronimo-gbean-deployer/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-gbean-deployer</artifactId>
@@ -139,7 +139,7 @@
                                     <attribute name="remoteDeployAddress">http://#{RemoteDeployHostname}:#{HTTPPort + PortOffset}</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="offline" />
                             <config-substitution key="RemoteDeployHostname">localhost</config-substitution>
                         </plugin-artifact>
                     </instance>
diff --git a/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml b/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
index 93dde01..41baac3 100644
--- a/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
diff --git a/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml b/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
index 7d10945..ce3db91 100644
--- a/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -212,7 +212,7 @@
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
                     <category>Geronimo Core</category>
-                    <config-xml-content load = "false"/>
+                    <config-xml-content load="false" />
                 </configuration>
             </plugin>
             
diff --git a/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml b/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
index 26473f0..e332428 100644
--- a/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
diff --git a/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml b/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
index 1a71a9b..89263f8 100644
--- a/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
+++ b/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.buildsupport.it</groupId>
diff --git a/framework/configs/gshell-framework/pom.xml b/framework/configs/gshell-framework/pom.xml
index 46940f9..f8ca6d3 100644
--- a/framework/configs/gshell-framework/pom.xml
+++ b/framework/configs/gshell-framework/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>gshell-framework</artifactId>
@@ -171,7 +171,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <config-xml-content load="false"/>
+                    <config-xml-content load="false" />
                 </configuration>
             </plugin>
         </plugins>
diff --git a/framework/configs/gshell-geronimo/pom.xml b/framework/configs/gshell-geronimo/pom.xml
index 76a0980..ae5a665 100644
--- a/framework/configs/gshell-geronimo/pom.xml
+++ b/framework/configs/gshell-geronimo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>gshell-geronimo</artifactId>
@@ -89,7 +89,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <config-xml-content load="false"/>
+                    <config-xml-content load="false" />
                 </configuration>
             </plugin>
         </plugins>
diff --git a/framework/configs/gshell-remote/pom.xml b/framework/configs/gshell-remote/pom.xml
index c15874a..0072faa 100644
--- a/framework/configs/gshell-remote/pom.xml
+++ b/framework/configs/gshell-remote/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>gshell-remote</artifactId>
@@ -98,7 +98,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <config-xml-content load="false"/>
+                    <config-xml-content load="false" />
                 </configuration>
             </plugin>
         </plugins>
diff --git a/framework/configs/j2ee-security/pom.xml b/framework/configs/j2ee-security/pom.xml
index bd2e10c..d60d186 100644
--- a/framework/configs/j2ee-security/pom.xml
+++ b/framework/configs/j2ee-security/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <!-- change this to server-security -->
diff --git a/framework/configs/j2ee-system/pom.xml b/framework/configs/j2ee-system/pom.xml
index 3b9a0bb..7c6a95a 100644
--- a/framework/configs/j2ee-system/pom.xml
+++ b/framework/configs/j2ee-system/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>j2ee-system</artifactId>
@@ -210,7 +210,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <config-xml-content load = "false"/>
+                    <config-xml-content load="false" />
                          
                 </configuration>
             </plugin>
diff --git a/framework/configs/jee-specs/pom.xml b/framework/configs/jee-specs/pom.xml
index da53470..4e6b90b 100644
--- a/framework/configs/jee-specs/pom.xml
+++ b/framework/configs/jee-specs/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jee-specs</artifactId>
diff --git a/framework/configs/jmx-security/pom.xml b/framework/configs/jmx-security/pom.xml
index 8968b60..f13b4f4 100644
--- a/framework/configs/jmx-security/pom.xml
+++ b/framework/configs/jmx-security/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>jmx-security</artifactId>
diff --git a/framework/configs/jsr88-cli/pom.xml b/framework/configs/jsr88-cli/pom.xml
index 8106390..960f559 100644
--- a/framework/configs/jsr88-cli/pom.xml
+++ b/framework/configs/jsr88-cli/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jsr88-cli</artifactId>
@@ -136,7 +136,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/jsr88-deploymentfactory/pom.xml b/framework/configs/jsr88-deploymentfactory/pom.xml
index 26e5fc4..1e64c74 100644
--- a/framework/configs/jsr88-deploymentfactory/pom.xml
+++ b/framework/configs/jsr88-deploymentfactory/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jsr88-deploymentfactory</artifactId>
@@ -168,7 +168,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88" load="false"/>
+                            <config-xml-content server="jsr88" load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/offline-deployer/pom.xml b/framework/configs/offline-deployer/pom.xml
index 0df650a..4e8ca54 100644
--- a/framework/configs/offline-deployer/pom.xml
+++ b/framework/configs/offline-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>offline-deployer</artifactId>
@@ -64,7 +64,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/online-deployer/pom.xml b/framework/configs/online-deployer/pom.xml
index afd9061..74cd8b7 100644
--- a/framework/configs/online-deployer/pom.xml
+++ b/framework/configs/online-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>online-deployer</artifactId>
@@ -204,7 +204,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/plugin/pom.xml b/framework/configs/plugin/pom.xml
index 67a503b..2667dd9 100644
--- a/framework/configs/plugin/pom.xml
+++ b/framework/configs/plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin</artifactId>
diff --git a/framework/configs/pom.xml b/framework/configs/pom.xml
index 3f0c235..fc5555e 100644
--- a/framework/configs/pom.xml
+++ b/framework/configs/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>configs</artifactId>
diff --git a/framework/configs/rmi-naming/pom.xml b/framework/configs/rmi-naming/pom.xml
index f64dd73..6649798 100644
--- a/framework/configs/rmi-naming/pom.xml
+++ b/framework/configs/rmi-naming/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>rmi-naming</artifactId>
diff --git a/framework/configs/server-security-config/pom.xml b/framework/configs/server-security-config/pom.xml
index f20e75f..5532547 100644
--- a/framework/configs/server-security-config/pom.xml
+++ b/framework/configs/server-security-config/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>server-security-config</artifactId>
diff --git a/framework/configs/shutdown/pom.xml b/framework/configs/shutdown/pom.xml
index 6d9acbd..a4ae23e 100644
--- a/framework/configs/shutdown/pom.xml
+++ b/framework/configs/shutdown/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>shutdown</artifactId>
@@ -133,7 +133,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/transformer-agent/pom.xml b/framework/configs/transformer-agent/pom.xml
index 0550afc..a54bee8 100644
--- a/framework/configs/transformer-agent/pom.xml
+++ b/framework/configs/transformer-agent/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>transformer-agent</artifactId>
diff --git a/framework/configs/upgrade-cli/pom.xml b/framework/configs/upgrade-cli/pom.xml
index 6716d00..2c198c5 100644
--- a/framework/configs/upgrade-cli/pom.xml
+++ b/framework/configs/upgrade-cli/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>upgrade-cli</artifactId>
@@ -91,7 +91,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/framework/configs/upgrade/pom.xml b/framework/configs/upgrade/pom.xml
index 026f59c..0f24555 100644
--- a/framework/configs/upgrade/pom.xml
+++ b/framework/configs/upgrade/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>upgrade</artifactId>
diff --git a/framework/configs/xmlbeans/pom.xml b/framework/configs/xmlbeans/pom.xml
index ff28e0f..664cb60 100644
--- a/framework/configs/xmlbeans/pom.xml
+++ b/framework/configs/xmlbeans/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>xmlbeans</artifactId>
diff --git a/framework/modules/geronimo-cli/pom.xml b/framework/modules/geronimo-cli/pom.xml
index 85d538d..125f9c0 100644
--- a/framework/modules/geronimo-cli/pom.xml
+++ b/framework/modules/geronimo-cli/pom.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one or more

-    contributor license agreements.  See the NOTICE file distributed with

-    this work for additional information regarding copyright ownership.

-    The ASF licenses this file to You under the Apache License, Version 2.0

-    (the "License"); you may not use this file except in compliance with

-    the License.  You may obtain a copy of the License at

-    

-       http://www.apache.org/licenses/LICENSE-2.0

-    

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

--->

-

-<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-    

-    <parent>

-        <groupId>org.apache.geronimo.framework</groupId>

-        <artifactId>modules</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>geronimo-cli</artifactId>

-    <name>Geronimo Framework, Modules :: CLI</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.geronimo.framework</groupId>

-            <artifactId>geronimo-kernel</artifactId>

-            <version>${version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>commons-cli</groupId>

-            <artifactId>commons-cli</artifactId>

-        </dependency>

-

-    </dependencies>

-

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>geronimo-cli</artifactId>
+    <name>Geronimo Framework, Modules :: CLI</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
+
diff --git a/framework/modules/geronimo-commands/pom.xml b/framework/modules/geronimo-commands/pom.xml
index 286e86f..af7154d 100644
--- a/framework/modules/geronimo-commands/pom.xml
+++ b/framework/modules/geronimo-commands/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-commands</artifactId>
@@ -161,7 +161,7 @@
                         <configuration>
                             <extractors>
                                 <classComponentDescriptorExtractor>
-                                    <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner"/>
+                                    <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner" />
                                 </classComponentDescriptorExtractor>
                             </extractors>
                         </configuration>
diff --git a/framework/modules/geronimo-common/pom.xml b/framework/modules/geronimo-common/pom.xml
index f36e8e6..fd7b6de 100644
--- a/framework/modules/geronimo-common/pom.xml
+++ b/framework/modules/geronimo-common/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-common</artifactId>
diff --git a/framework/modules/geronimo-core/pom.xml b/framework/modules/geronimo-core/pom.xml
index aeb817f..8a9ba0b 100644
--- a/framework/modules/geronimo-core/pom.xml
+++ b/framework/modules/geronimo-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-core</artifactId>
diff --git a/framework/modules/geronimo-crypto/pom.xml b/framework/modules/geronimo-crypto/pom.xml
index 75e418e..1294f6e 100644
--- a/framework/modules/geronimo-crypto/pom.xml
+++ b/framework/modules/geronimo-crypto/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-crypto</artifactId>
diff --git a/framework/modules/geronimo-deploy-config/pom.xml b/framework/modules/geronimo-deploy-config/pom.xml
index 1d146a1..07e2123 100644
--- a/framework/modules/geronimo-deploy-config/pom.xml
+++ b/framework/modules/geronimo-deploy-config/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-config</artifactId>
diff --git a/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml b/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
index 7e8f65b..ad02f08 100644
--- a/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
+++ b/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one or more

-    contributor license agreements.  See the NOTICE file distributed with

-    this work for additional information regarding copyright ownership.

-    The ASF licenses this file to You under the Apache License, Version 2.0

-    (the "License"); you may not use this file except in compliance with

-    the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

--->

-

-<!-- $Rev: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.framework</groupId>

-        <artifactId>modules</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>

-    <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>

-    

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.geronimo.framework</groupId>

-            <artifactId>geronimo-kernel</artifactId>

-            <version>${version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>

-        </dependency>

-    </dependencies>

-

-</project>

-

+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+    <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/framework/modules/geronimo-deploy-jsr88/pom.xml b/framework/modules/geronimo-deploy-jsr88/pom.xml
index a2514a8..8b1c630 100644
--- a/framework/modules/geronimo-deploy-jsr88/pom.xml
+++ b/framework/modules/geronimo-deploy-jsr88/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88</artifactId>
diff --git a/framework/modules/geronimo-deploy-tool/pom.xml b/framework/modules/geronimo-deploy-tool/pom.xml
index e399040..14bc375 100644
--- a/framework/modules/geronimo-deploy-tool/pom.xml
+++ b/framework/modules/geronimo-deploy-tool/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-tool</artifactId>
diff --git a/framework/modules/geronimo-deployment/pom.xml b/framework/modules/geronimo-deployment/pom.xml
index d7f54d3..e83dd53 100644
--- a/framework/modules/geronimo-deployment/pom.xml
+++ b/framework/modules/geronimo-deployment/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deployment</artifactId>
diff --git a/framework/modules/geronimo-interceptor/pom.xml b/framework/modules/geronimo-interceptor/pom.xml
index c5df87a..a4a937b 100644
--- a/framework/modules/geronimo-interceptor/pom.xml
+++ b/framework/modules/geronimo-interceptor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-interceptor</artifactId>
diff --git a/framework/modules/geronimo-j2ee/pom.xml b/framework/modules/geronimo-j2ee/pom.xml
index b495e7b..c1cfc26 100644
--- a/framework/modules/geronimo-j2ee/pom.xml
+++ b/framework/modules/geronimo-j2ee/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-j2ee</artifactId>
diff --git a/framework/modules/geronimo-jdbc/pom.xml b/framework/modules/geronimo-jdbc/pom.xml
index 60836e9..af7d6b0 100644
--- a/framework/modules/geronimo-jdbc/pom.xml
+++ b/framework/modules/geronimo-jdbc/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jdbc</artifactId>
diff --git a/framework/modules/geronimo-jmx-remoting/pom.xml b/framework/modules/geronimo-jmx-remoting/pom.xml
index 37d352c..8e9a0b0 100644
--- a/framework/modules/geronimo-jmx-remoting/pom.xml
+++ b/framework/modules/geronimo-jmx-remoting/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jmx-remoting</artifactId>
diff --git a/framework/modules/geronimo-kernel/pom.xml b/framework/modules/geronimo-kernel/pom.xml
index b6efc8b..587d150 100644
--- a/framework/modules/geronimo-kernel/pom.xml
+++ b/framework/modules/geronimo-kernel/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-kernel</artifactId>
@@ -88,17 +88,17 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <delete dir="${project.build.directory}/tmp"/>
-                                <mkdir dir="${project.build.directory}/tmp"/>
+                                <delete dir="${project.build.directory}/tmp" />
+                                <mkdir dir="${project.build.directory}/tmp" />
                                 
-                                <mkdir dir="${project.build.directory}/m1"/>
+                                <mkdir dir="${project.build.directory}/m1" />
                                 <copy todir="${project.build.directory}/m1">
-                                    <fileset dir="${basedir}/src/test/repo/m1"/>
+                                    <fileset dir="${basedir}/src/test/repo/m1" />
                                 </copy>
                                 
-                                <mkdir dir="${project.build.directory}/m2"/>
+                                <mkdir dir="${project.build.directory}/m2" />
                                 <copy todir="${project.build.directory}/m2">
-                                    <fileset dir="${basedir}/src/test/repo/m2"/>
+                                    <fileset dir="${basedir}/src/test/repo/m2" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/framework/modules/geronimo-management/pom.xml b/framework/modules/geronimo-management/pom.xml
index c0e02e3..e96e522 100644
--- a/framework/modules/geronimo-management/pom.xml
+++ b/framework/modules/geronimo-management/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-management</artifactId>
diff --git a/framework/modules/geronimo-naming/pom.xml b/framework/modules/geronimo-naming/pom.xml
index ffeb713..096f088 100644
--- a/framework/modules/geronimo-naming/pom.xml
+++ b/framework/modules/geronimo-naming/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>
diff --git a/framework/modules/geronimo-plugin/pom.xml b/framework/modules/geronimo-plugin/pom.xml
index 3d5c9ff..8443595 100644
--- a/framework/modules/geronimo-plugin/pom.xml
+++ b/framework/modules/geronimo-plugin/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.apache.geronimo.framework</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-plugin</artifactId>
diff --git a/framework/modules/geronimo-security/pom.xml b/framework/modules/geronimo-security/pom.xml
index c537e67..4d38033 100644
--- a/framework/modules/geronimo-security/pom.xml
+++ b/framework/modules/geronimo-security/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-security</artifactId>
diff --git a/framework/modules/geronimo-service-builder/pom.xml b/framework/modules/geronimo-service-builder/pom.xml
index 9903c97..a800052 100644
--- a/framework/modules/geronimo-service-builder/pom.xml
+++ b/framework/modules/geronimo-service-builder/pom.xml
@@ -18,13 +18,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-service-builder</artifactId>
diff --git a/framework/modules/geronimo-system/pom.xml b/framework/modules/geronimo-system/pom.xml
index bc56f3d..ddd20aa 100644
--- a/framework/modules/geronimo-system/pom.xml
+++ b/framework/modules/geronimo-system/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-system</artifactId>
@@ -121,19 +121,17 @@
                         <configuration>
                             <tasks>
                                 <tstamp>
-                                    <format property="build.year" pattern="yyyy"/>
+                                    <format property="build.year" pattern="yyyy" />
                                 </tstamp>
 
-                                <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo"/>
+                                <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo" />
 
-                                <propertyfile
-                                        file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
-                                        comment="Geronimo version information (generated, do not modify)">
+                                <propertyfile file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties" comment="Geronimo version information (generated, do not modify)">
 
-                                    <entry key="version" value="${version}"/>
-                                    <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd"/>
-                                    <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ"/>
-                                    <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation"/>
+                                    <entry key="version" value="${version}" />
+                                    <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd" />
+                                    <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ" />
+                                    <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation" />
                                 </propertyfile>
                             </tasks>
                         </configuration>
diff --git a/framework/modules/geronimo-transformer/pom.xml b/framework/modules/geronimo-transformer/pom.xml
index 99917d8..4c48aed 100644
--- a/framework/modules/geronimo-transformer/pom.xml
+++ b/framework/modules/geronimo-transformer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-transformer</artifactId>
diff --git a/framework/modules/geronimo-upgrade/pom.xml b/framework/modules/geronimo-upgrade/pom.xml
index 3d1ab31..5a106ec 100644
--- a/framework/modules/geronimo-upgrade/pom.xml
+++ b/framework/modules/geronimo-upgrade/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-upgrade</artifactId>
diff --git a/framework/modules/pom.xml b/framework/modules/pom.xml
index 0c27074..0996085 100644
--- a/framework/modules/pom.xml
+++ b/framework/modules/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>modules</artifactId>
diff --git a/framework/pom.xml b/framework/pom.xml
index d1cf09f..bb88491 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.framework</groupId>
diff --git a/plugins/activemq/activemq-broker/pom.xml b/plugins/activemq/activemq-broker/pom.xml
index fdb351d..bb21c5c 100644
--- a/plugins/activemq/activemq-broker/pom.xml
+++ b/plugins/activemq/activemq-broker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/activemq/activemq-console-jetty/pom.xml b/plugins/activemq/activemq-console-jetty/pom.xml
index 66fb452..80aadc9 100644
--- a/plugins/activemq/activemq-console-jetty/pom.xml
+++ b/plugins/activemq/activemq-console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq-console-jetty</artifactId>
diff --git a/plugins/activemq/activemq-console-tomcat/pom.xml b/plugins/activemq/activemq-console-tomcat/pom.xml
index 698f981..e798df0 100644
--- a/plugins/activemq/activemq-console-tomcat/pom.xml
+++ b/plugins/activemq/activemq-console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq-console-tomcat</artifactId>
diff --git a/plugins/activemq/activemq-portlets/pom.xml b/plugins/activemq/activemq-portlets/pom.xml
index 8eb6fdb..a69d2d4 100644
--- a/plugins/activemq/activemq-portlets/pom.xml
+++ b/plugins/activemq/activemq-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>activemq-portlets</artifactId>
@@ -120,9 +120,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/activemq/activemq-ra/pom.xml b/plugins/activemq/activemq-ra/pom.xml
index 39ecbba..5b92f3c 100644
--- a/plugins/activemq/activemq-ra/pom.xml
+++ b/plugins/activemq/activemq-ra/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/activemq/geronimo-activemq-management/pom.xml b/plugins/activemq/geronimo-activemq-management/pom.xml
index 09ca755..64283ca 100644
--- a/plugins/activemq/geronimo-activemq-management/pom.xml
+++ b/plugins/activemq/geronimo-activemq-management/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/activemq/geronimo-activemq-ra/pom.xml b/plugins/activemq/geronimo-activemq-ra/pom.xml
index f3d4d06..17593fc 100644
--- a/plugins/activemq/geronimo-activemq-ra/pom.xml
+++ b/plugins/activemq/geronimo-activemq-ra/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/activemq/geronimo-activemq/pom.xml b/plugins/activemq/geronimo-activemq/pom.xml
index d97e7e5..a34ff9b 100644
--- a/plugins/activemq/geronimo-activemq/pom.xml
+++ b/plugins/activemq/geronimo-activemq/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/activemq/pom.xml b/plugins/activemq/pom.xml
index 2163085..2e0e4e7 100644
--- a/plugins/activemq/pom.xml
+++ b/plugins/activemq/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq</artifactId>
diff --git a/plugins/axis/axis-deployer/pom.xml b/plugins/axis/axis-deployer/pom.xml
index 91777ba..bb40d89 100644
--- a/plugins/axis/axis-deployer/pom.xml
+++ b/plugins/axis/axis-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/axis/axis/pom.xml b/plugins/axis/axis/pom.xml
index bb43cfa..6156196 100644
--- a/plugins/axis/axis/pom.xml
+++ b/plugins/axis/axis/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/axis/geronimo-axis-builder/pom.xml b/plugins/axis/geronimo-axis-builder/pom.xml
index 2d18a0f..dc8c86f 100644
--- a/plugins/axis/geronimo-axis-builder/pom.xml
+++ b/plugins/axis/geronimo-axis-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/axis/geronimo-axis/pom.xml b/plugins/axis/geronimo-axis/pom.xml
index 3bdf3c1..c73dc7b 100644
--- a/plugins/axis/geronimo-axis/pom.xml
+++ b/plugins/axis/geronimo-axis/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/axis/pom.xml b/plugins/axis/pom.xml
index e7c8488..5f2e4d7 100644
--- a/plugins/axis/pom.xml
+++ b/plugins/axis/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>axis</artifactId>
diff --git a/plugins/axis2/axis2-deployer/pom.xml b/plugins/axis2/axis2-deployer/pom.xml
index e4dc22b..a6761d4 100644
--- a/plugins/axis2/axis2-deployer/pom.xml
+++ b/plugins/axis2/axis2-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -92,8 +92,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/axis2/axis2-ejb-deployer/pom.xml b/plugins/axis2/axis2-ejb-deployer/pom.xml
index 712b3de..7806792 100644
--- a/plugins/axis2/axis2-ejb-deployer/pom.xml
+++ b/plugins/axis2/axis2-ejb-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -108,8 +108,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/axis2/axis2-ejb/pom.xml b/plugins/axis2/axis2-ejb/pom.xml
index 6585089..d8fa93d 100644
--- a/plugins/axis2/axis2-ejb/pom.xml
+++ b/plugins/axis2/axis2-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/axis2/axis2/pom.xml b/plugins/axis2/axis2/pom.xml
index 227d657..47a0a4f 100644
--- a/plugins/axis2/axis2/pom.xml
+++ b/plugins/axis2/axis2/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/axis2/geronimo-axis2-builder/pom.xml b/plugins/axis2/geronimo-axis2-builder/pom.xml
index 23c86a4..7008b62 100644
--- a/plugins/axis2/geronimo-axis2-builder/pom.xml
+++ b/plugins/axis2/geronimo-axis2-builder/pom.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one or more

-    contributor license agreements.  See the NOTICE file distributed with

-    this work for additional information regarding copyright ownership.

-    The ASF licenses this file to You under the Apache License, Version 2.0

-    (the "License"); you may not use this file except in compliance with

-    the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

--->

-

-<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.plugins</groupId>

-        <artifactId>axis2</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <groupId>org.apache.geronimo.modules</groupId>

-    <artifactId>geronimo-axis2-builder</artifactId>

-    <name>Geronimo Plugins, AXIS2 :: Builder</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-jaxws-builder</artifactId>

-            <version>${version}</version>

-        </dependency>

-        

-        <!-- xbean-finder, g-service-builder comes transitively from this -->

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-j2ee-builder</artifactId>

-            <version>${version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-naming-builder</artifactId>

-            <version>${version}</version>

-        </dependency>

-

-       <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-axis2</artifactId>

-            <version>${version}</version>

-        </dependency>

-

-       <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>

-       </dependency>

-

-        <!-- add the following for wsgen -->

-        <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-tools</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-rt</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.bind</groupId>

-            <artifactId>jaxb-xjc</artifactId>

-        </dependency>

-        <!--end add for wsgen-->

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-axis2-builder</artifactId>
+    <name>Geronimo Plugins, AXIS2 :: Builder</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <!-- xbean-finder, g-service-builder comes transitively from this -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+       </dependency>
+
+        <!-- add the following for wsgen -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
+        <!--end add for wsgen-->
+    </dependencies>
+
+</project>
diff --git a/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml b/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
index 6ba7ec2..fec4014 100644
--- a/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
+++ b/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/axis2/geronimo-axis2-ejb/pom.xml b/plugins/axis2/geronimo-axis2-ejb/pom.xml
index 7470a05..e75e1d5 100644
--- a/plugins/axis2/geronimo-axis2-ejb/pom.xml
+++ b/plugins/axis2/geronimo-axis2-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/axis2/geronimo-axis2/pom.xml b/plugins/axis2/geronimo-axis2/pom.xml
index 4c5a13a..fb77e0f 100644
--- a/plugins/axis2/geronimo-axis2/pom.xml
+++ b/plugins/axis2/geronimo-axis2/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/axis2/pom.xml b/plugins/axis2/pom.xml
index 1a8a71d..6cfd9a3 100644
--- a/plugins/axis2/pom.xml
+++ b/plugins/axis2/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>axis2</artifactId>
diff --git a/plugins/ca-helper/ca-helper-jetty/pom.xml b/plugins/ca-helper/ca-helper-jetty/pom.xml
index 48ce371..2a94584 100644
--- a/plugins/ca-helper/ca-helper-jetty/pom.xml
+++ b/plugins/ca-helper/ca-helper-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/ca-helper/ca-helper-tomcat/pom.xml b/plugins/ca-helper/ca-helper-tomcat/pom.xml
index 567b469..98291b2 100644
--- a/plugins/ca-helper/ca-helper-tomcat/pom.xml
+++ b/plugins/ca-helper/ca-helper-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/ca-helper/geronimo-ca-helper/pom.xml b/plugins/ca-helper/geronimo-ca-helper/pom.xml
index c0f45fd..1e07735 100644
--- a/plugins/ca-helper/geronimo-ca-helper/pom.xml
+++ b/plugins/ca-helper/geronimo-ca-helper/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-ca-helper</artifactId>
diff --git a/plugins/ca-helper/pom.xml b/plugins/ca-helper/pom.xml
index 7f3755e..2b5454b 100644
--- a/plugins/ca-helper/pom.xml
+++ b/plugins/ca-helper/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ca-helper</artifactId>
diff --git a/plugins/client/client-deployer/pom.xml b/plugins/client/client-deployer/pom.xml
index ac315d8..46dc647 100644
--- a/plugins/client/client-deployer/pom.xml
+++ b/plugins/client/client-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -123,8 +123,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/client/client-security/pom.xml b/plugins/client/client-security/pom.xml
index 4060ffe..3d6beb1 100644
--- a/plugins/client/client-security/pom.xml
+++ b/plugins/client/client-security/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -75,7 +75,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                         </plugin-artifact>
diff --git a/plugins/client/client/pom.xml b/plugins/client/client/pom.xml
index 0cd7dfd..ff46ac7 100644
--- a/plugins/client/client/pom.xml
+++ b/plugins/client/client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -141,7 +141,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${version}/car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
                         </plugin-artifact>
diff --git a/plugins/client/geronimo-client-builder/pom.xml b/plugins/client/geronimo-client-builder/pom.xml
index 29aa6d9..6e1e078 100644
--- a/plugins/client/geronimo-client-builder/pom.xml
+++ b/plugins/client/geronimo-client-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/client/geronimo-client/pom.xml b/plugins/client/geronimo-client/pom.xml
index dc58fa4..9e0184c 100644
--- a/plugins/client/geronimo-client/pom.xml
+++ b/plugins/client/geronimo-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/client/pom.xml b/plugins/client/pom.xml
index a396d57..3cd521e 100644
--- a/plugins/client/pom.xml
+++ b/plugins/client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>client</artifactId>
diff --git a/plugins/clustering/clustering/pom.xml b/plugins/clustering/clustering/pom.xml
index 89f5079..eae56f7 100644
--- a/plugins/clustering/clustering/pom.xml
+++ b/plugins/clustering/clustering/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/clustering/farming/pom.xml b/plugins/clustering/farming/pom.xml
index 5be5108..ad9021d 100644
--- a/plugins/clustering/farming/pom.xml
+++ b/plugins/clustering/farming/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/clustering/geronimo-clustering-wadi/pom.xml b/plugins/clustering/geronimo-clustering-wadi/pom.xml
index 4789c48..23d914b 100644
--- a/plugins/clustering/geronimo-clustering-wadi/pom.xml
+++ b/plugins/clustering/geronimo-clustering-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/clustering/geronimo-clustering/pom.xml b/plugins/clustering/geronimo-clustering/pom.xml
index a4cb719..87e2b7b 100644
--- a/plugins/clustering/geronimo-clustering/pom.xml
+++ b/plugins/clustering/geronimo-clustering/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/clustering/geronimo-farm/pom.xml b/plugins/clustering/geronimo-farm/pom.xml
index fd91ca3..0b17756 100644
--- a/plugins/clustering/geronimo-farm/pom.xml
+++ b/plugins/clustering/geronimo-farm/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/clustering/pom.xml b/plugins/clustering/pom.xml
index f33fd23..90e0b3e 100644
--- a/plugins/clustering/pom.xml
+++ b/plugins/clustering/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>clustering</artifactId>
diff --git a/plugins/clustering/wadi-clustering/pom.xml b/plugins/clustering/wadi-clustering/pom.xml
index a870b6e..ad96db0 100644
--- a/plugins/clustering/wadi-clustering/pom.xml
+++ b/plugins/clustering/wadi-clustering/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/connector/client-transaction/pom.xml b/plugins/connector/client-transaction/pom.xml
index 66f1c1f..47324e7 100644
--- a/plugins/connector/client-transaction/pom.xml
+++ b/plugins/connector/client-transaction/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -108,7 +108,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.configs/transaction//car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/transaction/${version}/car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
                         </plugin-artifact>
diff --git a/plugins/connector/connector-deployer/pom.xml b/plugins/connector/connector-deployer/pom.xml
index f1d3d92..1fc47b7 100644
--- a/plugins/connector/connector-deployer/pom.xml
+++ b/plugins/connector/connector-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -129,7 +129,7 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/connector/geronimo-connector-builder/pom.xml b/plugins/connector/geronimo-connector-builder/pom.xml
index 78d7f13..b962e85 100644
--- a/plugins/connector/geronimo-connector-builder/pom.xml
+++ b/plugins/connector/geronimo-connector-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -92,7 +92,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>
+                                <ant antfile="${pom.basedir}/src/test/script/test-setup.xml" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/plugins/connector/geronimo-connector/pom.xml b/plugins/connector/geronimo-connector/pom.xml
index 0af9280..8e6dd4d 100644
--- a/plugins/connector/geronimo-connector/pom.xml
+++ b/plugins/connector/geronimo-connector/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/connector/geronimo-transaction/pom.xml b/plugins/connector/geronimo-transaction/pom.xml
index 54a15f3..ca7f6bb 100644
--- a/plugins/connector/geronimo-transaction/pom.xml
+++ b/plugins/connector/geronimo-transaction/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/connector/pom.xml b/plugins/connector/pom.xml
index 14db849..d4695ba 100644
--- a/plugins/connector/pom.xml
+++ b/plugins/connector/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>connector</artifactId>
diff --git a/plugins/connector/transaction/pom.xml b/plugins/connector/transaction/pom.xml
index 4456f7a..440a3a1 100644
--- a/plugins/connector/transaction/pom.xml
+++ b/plugins/connector/transaction/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -134,7 +134,7 @@
                             <config-substitution key="TmId">71,84,77,73,68</config-substitution>
                             <config-substitution key="ResourceBindingsFormat">{groupId}/{artifactId}/{j2eeType}/{name}</config-substitution>
                             <config-substitution key="ResourceBindingsNameInNamespace">jca:</config-substitution>
-                            <config-substitution key="ResourceBindingsNamePattern"></config-substitution>
+                            <config-substitution key="ResourceBindingsNamePattern" />
                             <config-substitution key="ResourceBindingsQuery">?#org.apache.geronimo.naming.ResourceSource</config-substitution>
                         </plugin-artifact>
                     </instance>
diff --git a/plugins/console/console-base-portlets/pom.xml b/plugins/console/console-base-portlets/pom.xml
index 16726a8..1cf25d5 100644
--- a/plugins/console/console-base-portlets/pom.xml
+++ b/plugins/console/console-base-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-base-portlets</artifactId>
@@ -174,9 +174,9 @@
                       <tasks>
                           <copy overwrite="true" todir="target/classes">
                               <fileset dir="src/main/resources">
-                                  <include name="*_en.properties"/>
+                                  <include name="*_en.properties" />
                               </fileset>
-                              <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                              <mapper type="glob" from="*_en.properties" to="*.properties" />
                           </copy>
                       </tasks>
                   </configuration>
diff --git a/plugins/console/console-core/pom.xml b/plugins/console/console-core/pom.xml
index 6251ae6..9e6bbe5 100644
--- a/plugins/console/console-core/pom.xml
+++ b/plugins/console/console-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-core</artifactId>
diff --git a/plugins/console/console-ear/pom.xml b/plugins/console/console-ear/pom.xml
index cdd49c1..a3a57d8 100644
--- a/plugins/console/console-ear/pom.xml
+++ b/plugins/console/console-ear/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-ear</artifactId>
diff --git a/plugins/console/console-filter/pom.xml b/plugins/console/console-filter/pom.xml
index 84eb0cf..61a7eaa 100644
--- a/plugins/console/console-filter/pom.xml
+++ b/plugins/console/console-filter/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-filter</artifactId>
diff --git a/plugins/console/console-jetty/pom.xml b/plugins/console/console-jetty/pom.xml
index 63fcaab..2ac0029 100644
--- a/plugins/console/console-jetty/pom.xml
+++ b/plugins/console/console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-jetty</artifactId>
diff --git a/plugins/console/console-portal-driver/pom.xml b/plugins/console/console-portal-driver/pom.xml
index c282ae2..b2f3004 100644
--- a/plugins/console/console-portal-driver/pom.xml
+++ b/plugins/console/console-portal-driver/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-portal-driver</artifactId>
@@ -98,9 +98,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/console/console-tomcat/pom.xml b/plugins/console/console-tomcat/pom.xml
index 62c857a..ce599ea 100644
--- a/plugins/console/console-tomcat/pom.xml
+++ b/plugins/console/console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-tomcat</artifactId>
diff --git a/plugins/console/geronimo-converter/pom.xml b/plugins/console/geronimo-converter/pom.xml
index 1566237..63bd122 100644
--- a/plugins/console/geronimo-converter/pom.xml
+++ b/plugins/console/geronimo-converter/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/console/plugin-console-jetty/pom.xml b/plugins/console/plugin-console-jetty/pom.xml
index 9a8fbee..ce10055 100644
--- a/plugins/console/plugin-console-jetty/pom.xml
+++ b/plugins/console/plugin-console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-console-jetty</artifactId>
diff --git a/plugins/console/plugin-console-tomcat/pom.xml b/plugins/console/plugin-console-tomcat/pom.xml
index df374d2..517ff25 100644
--- a/plugins/console/plugin-console-tomcat/pom.xml
+++ b/plugins/console/plugin-console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-console-tomcat</artifactId>
diff --git a/plugins/console/plugin-portlets/pom.xml b/plugins/console/plugin-portlets/pom.xml
index e26e78b..389f1fb 100644
--- a/plugins/console/plugin-portlets/pom.xml
+++ b/plugins/console/plugin-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-portlets</artifactId>
@@ -183,9 +183,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/console/pom.xml b/plugins/console/pom.xml
index 16506b9..135a04c 100644
--- a/plugins/console/pom.xml
+++ b/plugins/console/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console</artifactId>
diff --git a/plugins/corba/client-corba-yoko/pom.xml b/plugins/corba/client-corba-yoko/pom.xml
index c847fc5..2b49d40 100644
--- a/plugins/corba/client-corba-yoko/pom.xml
+++ b/plugins/corba/client-corba-yoko/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -130,7 +130,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="${groupId}/${artifactId}/2.1.4/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="${groupId}/${artifactId}/2.1.3/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
diff --git a/plugins/corba/geronimo-corba-builder/pom.xml b/plugins/corba/geronimo-corba-builder/pom.xml
index 441a20f..869a3e4 100644
--- a/plugins/corba/geronimo-corba-builder/pom.xml
+++ b/plugins/corba/geronimo-corba-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/corba/geronimo-corba/pom.xml b/plugins/corba/geronimo-corba/pom.xml
index abf0f77..40aa96b 100644
--- a/plugins/corba/geronimo-corba/pom.xml
+++ b/plugins/corba/geronimo-corba/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/corba/geronimo-yoko/pom.xml b/plugins/corba/geronimo-yoko/pom.xml
index 339b143..7cee1b7 100644
--- a/plugins/corba/geronimo-yoko/pom.xml
+++ b/plugins/corba/geronimo-yoko/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/corba/j2ee-corba-yoko/pom.xml b/plugins/corba/j2ee-corba-yoko/pom.xml
index 04a8fc1..bd49f8e 100644
--- a/plugins/corba/j2ee-corba-yoko/pom.xml
+++ b/plugins/corba/j2ee-corba-yoko/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/corba/openejb-corba-deployer/pom.xml b/plugins/corba/openejb-corba-deployer/pom.xml
index db3401d..35d49af 100644
--- a/plugins/corba/openejb-corba-deployer/pom.xml
+++ b/plugins/corba/openejb-corba-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -106,8 +106,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/corba/pom.xml b/plugins/corba/pom.xml
index fc14999..e39654c 100644
--- a/plugins/corba/pom.xml
+++ b/plugins/corba/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba</artifactId>
diff --git a/plugins/cxf/cxf-deployer/pom.xml b/plugins/cxf/cxf-deployer/pom.xml
index f44c988..71c72c4 100644
--- a/plugins/cxf/cxf-deployer/pom.xml
+++ b/plugins/cxf/cxf-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -92,8 +92,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/cxf/cxf-ejb-deployer/pom.xml b/plugins/cxf/cxf-ejb-deployer/pom.xml
index 6ebc904..594e83f 100644
--- a/plugins/cxf/cxf-ejb-deployer/pom.xml
+++ b/plugins/cxf/cxf-ejb-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -106,8 +106,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/cxf/cxf-ejb/pom.xml b/plugins/cxf/cxf-ejb/pom.xml
index da0a932..ce0c0e7 100644
--- a/plugins/cxf/cxf-ejb/pom.xml
+++ b/plugins/cxf/cxf-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/cxf/cxf/pom.xml b/plugins/cxf/cxf/pom.xml
index bb64914..61049d5 100644
--- a/plugins/cxf/cxf/pom.xml
+++ b/plugins/cxf/cxf/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/cxf/geronimo-cxf-builder/pom.xml b/plugins/cxf/geronimo-cxf-builder/pom.xml
index fe75385..c3c8945 100644
--- a/plugins/cxf/geronimo-cxf-builder/pom.xml
+++ b/plugins/cxf/geronimo-cxf-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/cxf/geronimo-cxf-ejb-builder/pom.xml b/plugins/cxf/geronimo-cxf-ejb-builder/pom.xml
index b29ea0e..d38cb02 100644
--- a/plugins/cxf/geronimo-cxf-ejb-builder/pom.xml
+++ b/plugins/cxf/geronimo-cxf-ejb-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/cxf/geronimo-cxf-ejb/pom.xml b/plugins/cxf/geronimo-cxf-ejb/pom.xml
index d3017b7..e1b9e17 100644
--- a/plugins/cxf/geronimo-cxf-ejb/pom.xml
+++ b/plugins/cxf/geronimo-cxf-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/cxf/geronimo-cxf/pom.xml b/plugins/cxf/geronimo-cxf/pom.xml
index a2bc13f..15d6903 100644
--- a/plugins/cxf/geronimo-cxf/pom.xml
+++ b/plugins/cxf/geronimo-cxf/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index dab812c..d80fa8c 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>cxf</artifactId>
diff --git a/plugins/debugviews/debugviews-console-jetty/pom.xml b/plugins/debugviews/debugviews-console-jetty/pom.xml
index 054a7d7..2a2b42d 100644
--- a/plugins/debugviews/debugviews-console-jetty/pom.xml
+++ b/plugins/debugviews/debugviews-console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>debugviews-console-jetty</artifactId>
diff --git a/plugins/debugviews/debugviews-console-tomcat/pom.xml b/plugins/debugviews/debugviews-console-tomcat/pom.xml
index 7c47b5c..1ecafde 100644
--- a/plugins/debugviews/debugviews-console-tomcat/pom.xml
+++ b/plugins/debugviews/debugviews-console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>debugviews-console-tomcat</artifactId>
diff --git a/plugins/debugviews/debugviews-portlets/pom.xml b/plugins/debugviews/debugviews-portlets/pom.xml
index e34d4f8..95146e3 100644
--- a/plugins/debugviews/debugviews-portlets/pom.xml
+++ b/plugins/debugviews/debugviews-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>debugviews</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>debugviews-portlets</artifactId>
@@ -131,9 +131,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/debugviews/pom.xml b/plugins/debugviews/pom.xml
index 2ff5d1b..aee98e1 100644
--- a/plugins/debugviews/pom.xml
+++ b/plugins/debugviews/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>debugviews</artifactId>
diff --git a/plugins/derby/pom.xml b/plugins/derby/pom.xml
index dd30e6b..ee02b05 100644
--- a/plugins/derby/pom.xml
+++ b/plugins/derby/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml b/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
index 8293ae7..7a14717 100644
--- a/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
+++ b/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo-legacy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml b/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
index 7721c65..8fb1aba 100644
--- a/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
+++ b/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo-legacy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml b/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
index 9bd7771..78dca15 100644
--- a/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
+++ b/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo-legacy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/dojo-legacy/pom.xml b/plugins/dojo-legacy/pom.xml
index c1c8825..30fd98d 100644
--- a/plugins/dojo-legacy/pom.xml
+++ b/plugins/dojo-legacy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>dojo-legacy</artifactId>
diff --git a/plugins/dojo/dojo-jetty6/pom.xml b/plugins/dojo/dojo-jetty6/pom.xml
index 7aaf2c8..812e684 100644
--- a/plugins/dojo/dojo-jetty6/pom.xml
+++ b/plugins/dojo/dojo-jetty6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/dojo/dojo-tomcat/pom.xml b/plugins/dojo/dojo-tomcat/pom.xml
index 3bfbaf3..7cd5eaf 100644
--- a/plugins/dojo/dojo-tomcat/pom.xml
+++ b/plugins/dojo/dojo-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/dojo/geronimo-dojo/pom.xml b/plugins/dojo/geronimo-dojo/pom.xml
index 9a34a52..f1d1c19 100644
--- a/plugins/dojo/geronimo-dojo/pom.xml
+++ b/plugins/dojo/geronimo-dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>dojo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index f69472f..901ebee 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>dojo</artifactId>
diff --git a/plugins/hotdeploy/geronimo-hot-deploy/pom.xml b/plugins/hotdeploy/geronimo-hot-deploy/pom.xml
index a74e6b0..1276a87 100644
--- a/plugins/hotdeploy/geronimo-hot-deploy/pom.xml
+++ b/plugins/hotdeploy/geronimo-hot-deploy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>hotdeploy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/hotdeploy/hot-deployer/pom.xml b/plugins/hotdeploy/hot-deployer/pom.xml
index d796ea0..b081c63 100644
--- a/plugins/hotdeploy/hot-deployer/pom.xml
+++ b/plugins/hotdeploy/hot-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>hotdeploy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/hotdeploy/pom.xml b/plugins/hotdeploy/pom.xml
index d271908..3498ecc 100644
--- a/plugins/hotdeploy/pom.xml
+++ b/plugins/hotdeploy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>hotdeploy</artifactId>
diff --git a/plugins/j2ee/geronimo-j2ee-builder/pom.xml b/plugins/j2ee/geronimo-j2ee-builder/pom.xml
index c906ecc..105a932 100644
--- a/plugins/j2ee/geronimo-j2ee-builder/pom.xml
+++ b/plugins/j2ee/geronimo-j2ee-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -188,22 +188,18 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
-                                <unzip src="${project.build.directory}/test-ear-javaee_5.ear"
-                                    dest="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-unpacked.ear" />
+                                <unzip src="${project.build.directory}/test-ear-javaee_5.ear" dest="${project.build.directory}/test-ear-javaee_5-unpacked.ear" />
 
-                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
-                                <unzip src="${project.build.directory}/test-ear-javaee_5-naked.ear"
-                                    dest="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
+                                <unzip src="${project.build.directory}/test-ear-javaee_5-naked.ear" dest="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
 
                                 <!-- are these tests needed ? -->
-                                <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
-                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear"
-                                    dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
+                                <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear" />
+                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear" dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear" />
 
-                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
-                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear"
-                                    dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
+                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear" dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/plugins/j2ee/geronimo-j2ee-schema/pom.xml b/plugins/j2ee/geronimo-j2ee-schema/pom.xml
index b7a80d9..d36c5b8 100644
--- a/plugins/j2ee/geronimo-j2ee-schema/pom.xml
+++ b/plugins/j2ee/geronimo-j2ee-schema/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/j2ee/geronimo-naming-builder/pom.xml b/plugins/j2ee/geronimo-naming-builder/pom.xml
index 857ce4d..24f07b9 100644
--- a/plugins/j2ee/geronimo-naming-builder/pom.xml
+++ b/plugins/j2ee/geronimo-naming-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/j2ee/geronimo-security-builder/pom.xml b/plugins/j2ee/geronimo-security-builder/pom.xml
index 6861eeb..29654ac 100644
--- a/plugins/j2ee/geronimo-security-builder/pom.xml
+++ b/plugins/j2ee/geronimo-security-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/j2ee/geronimo-test-ddbean/pom.xml b/plugins/j2ee/geronimo-test-ddbean/pom.xml
index 4e991d7..fb79b14 100644
--- a/plugins/j2ee/geronimo-test-ddbean/pom.xml
+++ b/plugins/j2ee/geronimo-test-ddbean/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/j2ee/geronimo-web-2.5-builder/pom.xml b/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
index 6a2c1d3..16e2cfe 100644
--- a/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
+++ b/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/j2ee/j2ee-deployer/pom.xml b/plugins/j2ee/j2ee-deployer/pom.xml
index d328e97..2cbbd11 100644
--- a/plugins/j2ee/j2ee-deployer/pom.xml
+++ b/plugins/j2ee/j2ee-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/j2ee/j2ee-server/pom.xml b/plugins/j2ee/j2ee-server/pom.xml
index 70ddb9a..7b552f3 100644
--- a/plugins/j2ee/j2ee-server/pom.xml
+++ b/plugins/j2ee/j2ee-server/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/j2ee/jsr88-ear-configurer/pom.xml b/plugins/j2ee/jsr88-ear-configurer/pom.xml
index 4f9aac1..bac706c 100644
--- a/plugins/j2ee/jsr88-ear-configurer/pom.xml
+++ b/plugins/j2ee/jsr88-ear-configurer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -75,7 +75,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/j2ee/jsr88-jar-configurer/pom.xml b/plugins/j2ee/jsr88-jar-configurer/pom.xml
index 07ee702..7a80d4f 100644
--- a/plugins/j2ee/jsr88-jar-configurer/pom.xml
+++ b/plugins/j2ee/jsr88-jar-configurer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -75,7 +75,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/j2ee/jsr88-rar-configurer/pom.xml b/plugins/j2ee/jsr88-rar-configurer/pom.xml
index a617ff6..568251b 100644
--- a/plugins/j2ee/jsr88-rar-configurer/pom.xml
+++ b/plugins/j2ee/jsr88-rar-configurer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -89,7 +89,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/j2ee/jsr88-war-configurer/pom.xml b/plugins/j2ee/jsr88-war-configurer/pom.xml
index a8aaf34..ed0a3a7 100644
--- a/plugins/j2ee/jsr88-war-configurer/pom.xml
+++ b/plugins/j2ee/jsr88-war-configurer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -75,7 +75,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/j2ee/pom.xml b/plugins/j2ee/pom.xml
index 8e3f9a8..17b1b7a 100644
--- a/plugins/j2ee/pom.xml
+++ b/plugins/j2ee/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>j2ee</artifactId>
diff --git a/plugins/j2ee/unavailable-client-deployer/pom.xml b/plugins/j2ee/unavailable-client-deployer/pom.xml
index 479e780..e9300af 100644
--- a/plugins/j2ee/unavailable-client-deployer/pom.xml
+++ b/plugins/j2ee/unavailable-client-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/j2ee/unavailable-ejb-deployer/pom.xml b/plugins/j2ee/unavailable-ejb-deployer/pom.xml
index c4aee91..5b46719 100644
--- a/plugins/j2ee/unavailable-ejb-deployer/pom.xml
+++ b/plugins/j2ee/unavailable-ejb-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/j2ee/unavailable-webservices-deployer/pom.xml b/plugins/j2ee/unavailable-webservices-deployer/pom.xml
index 7f9467a..2bd453f 100644
--- a/plugins/j2ee/unavailable-webservices-deployer/pom.xml
+++ b/plugins/j2ee/unavailable-webservices-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>j2ee</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jasper/geronimo-jasper-builder/pom.xml b/plugins/jasper/geronimo-jasper-builder/pom.xml
index 2c4aa76..60bb29e 100644
--- a/plugins/jasper/geronimo-jasper-builder/pom.xml
+++ b/plugins/jasper/geronimo-jasper-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jasper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jasper/geronimo-jasper/pom.xml b/plugins/jasper/geronimo-jasper/pom.xml
index f2ccfe3..09921b1 100644
--- a/plugins/jasper/geronimo-jasper/pom.xml
+++ b/plugins/jasper/geronimo-jasper/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jasper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jasper/jasper-deployer/pom.xml b/plugins/jasper/jasper-deployer/pom.xml
index 17d3111..8da9914 100644
--- a/plugins/jasper/jasper-deployer/pom.xml
+++ b/plugins/jasper/jasper-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jasper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -91,8 +91,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/jasper/jasper/pom.xml b/plugins/jasper/jasper/pom.xml
index 9357b57..a715625 100644
--- a/plugins/jasper/jasper/pom.xml
+++ b/plugins/jasper/jasper/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jasper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jasper/pom.xml b/plugins/jasper/pom.xml
index c088cfb..8098242 100644
--- a/plugins/jasper/pom.xml
+++ b/plugins/jasper/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jasper</artifactId>
diff --git a/plugins/javamail/geronimo-mail/pom.xml b/plugins/javamail/geronimo-mail/pom.xml
index 1dabd61..5138a00 100644
--- a/plugins/javamail/geronimo-mail/pom.xml
+++ b/plugins/javamail/geronimo-mail/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>javamail</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/javamail/javamail/pom.xml b/plugins/javamail/javamail/pom.xml
index 7d78396..7f7a369 100644
--- a/plugins/javamail/javamail/pom.xml
+++ b/plugins/javamail/javamail/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>javamail</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/javamail/pom.xml b/plugins/javamail/pom.xml
index 3e81a7f..f65632e 100644
--- a/plugins/javamail/pom.xml
+++ b/plugins/javamail/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>javamail</artifactId>
diff --git a/plugins/jaxws/geronimo-jaxws-builder/pom.xml b/plugins/jaxws/geronimo-jaxws-builder/pom.xml
index e7b6131..c08b2e2 100644
--- a/plugins/jaxws/geronimo-jaxws-builder/pom.xml
+++ b/plugins/jaxws/geronimo-jaxws-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml b/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml
index cb7d9aa..207fbdb 100644
--- a/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml
+++ b/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jaxws/geronimo-jaxws/pom.xml b/plugins/jaxws/geronimo-jaxws/pom.xml
index c2128ba..9769f76 100644
--- a/plugins/jaxws/geronimo-jaxws/pom.xml
+++ b/plugins/jaxws/geronimo-jaxws/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jaxws/jaxws-deployer/pom.xml b/plugins/jaxws/jaxws-deployer/pom.xml
index 76404dd..1b4991e 100644
--- a/plugins/jaxws/jaxws-deployer/pom.xml
+++ b/plugins/jaxws/jaxws-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jaxws/jaxws-ejb-deployer/pom.xml b/plugins/jaxws/jaxws-ejb-deployer/pom.xml
index 3328c1f..4225c2d 100644
--- a/plugins/jaxws/jaxws-ejb-deployer/pom.xml
+++ b/plugins/jaxws/jaxws-ejb-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jaxws/jaxws-tools/pom.xml b/plugins/jaxws/jaxws-tools/pom.xml
index bc28239..f4d68d9 100644
--- a/plugins/jaxws/jaxws-tools/pom.xml
+++ b/plugins/jaxws/jaxws-tools/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jaxws</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -63,10 +63,10 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/classes"/>
+                                <mkdir dir="${project.build.directory}/classes" />
                                 <copy todir="${project.build.directory}/classes">
                                     <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
-                                        <include name="**"/>
+                                        <include name="**" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/plugins/jaxws/pom.xml b/plugins/jaxws/pom.xml
index a6b9f06..38f4b6a 100644
--- a/plugins/jaxws/pom.xml
+++ b/plugins/jaxws/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws</artifactId>
diff --git a/plugins/jetty/geronimo-jetty6-builder/pom.xml b/plugins/jetty/geronimo-jetty6-builder/pom.xml
index 27be490..421928f 100644
--- a/plugins/jetty/geronimo-jetty6-builder/pom.xml
+++ b/plugins/jetty/geronimo-jetty6-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml b/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
index b685ed0..1a5c3b0 100644
--- a/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
+++ b/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml b/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
index 280dbd6..cf45fab 100644
--- a/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
+++ b/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one or more

-    contributor license agreements.  See the NOTICE file distributed with

-    this work for additional information regarding copyright ownership.

-    The ASF licenses this file to You under the Apache License, Version 2.0

-    (the "License"); you may not use this file except in compliance with

-    the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

--->

-

-<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.plugins</groupId>

-        <artifactId>jetty</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-    

-    <groupId>org.apache.geronimo.modules</groupId>

-    <artifactId>geronimo-jetty6-clustering-wadi</artifactId>

-    <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>

-    

-    <dependencies>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>geronimo-clustering-wadi</artifactId>

-            <version>${version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>geronimo-jetty6</artifactId>

-            <version>${version}</version>

-        </dependency>

-    </dependencies>

-    

-</project>

-

+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jetty</artifactId>
+        <version>2.1.5</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+    <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-jetty6</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+    
+</project>
+
diff --git a/plugins/jetty/geronimo-jetty6/pom.xml b/plugins/jetty/geronimo-jetty6/pom.xml
index f882c0a..308f9b0 100644
--- a/plugins/jetty/geronimo-jetty6/pom.xml
+++ b/plugins/jetty/geronimo-jetty6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml b/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
index 06e9c79..e8a830c 100644
--- a/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
+++ b/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jetty/jetty6-clustering-wadi/pom.xml b/plugins/jetty/jetty6-clustering-wadi/pom.xml
index fed685e..bfc5042 100644
--- a/plugins/jetty/jetty6-clustering-wadi/pom.xml
+++ b/plugins/jetty/jetty6-clustering-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -70,7 +70,7 @@
                     <category>Jetty</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/jetty/jetty6-deployer/pom.xml b/plugins/jetty/jetty6-deployer/pom.xml
index d64ad74..3d8fd5b 100644
--- a/plugins/jetty/jetty6-deployer/pom.xml
+++ b/plugins/jetty/jetty6-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -119,8 +119,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/jetty/jetty6/pom.xml b/plugins/jetty/jetty6/pom.xml
index 17fd9a1..3a9add5 100644
--- a/plugins/jetty/jetty6/pom.xml
+++ b/plugins/jetty/jetty6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>jetty</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/jetty/pom.xml b/plugins/jetty/pom.xml
index 7470130..9ea7c10 100644
--- a/plugins/jetty/pom.xml
+++ b/plugins/jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>jetty</artifactId>
diff --git a/plugins/mejb/geronimo-mejb/pom.xml b/plugins/mejb/geronimo-mejb/pom.xml
index 65c827f..c158571 100644
--- a/plugins/mejb/geronimo-mejb/pom.xml
+++ b/plugins/mejb/geronimo-mejb/pom.xml
@@ -18,15 +18,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>mejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-mejb</artifactId>
diff --git a/plugins/mejb/mejb/pom.xml b/plugins/mejb/mejb/pom.xml
index 1fdcdf0..9bf2bf3 100644
--- a/plugins/mejb/mejb/pom.xml
+++ b/plugins/mejb/mejb/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>mejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/mejb/pom.xml b/plugins/mejb/pom.xml
index 87bfb51..8f3db6a 100644
--- a/plugins/mejb/pom.xml
+++ b/plugins/mejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>mejb</artifactId>
diff --git a/plugins/monitoring/agent-car-ejb/pom.xml b/plugins/monitoring/agent-car-ejb/pom.xml
index fddaa9c..78538ff 100644
--- a/plugins/monitoring/agent-car-ejb/pom.xml
+++ b/plugins/monitoring/agent-car-ejb/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
     
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>agent-car-ejb</artifactId>
diff --git a/plugins/monitoring/agent-car-jmx/pom.xml b/plugins/monitoring/agent-car-jmx/pom.xml
index 6353c7f..af33906 100644
--- a/plugins/monitoring/agent-car-jmx/pom.xml
+++ b/plugins/monitoring/agent-car-jmx/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>agent-car-jmx</artifactId>
diff --git a/plugins/monitoring/agent-ds/pom.xml b/plugins/monitoring/agent-ds/pom.xml
index 2028ebe..6e041a5 100644
--- a/plugins/monitoring/agent-ds/pom.xml
+++ b/plugins/monitoring/agent-ds/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
diff --git a/plugins/monitoring/agent-ejb/pom.xml b/plugins/monitoring/agent-ejb/pom.xml
index bc6aea5..e0e6ce2 100755
--- a/plugins/monitoring/agent-ejb/pom.xml
+++ b/plugins/monitoring/agent-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>agent-ejb</artifactId>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-jar</artifactId>
-            <version>2.1.5-SNAPSHOT</version>
+            <version>2.1.5</version>
         </dependency>
     </dependencies>
 
diff --git a/plugins/monitoring/agent-jar/pom.xml b/plugins/monitoring/agent-jar/pom.xml
index f624cae..4dfd421 100644
--- a/plugins/monitoring/agent-jar/pom.xml
+++ b/plugins/monitoring/agent-jar/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>agent-jar</artifactId>
diff --git a/plugins/monitoring/agent-jmx/pom.xml b/plugins/monitoring/agent-jmx/pom.xml
index b3d28e0..2fd6c01 100644
--- a/plugins/monitoring/agent-jmx/pom.xml
+++ b/plugins/monitoring/agent-jmx/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>agent-jmx</artifactId>
diff --git a/plugins/monitoring/agent-sql/pom.xml b/plugins/monitoring/agent-sql/pom.xml
index 3f93dec..38e966e 100644
--- a/plugins/monitoring/agent-sql/pom.xml
+++ b/plugins/monitoring/agent-sql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>agent-sql</artifactId>
diff --git a/plugins/monitoring/mconsole-ds/pom.xml b/plugins/monitoring/mconsole-ds/pom.xml
index 47e0d4d..6c937c4 100644
--- a/plugins/monitoring/mconsole-ds/pom.xml
+++ b/plugins/monitoring/mconsole-ds/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
 
-<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>
     
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
diff --git a/plugins/monitoring/mconsole-jetty/pom.xml b/plugins/monitoring/mconsole-jetty/pom.xml
index 573a8ca..1d444bf 100644
--- a/plugins/monitoring/mconsole-jetty/pom.xml
+++ b/plugins/monitoring/mconsole-jetty/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
diff --git a/plugins/monitoring/mconsole-tomcat/pom.xml b/plugins/monitoring/mconsole-tomcat/pom.xml
index d2794f3..12aed59 100644
--- a/plugins/monitoring/mconsole-tomcat/pom.xml
+++ b/plugins/monitoring/mconsole-tomcat/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
diff --git a/plugins/monitoring/mconsole-war/pom.xml b/plugins/monitoring/mconsole-war/pom.xml
index d4ab0ef..d35be9d 100644
--- a/plugins/monitoring/mconsole-war/pom.xml
+++ b/plugins/monitoring/mconsole-war/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>mconsole-war</artifactId>
@@ -123,9 +121,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/monitoring/pom.xml b/plugins/monitoring/pom.xml
index 4eeac84..8179f9a 100755
--- a/plugins/monitoring/pom.xml
+++ b/plugins/monitoring/pom.xml
@@ -18,16 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.monitoring</groupId>
diff --git a/plugins/myfaces/geronimo-myfaces-builder/pom.xml b/plugins/myfaces/geronimo-myfaces-builder/pom.xml
index 5378a42..17e9b1f 100644
--- a/plugins/myfaces/geronimo-myfaces-builder/pom.xml
+++ b/plugins/myfaces/geronimo-myfaces-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/myfaces/geronimo-myfaces/pom.xml b/plugins/myfaces/geronimo-myfaces/pom.xml
index c8a86bd..731ada5 100644
--- a/plugins/myfaces/geronimo-myfaces/pom.xml
+++ b/plugins/myfaces/geronimo-myfaces/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/myfaces/myfaces-deployer/pom.xml b/plugins/myfaces/myfaces-deployer/pom.xml
index 00343b6..a92d9cd 100644
--- a/plugins/myfaces/myfaces-deployer/pom.xml
+++ b/plugins/myfaces/myfaces-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -90,8 +90,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/myfaces/myfaces/pom.xml b/plugins/myfaces/myfaces/pom.xml
index efe2de1..a404d3b 100644
--- a/plugins/myfaces/myfaces/pom.xml
+++ b/plugins/myfaces/myfaces/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/myfaces/pom.xml b/plugins/myfaces/pom.xml
index 3c3bed4..4db153f 100644
--- a/plugins/myfaces/pom.xml
+++ b/plugins/myfaces/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>myfaces</artifactId>
diff --git a/plugins/openejb/geronimo-openejb-builder/pom.xml b/plugins/openejb/geronimo-openejb-builder/pom.xml
index e65b216..519c1d5 100644
--- a/plugins/openejb/geronimo-openejb-builder/pom.xml
+++ b/plugins/openejb/geronimo-openejb-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/openejb/geronimo-openejb/pom.xml b/plugins/openejb/geronimo-openejb/pom.xml
index 7fea335..6b888fc 100644
--- a/plugins/openejb/geronimo-openejb/pom.xml
+++ b/plugins/openejb/geronimo-openejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/openejb/openejb-deployer/pom.xml b/plugins/openejb/openejb-deployer/pom.xml
index 8b82f6c..30ac95f 100644
--- a/plugins/openejb/openejb-deployer/pom.xml
+++ b/plugins/openejb/openejb-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/openejb/openejb/pom.xml b/plugins/openejb/openejb/pom.xml
index 0443735..5231f3c 100644
--- a/plugins/openejb/openejb/pom.xml
+++ b/plugins/openejb/openejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/openejb/pom.xml b/plugins/openejb/pom.xml
index b2fdd1f..0ed31e1 100644
--- a/plugins/openejb/pom.xml
+++ b/plugins/openejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>openejb</artifactId>
diff --git a/plugins/openjpa/geronimo-openjpa/pom.xml b/plugins/openjpa/geronimo-openjpa/pom.xml
index 7543315..b6181d6 100644
--- a/plugins/openjpa/geronimo-openjpa/pom.xml
+++ b/plugins/openjpa/geronimo-openjpa/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml b/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
index a76333d..34c4bba 100644
--- a/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
+++ b/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/openjpa/geronimo-persistence-jpa10/pom.xml b/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
index ec73820..ac3d8cd 100644
--- a/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
+++ b/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/openjpa/openjpa/pom.xml b/plugins/openjpa/openjpa/pom.xml
index e88d797..660a200 100644
--- a/plugins/openjpa/openjpa/pom.xml
+++ b/plugins/openjpa/openjpa/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/openjpa/persistence-jpa10-deployer/pom.xml b/plugins/openjpa/persistence-jpa10-deployer/pom.xml
index fc3b558..1cac814 100644
--- a/plugins/openjpa/persistence-jpa10-deployer/pom.xml
+++ b/plugins/openjpa/persistence-jpa10-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/openjpa/pom.xml b/plugins/openjpa/pom.xml
index 1b9af52..abfc8ff 100644
--- a/plugins/openjpa/pom.xml
+++ b/plugins/openjpa/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>openjpa</artifactId>
diff --git a/plugins/plancreator/plancreator-console-jetty/pom.xml b/plugins/plancreator/plancreator-console-jetty/pom.xml
index 532684f..f4ac559 100644
--- a/plugins/plancreator/plancreator-console-jetty/pom.xml
+++ b/plugins/plancreator/plancreator-console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plancreator-console-jetty</artifactId>
diff --git a/plugins/plancreator/plancreator-console-tomcat/pom.xml b/plugins/plancreator/plancreator-console-tomcat/pom.xml
index 131fe02..544e147 100644
--- a/plugins/plancreator/plancreator-console-tomcat/pom.xml
+++ b/plugins/plancreator/plancreator-console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plancreator-console-tomcat</artifactId>
diff --git a/plugins/plancreator/plancreator-portlets/pom.xml b/plugins/plancreator/plancreator-portlets/pom.xml
index ad7756d..fb1fe80 100644
--- a/plugins/plancreator/plancreator-portlets/pom.xml
+++ b/plugins/plancreator/plancreator-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plancreator-portlets</artifactId>
@@ -146,9 +146,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/plancreator/pom.xml b/plugins/plancreator/pom.xml
index 424eb40..56eede1 100644
--- a/plugins/plancreator/pom.xml
+++ b/plugins/plancreator/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plancreator</artifactId>
diff --git a/plugins/pluto/geronimo-pluto/pom.xml b/plugins/pluto/geronimo-pluto/pom.xml
index 59796b1..e3540b9 100644
--- a/plugins/pluto/geronimo-pluto/pom.xml
+++ b/plugins/pluto/geronimo-pluto/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-pluto</artifactId>
diff --git a/plugins/pluto/pluto-support/pom.xml b/plugins/pluto/pluto-support/pom.xml
index e03e14f..6d47c5b 100644
--- a/plugins/pluto/pluto-support/pom.xml
+++ b/plugins/pluto/pluto-support/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>pluto-support</artifactId>
diff --git a/plugins/pluto/pom.xml b/plugins/pluto/pom.xml
index 4c497f9..76186ec 100644
--- a/plugins/pluto/pom.xml
+++ b/plugins/pluto/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>pluto</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9e1e749..00a7976 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.plugins</groupId>
diff --git a/plugins/procrun/pom.xml b/plugins/procrun/pom.xml
index 38403bc..c4f07c8 100644
--- a/plugins/procrun/pom.xml
+++ b/plugins/procrun/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -39,7 +39,7 @@
         Provides a Windows service wrapper with Apache Commons Daemon procrun for Geronimo.
     </description>
 
-    <dependencies/>
+    <dependencies />
 
     <build>
         <plugins>
diff --git a/plugins/remote-deploy/geronimo-remote-deploy/pom.xml b/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
index ccac777..1bd016b 100644
--- a/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
+++ b/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>
diff --git a/plugins/remote-deploy/pom.xml b/plugins/remote-deploy/pom.xml
index 92dd5b6..eba8522 100644
--- a/plugins/remote-deploy/pom.xml
+++ b/plugins/remote-deploy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>remote-deploy</artifactId>
diff --git a/plugins/remote-deploy/remote-deploy-jetty/pom.xml b/plugins/remote-deploy/remote-deploy-jetty/pom.xml
index 92b63ad..d63a82a 100644
--- a/plugins/remote-deploy/remote-deploy-jetty/pom.xml
+++ b/plugins/remote-deploy/remote-deploy-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/remote-deploy/remote-deploy-tomcat/pom.xml b/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
index d0ea1bb..00cba23 100644
--- a/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
+++ b/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/sharedlib/pom.xml b/plugins/sharedlib/pom.xml
index 27b9812..f0b2f91 100644
--- a/plugins/sharedlib/pom.xml
+++ b/plugins/sharedlib/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -66,10 +66,10 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.outputDirectory}"/>
+                                <mkdir dir="${project.build.outputDirectory}" />
                                 <copy todir="${project.build.outputDirectory}">
                                     <fileset dir="src/main/resources">
-                                        <include name="**"/>
+                                        <include name="**" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 27ed8a6..97e3818 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/system-database/geronimo-derby/pom.xml b/plugins/system-database/geronimo-derby/pom.xml
index cc8cbde..3a38bc6 100644
--- a/plugins/system-database/geronimo-derby/pom.xml
+++ b/plugins/system-database/geronimo-derby/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/system-database/geronimo-timer/pom.xml b/plugins/system-database/geronimo-timer/pom.xml
index fac98d1..598ddd2 100644
--- a/plugins/system-database/geronimo-timer/pom.xml
+++ b/plugins/system-database/geronimo-timer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/system-database/pom.xml b/plugins/system-database/pom.xml
index b0256db..a5079ca 100644
--- a/plugins/system-database/pom.xml
+++ b/plugins/system-database/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>system-database</artifactId>
diff --git a/plugins/system-database/sysdb-console-jetty/pom.xml b/plugins/system-database/sysdb-console-jetty/pom.xml
index 65f2f56..4fee702 100644
--- a/plugins/system-database/sysdb-console-jetty/pom.xml
+++ b/plugins/system-database/sysdb-console-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sysdb-console-jetty</artifactId>
diff --git a/plugins/system-database/sysdb-console-tomcat/pom.xml b/plugins/system-database/sysdb-console-tomcat/pom.xml
index a248da2..f21e837 100644
--- a/plugins/system-database/sysdb-console-tomcat/pom.xml
+++ b/plugins/system-database/sysdb-console-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sysdb-console-tomcat</artifactId>
diff --git a/plugins/system-database/sysdb-portlets/pom.xml b/plugins/system-database/sysdb-portlets/pom.xml
index 2a978ff..7d42f0f 100644
--- a/plugins/system-database/sysdb-portlets/pom.xml
+++ b/plugins/system-database/sysdb-portlets/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sysdb-portlets</artifactId>
@@ -145,9 +145,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/plugins/system-database/system-database/pom.xml b/plugins/system-database/system-database/pom.xml
index 5fb69c5..fa08274 100644
--- a/plugins/system-database/system-database/pom.xml
+++ b/plugins/system-database/system-database/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/tomcat/geronimo-tomcat6-builder/pom.xml b/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
index d2694ca..1bf9cc5 100644
--- a/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
+++ b/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -157,13 +157,13 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml"/>
+                                <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml" />
                                 <copy todir="${project.build.directory}/var/catalina/webapps">
                                     <fileset dir="src/test/resources/deployables">
-                                        <include name="war1/**"/>
-                                        <include name="war3/**"/>
-                                        <include name="war4/**"/>
-                                        <include name="war6-jee5/**"/>
+                                        <include name="war1/**" />
+                                        <include name="war3/**" />
+                                        <include name="war4/**" />
+                                        <include name="war6-jee5/**" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml b/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
index 91deffc..e0a7f33 100644
--- a/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
+++ b/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml b/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
index f5ece3e..dbb4c12 100644
--- a/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
+++ b/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/tomcat/geronimo-tomcat6/pom.xml b/plugins/tomcat/geronimo-tomcat6/pom.xml
index e7f2ed3..841df27 100644
--- a/plugins/tomcat/geronimo-tomcat6/pom.xml
+++ b/plugins/tomcat/geronimo-tomcat6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml
index 5389743..89b05a6 100644
--- a/plugins/tomcat/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>tomcat</artifactId>
diff --git a/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml b/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
index c968d79..30c8432 100644
--- a/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
+++ b/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/tomcat/tomcat6-clustering-wadi/pom.xml b/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
index 94681b1..2cb084c 100644
--- a/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
+++ b/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -70,7 +70,7 @@
                     <category>Tomcat</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/tomcat/tomcat6-deployer/pom.xml b/plugins/tomcat/tomcat6-deployer/pom.xml
index ad70e66..5e7b0fa 100644
--- a/plugins/tomcat/tomcat6-deployer/pom.xml
+++ b/plugins/tomcat/tomcat6-deployer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -127,8 +127,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>
diff --git a/plugins/tomcat/tomcat6-no-ha/pom.xml b/plugins/tomcat/tomcat6-no-ha/pom.xml
index 19bde76..7768c7a 100644
--- a/plugins/tomcat/tomcat6-no-ha/pom.xml
+++ b/plugins/tomcat/tomcat6-no-ha/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/tomcat/tomcat6/pom.xml b/plugins/tomcat/tomcat6/pom.xml
index 19f8cdc..dd0c9db 100644
--- a/plugins/tomcat/tomcat6/pom.xml
+++ b/plugins/tomcat/tomcat6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/uddi/geronimo-uddi-db/pom.xml b/plugins/uddi/geronimo-uddi-db/pom.xml
index 0c096c9..c12eccd 100644
--- a/plugins/uddi/geronimo-uddi-db/pom.xml
+++ b/plugins/uddi/geronimo-uddi-db/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-uddi-db</artifactId>
@@ -49,8 +49,8 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <delete dir="${derby.system.home}"/>
-                                <mkdir dir="${derby.system.home}"/>
+                                <delete dir="${derby.system.home}" />
+                                <mkdir dir="${derby.system.home}" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/plugins/uddi/pom.xml b/plugins/uddi/pom.xml
index e5257e2..6007736 100644
--- a/plugins/uddi/pom.xml
+++ b/plugins/uddi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>uddi</artifactId>
diff --git a/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml b/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml
index b5755d5..d663071 100644
--- a/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml
+++ b/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi-server</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-uddi-server</artifactId>
diff --git a/plugins/uddi/uddi-server/pom.xml b/plugins/uddi/uddi-server/pom.xml
index c2a10bb..cb114ba 100644
--- a/plugins/uddi/uddi-server/pom.xml
+++ b/plugins/uddi/uddi-server/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>uddi-server</artifactId>
diff --git a/plugins/uddi/uddi-server/uddi-jetty6/pom.xml b/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
index aa9a3a6..06692ea 100644
--- a/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
+++ b/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi-server</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/uddi/uddi-server/uddi-tomcat/pom.xml b/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
index ed0be54..725a723 100644
--- a/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
+++ b/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi-server</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/webservices/geronimo-webservices-builder/pom.xml b/plugins/webservices/geronimo-webservices-builder/pom.xml
index 38a8105..f1f38e0 100644
--- a/plugins/webservices/geronimo-webservices-builder/pom.xml
+++ b/plugins/webservices/geronimo-webservices-builder/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>webservices</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/webservices/geronimo-webservices/pom.xml b/plugins/webservices/geronimo-webservices/pom.xml
index f374b1f..906279b 100644
--- a/plugins/webservices/geronimo-webservices/pom.xml
+++ b/plugins/webservices/geronimo-webservices/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>webservices</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
diff --git a/plugins/webservices/pom.xml b/plugins/webservices/pom.xml
index a84d741..914dfe4 100644
--- a/plugins/webservices/pom.xml
+++ b/plugins/webservices/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>webservices</artifactId>
diff --git a/plugins/webservices/webservices-common/pom.xml b/plugins/webservices/webservices-common/pom.xml
index 78a4dfa..838c021 100644
--- a/plugins/webservices/webservices-common/pom.xml
+++ b/plugins/webservices/webservices-common/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>webservices</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/welcome/geronimo-welcome/pom.xml b/plugins/welcome/geronimo-welcome/pom.xml
index 829188c..1e3fcb2 100644
--- a/plugins/welcome/geronimo-welcome/pom.xml
+++ b/plugins/welcome/geronimo-welcome/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>welcome</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-welcome</artifactId>
diff --git a/plugins/welcome/pom.xml b/plugins/welcome/pom.xml
index d3431bb..ed7117f 100644
--- a/plugins/welcome/pom.xml
+++ b/plugins/welcome/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>welcome</artifactId>
diff --git a/plugins/welcome/welcome-jetty/pom.xml b/plugins/welcome/welcome-jetty/pom.xml
index e51d09f..5b365f6 100644
--- a/plugins/welcome/welcome-jetty/pom.xml
+++ b/plugins/welcome/welcome-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>welcome</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/plugins/welcome/welcome-tomcat/pom.xml b/plugins/welcome/welcome-tomcat/pom.xml
index 4beb7f3..751510c 100644
--- a/plugins/welcome/welcome-tomcat/pom.xml
+++ b/plugins/welcome/welcome-tomcat/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>welcome</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
diff --git a/pom.xml b/pom.xml
index c4f76c8..29cead6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <name>Geronimo</name>
     <packaging>pom</packaging>
 
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.5</version>
 
     <description>
         Apache Geronimo, the JavaEE server project of the Apache Software Foundation.
@@ -53,9 +53,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/branches/2.1</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/branches/2.1</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/server/branches/2.1</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.5</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.5</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/server/tags/geronimo-2.1.5</url>
     </scm>
 
     <properties>
@@ -69,7 +69,7 @@
               element, and it will need to be changed manually before a release,
               as the maven-release-plugin will not update this value.
         -->
-        <version>2.1.5-SNAPSHOT</version>
+        <version>${version}</version>
         
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
diff --git a/repository/pom.xml b/repository/pom.xml
index b974b25..ee67fbf 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -18,15 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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>
 
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>repository</artifactId>
diff --git a/testsuite/commands-testsuite/deploy/pom.xml b/testsuite/commands-testsuite/deploy/pom.xml
index 10c1cc3..a4d834e 100644
--- a/testsuite/commands-testsuite/deploy/pom.xml
+++ b/testsuite/commands-testsuite/deploy/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>commands-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>deploy</artifactId>
diff --git a/testsuite/commands-testsuite/gshell/pom.xml b/testsuite/commands-testsuite/gshell/pom.xml
index f30c387..e2af375 100644
--- a/testsuite/commands-testsuite/gshell/pom.xml
+++ b/testsuite/commands-testsuite/gshell/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>commands-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>gshell</artifactId>
diff --git a/testsuite/commands-testsuite/jaxws/pom.xml b/testsuite/commands-testsuite/jaxws/pom.xml
index 72c0397..131648b 100644
--- a/testsuite/commands-testsuite/jaxws/pom.xml
+++ b/testsuite/commands-testsuite/jaxws/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>commands-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws</artifactId>
diff --git a/testsuite/commands-testsuite/pom.xml b/testsuite/commands-testsuite/pom.xml
index a6d2fad..9082027 100644
--- a/testsuite/commands-testsuite/pom.xml
+++ b/testsuite/commands-testsuite/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>commands-testsuite</artifactId>
diff --git a/testsuite/commands-testsuite/shutdown/pom.xml b/testsuite/commands-testsuite/shutdown/pom.xml
index 9e9282a..9b20e83 100644
--- a/testsuite/commands-testsuite/shutdown/pom.xml
+++ b/testsuite/commands-testsuite/shutdown/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>commands-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>shutdown</artifactId>
diff --git a/testsuite/console-testsuite/advanced/pom.xml b/testsuite/console-testsuite/advanced/pom.xml
index b53eed1..c6395f6 100644
--- a/testsuite/console-testsuite/advanced/pom.xml
+++ b/testsuite/console-testsuite/advanced/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>advanced</artifactId>
diff --git a/testsuite/console-testsuite/basic/pom.xml b/testsuite/console-testsuite/basic/pom.xml
index 5766122..f8b2bb6 100644
--- a/testsuite/console-testsuite/basic/pom.xml
+++ b/testsuite/console-testsuite/basic/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>basic</artifactId>
diff --git a/testsuite/console-testsuite/pom.xml b/testsuite/console-testsuite/pom.xml
index 8af0404..43ff896 100644
--- a/testsuite/console-testsuite/pom.xml
+++ b/testsuite/console-testsuite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>console-testsuite</artifactId>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
index b26ed8d..024773c 100644
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
+++ b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-helloworld-client</artifactId>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
index 8571a93..02b1048 100644
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
+++ b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-helloworld-ear</artifactId>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
index 5d1108b..fda3df7 100644
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
+++ b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-helloworld-ejb</artifactId>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
index e47524d..0ba1653 100644
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
+++ b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-helloworld-war</artifactId>
diff --git a/testsuite/corba-testsuite/corba-helloworld/pom.xml b/testsuite/corba-testsuite/corba-helloworld/pom.xml
index 8f74ef0..ef79497 100644
--- a/testsuite/corba-testsuite/corba-helloworld/pom.xml
+++ b/testsuite/corba-testsuite/corba-helloworld/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-helloworld</artifactId>
diff --git a/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml b/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
index 1c003f6..17e4c6a 100644
--- a/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
+++ b/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements.  See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership.  The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License.  You may obtain a copy of the License at

-

-     http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied.  See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.testsuite</groupId>

-        <artifactId>corba-marshal</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>corba-marshal-client</artifactId>

-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>

-    <packaging>jar</packaging>

-    <description>Example using CORBA to access a stateless EJB</description>

-

-            <dependencies>

-                <dependency>

-                    <groupId>${pom.groupId}</groupId>

-                    <artifactId>corba-marshal-ejb</artifactId>

-                    <version>${version}</version>

-                    <type>ejb</type>

-                    <scope>provided</scope>

-                </dependency>

-                <dependency>

-                    <groupId>org.apache.geronimo.specs</groupId>

-                    <artifactId>geronimo-ejb_3.0_spec</artifactId>

-                    <scope>provided</scope>

-                </dependency>

-            </dependencies>

-

-    <profiles>

-        <profile>

-            <id>child</id>

-              

-            <build>

-                <plugins>

-                    <plugin>

-                        <artifactId>maven-jar-plugin</artifactId>

-                        <configuration>

-                            <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>

-                            <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>

-                            <archive>

-                                <manifest>

-                                    <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>

-                                </manifest>

-                            </archive>

-                        </configuration>

-                    </plugin>

-                </plugins>

-            </build>

-

-        </profile>

-    </profiles>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>corba-marshal</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>corba-marshal-client</artifactId>
+    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
+    <packaging>jar</packaging>
+    <description>Example using CORBA to access a stateless EJB</description>
+
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+              
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>
+                            <displayName>Geronimo Marshal Enterprise Application CORBA Client JAR</displayName>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.apache.geronimo.testsuite.corba.marshal.MarshalEJBClient</mainClass>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
+        </profile>
+    </profiles>
+</project>
diff --git a/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml b/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
index badb2b8..9df8983 100644
--- a/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
+++ b/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements.  See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership.  The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License.  You may obtain a copy of the License at

-

-     http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied.  See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.testsuite</groupId>

-        <artifactId>corba-marshal</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>corba-marshal-ear</artifactId>

-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EAR</name>

-    <packaging>ear</packaging>

-    <description>Example using CORBA to access a stateless EJB</description>

-

-    <properties>

-        <clientLogFile>${basedir}/target/client.log</clientLogFile>

-    </properties>

-

-

-            

-            <dependencies>

-                <dependency>

-                    <groupId>${pom.groupId}</groupId>

-                    <artifactId>corba-marshal-ejb</artifactId>

-                    <version>${version}</version>

-                    <type>ejb</type>

-                </dependency>

-                <dependency>

-                    <groupId>${pom.groupId}</groupId>

-                    <artifactId>corba-marshal-client</artifactId>

-                    <version>${version}</version>

-                    <type>jar</type>

-                </dependency>

-            </dependencies>

-            

-    <profiles>

-        <profile>

-            <id>child</id>

-            

-            <build>

-                <plugins>

-                  <plugin>

-                        <groupId>org.apache.geronimo.buildsupport</groupId>

-                        <artifactId>testsuite-maven-plugin</artifactId>

-                        <version>${version}</version>

-                        <executions>

-                            <execution>

-                                <id>generate-surefire-xml</id>

-                                <phase>install</phase>

-                                <goals>

-                                    <goal>generate-surefire-xml</goal>

-                                </goals>

-                                <!--

-                                Merging the configuration of this plugin with the one it inherits.

-                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.

-                                -->

-                                <configuration>

-                                    <grandParent>true</grandParent>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-        

-                    <plugin>

-                        <artifactId>maven-ear-plugin</artifactId>

-                        <configuration>

-                            <description>Geronimo Marshal Enterprise Application EAR</description>

-                            <displayName>Geronimo Marshal Enterprise Application EAR</displayName>

-                            <version>5</version>

-                            <modules>

-                                <ejbModule>

-                                    <groupId>${pom.groupId}</groupId>

-                                    <artifactId>corba-marshal-ejb</artifactId>

-                                    <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>

-                                </ejbModule>

-                                <jarModule>

-                                    <groupId>${pom.groupId}</groupId>

-                                    <artifactId>corba-marshal-client</artifactId>

-                                    <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>

-                                </jarModule>

-                            </modules>

-                        </configuration>

-                    </plugin>

-        

-                    <!-- Deploy the ear and invoke the imbedded CORBA app client -->

-                    <plugin>

-                        <groupId>org.apache.geronimo.buildsupport</groupId>

-                        <artifactId>geronimo-maven-plugin</artifactId>

-        

-                        <executions>

-                            <!-- These modules must be running before deploying a CORBA module can be deployed -->

-                            <execution>

-                                <id>start-j2ee-corba-yoko</id>

-                                <phase>pre-integration-test</phase>

-                                <goals>

-                                    <goal>start-module</goal>

-                                </goals>

-                                <configuration>

-                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>

-                                </configuration>

-                            </execution>

-                            <execution>

-                                <id>openejb-corba-deployer</id>

-                                <phase>pre-integration-test</phase>

-                                <goals>

-                                    <goal>start-module</goal>

-                                </goals>

-                                <configuration>

-                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>

-                                </configuration>

-                            </execution>

-        

-                            <!-- Deploy the CORBA module -->

-                            <execution>

-                                <id>deploy-ear</id>

-                                <phase>pre-integration-test</phase>

-                                <goals>

-                                    <goal>deploy-module</goal>

-                                </goals>

-                                <configuration>

-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>

-                                </configuration>

-                            </execution>

-        

-                            <!-- Invoke the CORBA app client -->

-                            <execution>

-                                <phase>pre-integration-test</phase>

-                                <id>run-client</id>

-                                <goals>

-                                    <goal>run-client</goal>

-                                </goals>

-                                <configuration>

-                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>

-                                    <!--

-                                    <logOutput>true</logOutput>

-                                    <logFile>${clientLogFile}</logFile>

-                                    -->

-                                </configuration>

-                            </execution>

-        

-                            <!-- Undeploy the CORBA module -->

-                            <execution>

-                                <id>undeploy-ear</id>

-                                <phase>post-integration-test</phase>

-                                <goals>

-                                    <goal>undeploy-module</goal>

-                                </goals>

-                                <configuration>

-                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-        

-                </plugins>

-            </build>

-

-        </profile>

-    </profiles>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>corba-marshal</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>corba-marshal-ear</artifactId>
+    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EAR</name>
+    <packaging>ear</packaging>
+    <description>Example using CORBA to access a stateless EJB</description>
+
+    <properties>
+        <clientLogFile>${basedir}/target/client.log</clientLogFile>
+    </properties>
+
+
+            
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>ejb</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>corba-marshal-client</artifactId>
+                    <version>${version}</version>
+                    <type>jar</type>
+                </dependency>
+            </dependencies>
+            
+    <profiles>
+        <profile>
+            <id>child</id>
+            
+            <build>
+                <plugins>
+                  <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <version>${version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-surefire-xml</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                                <!--
+                                Merging the configuration of this plugin with the one it inherits.
+                                Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                                -->
+                                <configuration>
+                                    <grandParent>true</grandParent>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                    <plugin>
+                        <artifactId>maven-ear-plugin</artifactId>
+                        <configuration>
+                            <description>Geronimo Marshal Enterprise Application EAR</description>
+                            <displayName>Geronimo Marshal Enterprise Application EAR</displayName>
+                            <version>5</version>
+                            <modules>
+                                <ejbModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-marshal-ejb</artifactId>
+                                    <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
+                                </ejbModule>
+                                <jarModule>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>corba-marshal-client</artifactId>
+                                    <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
+                                </jarModule>
+                            </modules>
+                        </configuration>
+                    </plugin>
+        
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client -->
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+        
+                        <executions>
+                            <!-- These modules must be running before deploying a CORBA module can be deployed -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Deploy the CORBA module -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+        
+                            <!-- Invoke the CORBA app client -->
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
+                                    <!--
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                    -->
+                                </configuration>
+                            </execution>
+        
+                            <!-- Undeploy the CORBA module -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+        
+                </plugins>
+            </build>
+
+        </profile>
+    </profiles>
+</project>
diff --git a/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml b/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
index 9c9f1a5..e53b21e 100644
--- a/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
+++ b/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one or more

-    contributor license agreements.  See the NOTICE file distributed with

-    this work for additional information regarding copyright ownership.

-    The ASF licenses this file to You under the Apache License, Version 2.0

-    (the "License"); you may not use this file except in compliance with

-    the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.testsuite</groupId>

-        <artifactId>corba-marshal</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>corba-marshal-ejb</artifactId>

-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>

-    <packaging>ejb</packaging>

-    <description>Geronimo Marshal Enterprise Stateless EJB</description>

-   

-            <dependencies>

-                <dependency>

-                    <groupId>org.apache.geronimo.specs</groupId>

-                    <artifactId>geronimo-ejb_3.0_spec</artifactId>

-                    <scope>provided</scope>

-                </dependency>

-            </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>corba-marshal</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>corba-marshal-ejb</artifactId>
+    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>
+    <packaging>ejb</packaging>
+    <description>Geronimo Marshal Enterprise Stateless EJB</description>
+   
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+
+</project>
diff --git a/testsuite/corba-testsuite/corba-marshal/pom.xml b/testsuite/corba-testsuite/corba-marshal/pom.xml
index 2d9339b..544fd2b 100644
--- a/testsuite/corba-testsuite/corba-marshal/pom.xml
+++ b/testsuite/corba-testsuite/corba-marshal/pom.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements.  See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership.  The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License.  You may obtain a copy of the License at

-

-     http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied.  See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.testsuite</groupId>

-        <artifactId>corba-testsuite</artifactId>

-        <version>2.1.5-SNAPSHOT</version>

-    </parent>

-

-    <artifactId>corba-marshal</artifactId>

-    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal</name>

-    <packaging>pom</packaging>

-    <description>Geronimo JEE5 CORBA Marshal Tests</description>

-

-    <profiles>

-        <profile>

-            <id>child</id>

-            <modules>

-                <module>corba-marshal-ejb</module>

-                <module>corba-marshal-client</module>

-                <module>corba-marshal-ear</module>

-            </modules>

-        </profile>

-        

-        <profile>

-            <id>all-subprojects</id>

-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->

-            <modules>

-                <module>corba-marshal-ejb</module>

-                <module>corba-marshal-client</module>

-                <module>corba-marshal-ear</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>corba-testsuite</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>corba-marshal</artifactId>
+    <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal</name>
+    <packaging>pom</packaging>
+    <description>Geronimo JEE5 CORBA Marshal Tests</description>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <modules>
+                <module>corba-marshal-ejb</module>
+                <module>corba-marshal-client</module>
+                <module>corba-marshal-ear</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>corba-marshal-ejb</module>
+                <module>corba-marshal-client</module>
+                <module>corba-marshal-ear</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml b/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
index a349070..6281b11 100644
--- a/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
+++ b/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-mytime</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-mytime-ear</artifactId>
diff --git a/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml b/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
index af67709..2f04f2c 100644
--- a/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
+++ b/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-mytime</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-mytime-ejb</artifactId>
diff --git a/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml b/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
index 1b020b1..8b2093b 100644
--- a/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
+++ b/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-mytime</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-mytime-war</artifactId>
diff --git a/testsuite/corba-testsuite/corba-mytime/pom.xml b/testsuite/corba-testsuite/corba-mytime/pom.xml
index 98129b7..4c87c3c 100644
--- a/testsuite/corba-testsuite/corba-mytime/pom.xml
+++ b/testsuite/corba-testsuite/corba-mytime/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba-mytime</artifactId>
diff --git a/testsuite/corba-testsuite/pom.xml b/testsuite/corba-testsuite/pom.xml
index 1e95df1..ababd3b 100644
--- a/testsuite/corba-testsuite/pom.xml
+++ b/testsuite/corba-testsuite/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <name>Geronimo TestSuite :: CORBA TestSuite</name>
diff --git a/testsuite/deployment-testsuite/deployment-tests/pom.xml b/testsuite/deployment-testsuite/deployment-tests/pom.xml
index 7072f33..de28ed2 100644
--- a/testsuite/deployment-testsuite/deployment-tests/pom.xml
+++ b/testsuite/deployment-testsuite/deployment-tests/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>deployment-tests</artifactId>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
index 2c9f4aa..10e875c 100644
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
+++ b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jca-cms-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jca-cms-ear</artifactId>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
index 2c9118d..ef5273f 100644
--- a/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
+++ b/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
@@ -15,13 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jca-cms-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jca-cms-war</artifactId>
diff --git a/testsuite/deployment-testsuite/jca-cms-tests/pom.xml b/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
index 7bf9124..700aefd 100644
--- a/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
+++ b/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jca-cms-tests</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
index c5db2df..833a3e8 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-ear</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
index 727ce7e..569ef47 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-ejb</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
index 6b41cf8..924b7aa 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-jar</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
index a81bc3c..6e56c67 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-jar2</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
index 8c6fb89..9355344 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
@@ -15,13 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-war-jar</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
index 4771e9b..b409da7 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
@@ -15,13 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-war</artifactId>
diff --git a/testsuite/deployment-testsuite/manifestcp-tests/pom.xml b/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
index f482dd6..7797cc5 100644
--- a/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
+++ b/testsuite/deployment-testsuite/manifestcp-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>manifestcp-tests</artifactId>
diff --git a/testsuite/deployment-testsuite/pom.xml b/testsuite/deployment-testsuite/pom.xml
index f24ec1c..9e31e6d 100644
--- a/testsuite/deployment-testsuite/pom.xml
+++ b/testsuite/deployment-testsuite/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>deployment-testsuite</artifactId>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
index 4e8aeb6..c2b9a74 100644
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
+++ b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ejb-ear</artifactId>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
index 53590b2..db46c08 100644
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
+++ b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ejb-ejb</artifactId>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
index e038e43..df7c074 100644
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
+++ b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ejb-war</artifactId>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/pom.xml
index 432c432..691937c 100644
--- a/testsuite/enterprise-testsuite/ejb-tests/pom.xml
+++ b/testsuite/enterprise-testsuite/ejb-tests/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ejb-tests</artifactId>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
index 4167ece..8471574 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jms-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jms-ear</artifactId>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
index caefdff..5b66a0a 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
+<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>
     <artifactId>jms-tests</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo.testsuite</groupId>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
index bbbd33f..e748db5 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jms-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jms-war</artifactId>
diff --git a/testsuite/enterprise-testsuite/jms-tests/pom.xml b/testsuite/enterprise-testsuite/jms-tests/pom.xml
index 7d8fd85..c6bf5f4 100644
--- a/testsuite/enterprise-testsuite/jms-tests/pom.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jms-tests</artifactId>
diff --git a/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml b/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
index bdb669f..b3ca2f6 100644
--- a/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
+++ b/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
@@ -15,15 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>jpa-ear</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
diff --git a/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml b/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
index d33bfe6..eea8105 100644
--- a/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
+++ b/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>
@@ -77,18 +76,16 @@
                                     <tasks>
                                         <path id="enhance.path.ref">
                                             <fileset dir="${project.build.outputDirectory}">
-                                                <include name="**/*.class"/>
+                                                <include name="**/*.class" />
                                             </fileset>
                                         </path>
-                                        <pathconvert property="enhance.files"
-                                           refid="enhance.path.ref"
-                                           pathsep=" "/>
+                                        <pathconvert property="enhance.files" refid="enhance.path.ref" pathsep=" " />
                                         <java classname="org.apache.openjpa.enhance.PCEnhancer">
-                                            <arg line="-p persistence.xml"/>
-                                            <arg line="${enhance.files}"/>
+                                            <arg line="-p persistence.xml" />
+                                            <arg line="${enhance.files}" />
                                             <classpath>
-                                                <path refid="maven.dependency.classpath"/>
-                                                <path refid="maven.compile.classpath"/>
+                                                <path refid="maven.dependency.classpath" />
+                                                <path refid="maven.compile.classpath" />
                                             </classpath>
                                         </java>
                                     </tasks>
diff --git a/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml b/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
index fb1a337..624f5b8 100644
--- a/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
+++ b/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
@@ -15,15 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>
diff --git a/testsuite/enterprise-testsuite/jpa-tests/pom.xml b/testsuite/enterprise-testsuite/jpa-tests/pom.xml
index 64f38f5..86fedc0 100644
--- a/testsuite/enterprise-testsuite/jpa-tests/pom.xml
+++ b/testsuite/enterprise-testsuite/jpa-tests/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jpa-tests</artifactId>
diff --git a/testsuite/enterprise-testsuite/pom.xml b/testsuite/enterprise-testsuite/pom.xml
index b2f3c9f..f88a200 100644
--- a/testsuite/enterprise-testsuite/pom.xml
+++ b/testsuite/enterprise-testsuite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>enterprise-testsuite</artifactId>
diff --git a/testsuite/enterprise-testsuite/sec-tests/pom.xml b/testsuite/enterprise-testsuite/sec-tests/pom.xml
index 9221873..24949cf 100644
--- a/testsuite/enterprise-testsuite/sec-tests/pom.xml
+++ b/testsuite/enterprise-testsuite/sec-tests/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sec-tests</artifactId>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
index 4f885f7..fa234ed 100644
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
+++ b/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
@@ -15,15 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>sec-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>sec-ear</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - EAR</name>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
index edf6ca1..6ee1e5d 100644
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
+++ b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
@@ -15,14 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>sec-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sec-ejb</artifactId>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
index 7994b74..e24bb4d 100644
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
+++ b/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
@@ -15,15 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>sec-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>sec-war</artifactId>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index e5258d4..43ecf22 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.testsuite</groupId>
diff --git a/testsuite/security-testsuite/pom.xml b/testsuite/security-testsuite/pom.xml
index 2b9cf8d..8755397 100644
--- a/testsuite/security-testsuite/pom.xml
+++ b/testsuite/security-testsuite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>security-testsuite</artifactId>
diff --git a/testsuite/security-testsuite/test-security/pom.xml b/testsuite/security-testsuite/test-security/pom.xml
index 2836ce9..03f757f 100644
--- a/testsuite/security-testsuite/test-security/pom.xml
+++ b/testsuite/security-testsuite/test-security/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>security-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-security</artifactId>
diff --git a/testsuite/web-testsuite/pom.xml b/testsuite/web-testsuite/pom.xml
index 681f6dc..4f17444 100644
--- a/testsuite/web-testsuite/pom.xml
+++ b/testsuite/web-testsuite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>web-testsuite</artifactId>
diff --git a/testsuite/web-testsuite/test-2.1-jsps/pom.xml b/testsuite/web-testsuite/test-2.1-jsps/pom.xml
index 327a02d..da4b514 100644
--- a/testsuite/web-testsuite/test-2.1-jsps/pom.xml
+++ b/testsuite/web-testsuite/test-2.1-jsps/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-2.1-jsps</artifactId>
diff --git a/testsuite/web-testsuite/test-2.5-servlets/pom.xml b/testsuite/web-testsuite/test-2.5-servlets/pom.xml
index 5783c41..b9bd8a6 100644
--- a/testsuite/web-testsuite/test-2.5-servlets/pom.xml
+++ b/testsuite/web-testsuite/test-2.5-servlets/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-2.5-servlets</artifactId>
diff --git a/testsuite/web-testsuite/test-jetty/pom.xml b/testsuite/web-testsuite/test-jetty/pom.xml
index 66a02c6..c1cfb7c 100644
--- a/testsuite/web-testsuite/test-jetty/pom.xml
+++ b/testsuite/web-testsuite/test-jetty/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-jetty</artifactId>
diff --git a/testsuite/web-testsuite/test-myfaces/pom.xml b/testsuite/web-testsuite/test-myfaces/pom.xml
index eac4e0e..00d2265 100644
--- a/testsuite/web-testsuite/test-myfaces/pom.xml
+++ b/testsuite/web-testsuite/test-myfaces/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-myfaces</artifactId>
diff --git a/testsuite/web-testsuite/test-tomcat/pom.xml b/testsuite/web-testsuite/test-tomcat/pom.xml
index e07ca18..52475e4 100644
--- a/testsuite/web-testsuite/test-tomcat/pom.xml
+++ b/testsuite/web-testsuite/test-tomcat/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-tomcat</artifactId>
diff --git a/testsuite/web-testsuite/test-web-forward/pom.xml b/testsuite/web-testsuite/test-web-forward/pom.xml
index 5e9f9e1..b5b9900 100644
--- a/testsuite/web-testsuite/test-web-forward/pom.xml
+++ b/testsuite/web-testsuite/test-web-forward/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>test-web-forward</artifactId>
     <name>Geronimo TestSuite :: Web Testsuite :: Test Servlet Forwarding</name>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
index 4ee2669..1f74b51 100644
--- a/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
+++ b/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-forward</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>web-forward-ear</artifactId>
     <name>Geronimo TestSuite :: Test Servlet Forwarding :: EAR</name>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
index 3755290..2d6fb93 100644
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
+++ b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-forward</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>web-forward-war-1</artifactId>
     <name>Geronimo TestSuite :: Test Servlet Forwarding :: WAR I</name>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
index fc4bd30..2399b9e 100644
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
+++ b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-forward</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>web-forward-war-2</artifactId>
     <name>Geronimo TestSuite :: Test Servlet Forwarding :: WAR II</name>
diff --git a/testsuite/web-testsuite/test-web-references/pom.xml b/testsuite/web-testsuite/test-web-references/pom.xml
index bbcb8bd..3e6742a 100644
--- a/testsuite/web-testsuite/test-web-references/pom.xml
+++ b/testsuite/web-testsuite/test-web-references/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>test-web-references</artifactId>
     <name>Geronimo TestSuite :: Web Testsuite :: Test WebReferences</name>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
index 3c9256f..534e45b 100644
--- a/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
+++ b/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-references</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>web-references-ear</artifactId>
     <name>Geronimo TestSuite :: Test Web References :: EAR</name>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
index 4791f34..861b2b6 100644
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
+++ b/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-references</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>web-references-ejb</artifactId>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
index b7f32c6..94ee3e5 100644
--- a/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
+++ b/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>test-web-references</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>web-references-war</artifactId>
     <name>Geronimo TestSuite :: Test Web References :: WAR</name>
diff --git a/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml b/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
index bb0739a..14c94f4 100644
--- a/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
+++ b/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxb-client</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml b/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
index 2a5bfa4..9c8b43e 100644
--- a/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
+++ b/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxb-ejb</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml b/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
index 904c6bb..2eb6c67 100644
--- a/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxb-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxb-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxb-tests/pom.xml b/testsuite/webservices-testsuite/jaxb-tests/pom.xml
index ecc6e68..444cdc49 100644
--- a/testsuite/webservices-testsuite/jaxb-tests/pom.xml
+++ b/testsuite/webservices-testsuite/jaxb-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
index e6dd4c1..520362a 100644
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
+++ b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxr-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxr-client</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
index d162986..9fcc71e 100644
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
+++ b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxr-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxr-ejb</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
index d93b527..852045b 100644
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxr-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxr-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/pom.xml
index 7efa32a..4dc2c03 100644
--- a/testsuite/webservices-testsuite/jaxr-tests/pom.xml
+++ b/testsuite/webservices-testsuite/jaxr-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
index a8a0a04..c055cfc 100644
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxrpc-jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxrpc-jaxws-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
index 5a878cf..8b2b2fa 100644
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
+++ b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
index 3a70f45..45e2b66 100644
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
+++ b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxrpc-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxrpc-ejb</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
index 7719642..ad88742 100644
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxrpc-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxrpc-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
index 8135591..5240cb3 100644
--- a/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
+++ b/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
index 3653197..1fd5336 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>jaxws-client</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Client</name>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
index 63aee32..66011ed 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws-ejb</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
index 35396a4..5348968 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws-partial</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
index d65ee97..01425ca 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws-rest-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
index 40289a4..7428b9b 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>jaxws-war</artifactId>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/pom.xml
index 5ec61af..321378c 100644
--- a/testsuite/webservices-testsuite/jaxws-tests/pom.xml
+++ b/testsuite/webservices-testsuite/jaxws-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/pom.xml b/testsuite/webservices-testsuite/pom.xml
index a89a8f0..be964cf 100644
--- a/testsuite/webservices-testsuite/pom.xml
+++ b/testsuite/webservices-testsuite/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>webservices-testsuite</artifactId>
diff --git a/testsuite/webservices-testsuite/saaj-tests/pom.xml b/testsuite/webservices-testsuite/saaj-tests/pom.xml
index afd1310..5af126a 100644
--- a/testsuite/webservices-testsuite/saaj-tests/pom.xml
+++ b/testsuite/webservices-testsuite/saaj-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
index 7f9b8b3..57c5f3f 100644
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
+++ b/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>saaj-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>saaj-client</artifactId>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
index 83c36e1..a52007b 100644
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
+++ b/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>saaj-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>saaj-war</artifactId>
diff --git a/testsuite/webservices-testsuite/stax-tests/pom.xml b/testsuite/webservices-testsuite/stax-tests/pom.xml
index ea6fa34..79ef930 100644
--- a/testsuite/webservices-testsuite/stax-tests/pom.xml
+++ b/testsuite/webservices-testsuite/stax-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>webservices-testsuite</artifactId>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml b/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
index 0e3f748..10a79ba 100644
--- a/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
+++ b/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>stax-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
         
     </parent>
 
diff --git a/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml b/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
index b182e48..5cceaad 100644
--- a/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
+++ b/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>stax-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>stax-ejb</artifactId>
diff --git a/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml b/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
index 6d0e4b9..2026497 100644
--- a/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
+++ b/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>stax-tests</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>stax-war</artifactId>
diff --git a/testsupport/pom.xml b/testsupport/pom.xml
index 1283024..a8dd448 100644
--- a/testsupport/pom.xml
+++ b/testsupport/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.testsupport</groupId>
diff --git a/testsupport/test-deployment-j2ee_1.3/pom.xml b/testsupport/test-deployment-j2ee_1.3/pom.xml
index c2b6ffb..20d36c9 100644
--- a/testsupport/test-deployment-j2ee_1.3/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>test-deployment-j2ee_1.3</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml b/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
index 740e73a..49a3f03 100644
--- a/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.3</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ear-j2ee_1.3</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml b/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
index cc46cec..e531e28 100644
--- a/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.3</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ejb-j2ee_1.3</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml b/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
index 2263510..069e069 100644
--- a/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.3</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-rar-j2ee_1.3</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml b/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
index 500fd74..d354c10 100644
--- a/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.3</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-war-j2ee_1.3</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.4/pom.xml b/testsupport/test-deployment-j2ee_1.4/pom.xml
index f2e1714..a9df9e6 100644
--- a/testsupport/test-deployment-j2ee_1.4/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-deployment-j2ee_1.4</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml b/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
index ff7427d..faf05e7 100644
--- a/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.4</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ear-j2ee_1.4</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml b/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
index 213e970..8d4646f 100644
--- a/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.4</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ejb-j2ee_1.4</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml b/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
index 8519133..7d7a215 100644
--- a/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.4</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-rar-j2ee_1.4</artifactId>
diff --git a/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml b/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
index c05683b..520399d 100644
--- a/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
+++ b/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-j2ee_1.4</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-war-j2ee_1.4</artifactId>
diff --git a/testsupport/test-deployment-javaee_5/pom.xml b/testsupport/test-deployment-javaee_5/pom.xml
index 8fd8190..4317478 100644
--- a/testsupport/test-deployment-javaee_5/pom.xml
+++ b/testsupport/test-deployment-javaee_5/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-deployment-javaee_5</artifactId>
diff --git a/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml b/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
index 481e61c..d49dd78 100644
--- a/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
+++ b/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-javaee_5</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ear-javaee_5</artifactId>
diff --git a/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml b/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
index 99574f2..dcdd137 100644
--- a/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
+++ b/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-javaee_5</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-ejb-javaee_5</artifactId>
diff --git a/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml b/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
index 41db592..0cc1543 100644
--- a/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
+++ b/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-javaee_5</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-rar-javaee_5</artifactId>
diff --git a/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml b/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
index 4e14882..14cf3ed 100644
--- a/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
+++ b/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>test-deployment-javaee_5</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>test-war-javaee_5</artifactId>
diff --git a/testsupport/testsupport-commands/pom.xml b/testsupport/testsupport-commands/pom.xml
index ada08ef..4e5004a 100644
--- a/testsupport/testsupport-commands/pom.xml
+++ b/testsupport/testsupport-commands/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>testsupport-commands</artifactId>
diff --git a/testsupport/testsupport-common/pom.xml b/testsupport/testsupport-common/pom.xml
index f5ca53a..a3615c8 100644
--- a/testsupport/testsupport-common/pom.xml
+++ b/testsupport/testsupport-common/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>testsupport-common</artifactId>
diff --git a/testsupport/testsupport-selenium/pom.xml b/testsupport/testsupport-selenium/pom.xml
index 765e6f9..9f824e5 100644
--- a/testsupport/testsupport-selenium/pom.xml
+++ b/testsupport/testsupport-selenium/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.testsupport</groupId>
         <artifactId>testsupport</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>testsupport-selenium</artifactId>