diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 7b99baa87..7b79715bd 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -55,9 +55,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 53be72ae4..b6767a4af 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
 
         <dependency>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
diff --git a/apps/pom.xml b/apps/pom.xml
index a5c5753ef..6a772edc9 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -179,10 +179,10 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/java" />
                                 </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
                             </tasks>
@@ -212,7 +212,7 @@
             </plugin>
         </plugins>
 
-        <finalName>${pom.artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
 
     </build>
 
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index ee40f108f..ccf75046a 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -101,17 +101,17 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 627a612de..be67b194f 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -40,12 +40,12 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 310eaaa09..282844276 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -56,43 +56,43 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 5d456debb..bb2bba821 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <version>${project.version}</version>
     <packaging>war</packaging>
     <name>Struts 2 Blank Webapp</name>
 
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index 642e1cfb7..d96224bff 100644
--- a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <version>${project.version}</version>
     <packaging>war</packaging>
     <name>Struts 2 Blank Convention Webapp</name>
 
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index 54a8ac392..e01d01d68 100644
--- a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>Struts 2 Database Portlet</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Database Portlet</description>
diff --git a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
index de0a6dc92..8df67b56c 100644
--- a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
 
    <groupId>${groupId}</groupId>
    <artifactId>${artifactId}</artifactId>
-   <version>${version}</version>
+   <version>${project.version}</version>
    <name>Struts 2 Plugin</name>
 
     <dependencies>
diff --git a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index fe67230e2..775c871fa 100644
--- a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>${artifactId}</artifactId>
     <packaging>war</packaging>
     <name>My Portlet Application</name>
-    <version>${version}</version>
+    <version>${project.version}</version>
 
     <properties>
         <struts2.version>${project.version}</struts2.version>
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index 04972ab56..5a5efcab1 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>Struts 2 Starter</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Starter</description>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 099c95814..8ba369cf6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -46,7 +46,7 @@
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                                 <descriptor>src/main/assembly/docs.xml</descriptor>
                             </descriptors>
-                            <finalName>struts-${version}</finalName>
+                            <finalName>struts-${project.version}</finalName>
                             <outputDirectory>target/assembly/out</outputDirectory>
                             <workDirectory>target/assembly/work</workDirectory>
                         </configuration>
@@ -72,7 +72,7 @@
                     <dependency>
                         <groupId>org.apache.struts.xwork</groupId>
                         <artifactId>xwork-core</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>jar</type>
                         <classifier>jdk14</classifier>
                         <scope>runtime</scope>
@@ -81,119 +81,119 @@
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-core</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-config-browser-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-jasperreports-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-jfreechart-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-jsf-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-pell-multipart-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-plexus-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-sitegraph-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-sitemesh-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-struts1-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-tiles-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-rest-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
                     
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-oval-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
                     
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-osgi-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
                     
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-json-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
                     
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-embeddedjsp-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
 
                     <dependency>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-gxp-plugin</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
             </dependencies>
@@ -218,37 +218,37 @@
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-blank</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-mailreader</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-portlet</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-showcase</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-rest-showcase</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-mailreader</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                             </artifactItems>
@@ -313,7 +313,7 @@
                         <descriptor>src/main/assembly/src.xml</descriptor>
                         <descriptor>src/main/assembly/docs.xml</descriptor>
                     </descriptors>
-                    <finalName>struts-${version}</finalName>
+                    <finalName>struts-${project.version}</finalName>
                     <outputDirectory>target/assembly/out</outputDirectory>
                     <workDirectory>target/assembly/work</workDirectory>
                 </configuration>
@@ -326,162 +326,162 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-javatemplates-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jasperreports-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jfreechart-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-pell-multipart-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-plexus-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitegraph-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
        <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-testng-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-oval-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-embeddedjsp-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-gxp-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-admin-bundle</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-demo-bundle</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
 
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index dbd3f5890..c161ca293 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>       
     </dependencies>
    
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 122021b72..f7d9c77be 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -44,19 +44,19 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         
     </dependencies>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 5bcbc9c4b..84dabeb97 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index c8173ee6a..5f25225a6 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d850c2f77..3d6e29d6a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
diff --git a/pom.xml b/pom.xml
index 7fc897f8c..27a800f5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.6</version>
             </plugin>
             <!--
             <plugin>
@@ -332,6 +333,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jxr-maven-plugin</artifactId>
+                <version>2.0-beta-1</version>
             </plugin>
             <!--
             <plugin>