diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 765c9c46a..853c53bcb 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-apps</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
@@ -66,7 +66,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 285e589b7..c50eff9af 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-apps</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-jboss-blank</artifactId>
     <packaging>war</packaging>
     <name>JBoss Blank Webapp</name>
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 957f1f84d..aa464ebff 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -28,7 +28,7 @@
       <artifactId>struts2-apps</artifactId>
       <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-mailreader</artifactId>
     <packaging>war</packaging>
     <name>Mail Reader Webapp</name>
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index f6e651db3..0b4ce00c0 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-apps</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portlet Webapp</name>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 3b7058ca4..9ccbdffaa 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -29,7 +29,6 @@
         <version>2.3.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
     <version>2.3.15-SNAPSHOT</version>
@@ -40,17 +39,14 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -71,7 +67,6 @@
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 225866212..ea2b9d348 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-apps</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
@@ -39,7 +39,6 @@
         <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
     </scm>
 
-
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -56,49 +55,41 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -110,13 +101,11 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -139,12 +128,10 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
-            <version>2.4.2</version>
         </dependency>
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
-            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5ad3352ff..8bebc79cf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,19 +1,15 @@
 <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>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-assembly</artifactId>
-    <packaging>pom</packaging>
-    <name>Struts 2 Assembly</name>
-    <description>
-        Struts 2 Assembly
-    </description>
-
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
 
+    <artifactId>struts2-assembly</artifactId>
+    <packaging>pom</packaging>
+    <name>Struts 2 Assembly</name>
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</developerConnection>
@@ -27,7 +23,6 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2</version>
                         <executions>
                             <execution>
                                 <id>make-assembly</id>
@@ -291,7 +286,6 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
@@ -322,165 +316,142 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-javatemplates-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jasperreports-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jfreechart-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-pell-multipart-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-plexus-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitegraph-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-testng-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-tiles3-plugin</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-oval-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-embeddedjsp-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-gxp-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-admin-bundle</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-demo-bundle</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
-
     </dependencies>
 
 </project>
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 4b5892957..0c7eaa84e 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -6,8 +6,8 @@
         <artifactId>struts2-osgi-bundles</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-osgi-admin-bundle</artifactId>    
+
+    <artifactId>struts2-osgi-admin-bundle</artifactId>
     <packaging>bundle</packaging>
     <name>Struts 2 OSGi Admin Bundle</name>
 
@@ -21,8 +21,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>       
+        </dependency>
     </dependencies>
    
     <build>
@@ -31,7 +30,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <version>2.1.0</version>
                 <configuration>
                     <instructions>
                         <manifestLocation>META-INF</manifestLocation>
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index dfee52e64..63f42ce0f 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>struts2-osgi-bundles</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-osgi-demo-bundle</artifactId>
     <packaging>bundle</packaging>
     <name>Struts 2 OSGi Demo Bundle</name>
@@ -35,22 +35,14 @@
             <artifactId>commons-digester</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         
     </dependencies>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b4537ad72..5ad2a8998 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-parent</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-osgi-bundles</artifactId>
     <packaging>pom</packaging>
     <name>Struts OSGi Bundles</name>
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
diff --git a/core/pom.xml b/core/pom.xml
index 8917550b7..50159652d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,6 @@
         <artifactId>struts2-parent</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Core</name>
@@ -112,7 +111,6 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.2</version>
                         <executions>
                             <execution>
                                 <id>attach-source</id>
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 8ace44507..6c2bbee9f 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -28,7 +28,6 @@
         <version>2.3.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-cdi-plugin</artifactId>
     <name>Struts 2 CDI Plugin</name>
     <packaging>jar</packaging>
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 8c7bb0ec6..bf946e9e4 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-codebehind-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Codebehind Plugin</name>
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 4b5c283b6..e62af9a1e 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-config-browser-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Configuration Browser Plugin</name>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 7cb8255f6..73854ec7e 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -5,7 +5,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-convention-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Convention Plugin</name>
@@ -32,6 +32,7 @@
         </plugins>
 
     </build>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -53,4 +54,5 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
 </project>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 5e7cddb0b..2a148106b 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -27,8 +27,8 @@
         <groupId>org.apache.struts</groupId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-dojo-plugin</artifactId>
     <name>Struts 2 Dojo Plugin</name>
 
@@ -147,7 +147,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index c2a308cb1..c556a82fd 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-dwr-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 DWR Plugin</name>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
-            <version>1.1.1</version>
         </dependency>
     </dependencies>
+
 </project>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 7a0a4cb1b..54d00da17 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -29,7 +29,6 @@
         <version>2.3.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-embeddedjsp-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Embedded JSP Plugin</name>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 5d2fea71e..621cbe2fd 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -6,11 +6,9 @@
         <version>2.3.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-gxp-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 GXP Plugin</name>
-    <url>http://struts.apache.org</url>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-gxp-plugin</connection>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index ba9fd53c1..04d886b8f 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-jasperreports-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Jasper Reports Plugin</name>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index fd8c37289..c671b1143 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -27,7 +27,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-javatemplates-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Java Templates Plugin</name>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 2e6041d5d..74b2404ee 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
    </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-jfreechart-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 JFreeChart Plugin</name>
@@ -67,7 +67,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index b19886c52..45c1a614d 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-jsf-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 JSF Plugin</name>
@@ -48,11 +48,9 @@
             <scope>provided</scope>
         </dependency>
 
-
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 7eb24a56b..f2fb5d579 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-json-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 JSON Plugin</name>
@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index cd109c317..130c9a433 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-junit-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 JUnit Plugin</name>
@@ -71,7 +71,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 502ef97c1..34377398f 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-osgi-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 OSGi Plugin</name>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index e06e5e590..4178272ef 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-oval-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 OVal Plugin</name>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index f9c5e92c0..b0aa38324 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-pell-multipart-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Pell Multipart Plugin</name>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 8cd3e4ac3..873629b3a 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-plexus-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Plexus Plugin</name>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d943a9d62..c928652a4 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-parent</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-plugins</artifactId>
     <packaging>pom</packaging>
     <name>Struts Plugins</name>
@@ -75,7 +75,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 437b2567a..45ff49b15 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-portlet-tiles-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Portlet Tiles Plugin</name>
@@ -43,12 +43,10 @@
         <dependency>
              <groupId>org.apache.struts</groupId>
              <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
              <groupId>org.apache.struts</groupId>
              <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index ee3cbfea4..5ed5cd697 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -5,7 +5,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-portlet-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Portlet Plugin</name>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index f345e27e4..38632fe61 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-rest-plugin</artifactId>
     <version>2.3.15-SNAPSHOT</version>
     <name>Struts 2 REST Plugin</name>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 74c7cafea..916699931 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-sitegraph-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Sitegraph Plugin</name>
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 5dc98d803..536b7dedf 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-sitemesh-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Sitemesh Plugin</name>
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
-            <version>2.4.2</version>
         </dependency>
         <!-- Velocity -->
         <dependency>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index d4be5c409..8b49070a6 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-spring-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Spring Plugin</name>
@@ -43,31 +43,26 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 91963e189..ee3dec15e 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-struts1-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Struts 1 Plugin</name>
@@ -48,7 +48,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index fe1be2cf0..635157bf6 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-testng-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 TestNG Plugin</name>
@@ -49,29 +49,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
 
-
-
     </dependencies>
 </project>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index b7988c854..c7ec0df21 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -28,7 +28,7 @@
         <artifactId>struts2-plugins</artifactId>
         <version>2.3.15-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
+
     <artifactId>struts2-tiles-plugin</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 Tiles Plugin</name>
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 3e1a4539a..bb76a2473 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -39,21 +39,25 @@
        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/tiles3/</url>
     </scm>
 
+    <properties>
+        <tiles3.version>3.0.1</tiles3.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-core</artifactId>
-            <version>3.0.1</version>
+            <version>${tiles3.version}</version> <!-- Version must defined here -->
         </dependency>
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-extras</artifactId>
-            <version>3.0.1</version>
+            <version>${tiles3.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-jsp</artifactId>
-            <version>3.0.1</version>
+            <version>${tiles3.version}</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 1cac704bb..f86c70a26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,6 +361,11 @@
                 <artifactId>xwork-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-spring-plugin</artifactId>
@@ -386,6 +391,126 @@
                 <artifactId>struts2-junit-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-convention-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-tiles-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-codebehind-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-javatemplates-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-config-browser-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-dojo-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-jasperreports-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-jfreechart-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-jsf-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-pell-multipart-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-plexus-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-rest-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-sitegraph-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-sitemesh-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-struts1-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-testng-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-oval-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-json-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-embeddedjsp-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-gxp-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-tiles3-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-admin-bundle</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-demo-bundle</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.freemarker</groupId>
@@ -399,6 +524,18 @@
                 <version>1.4.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>uk.ltd.getahead</groupId>
+                <artifactId>dwr</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>opensymphony</groupId>
+                <artifactId>sitemesh</artifactId>
+                <version>2.4.2</version>
+            </dependency>
+
             <!-- Velocity -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>