diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index c9ea51a8c0..bb28210e1b 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -6,9 +6,9 @@
   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.
@@ -16,7 +16,7 @@
   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>
@@ -56,13 +56,13 @@
   </dependencies>
 
   <build>
-    
+
     <plugins>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>${maven-shade-plugin-version}</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -91,15 +91,15 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
                     <projectName>Apache ActiveMQ</projectName>
                 </transformer>
-                
+
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                     <resource>META-INF/spring.handlers</resource>
                 </transformer>
-                
+
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                     <resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
                 </transformer>
-                
+
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                     <resource>META-INF/spring.schemas</resource>
                 </transformer>
@@ -108,7 +108,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
     </plugins>
   </build>
 
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 0b2236bc53..baab8d1871 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -6,9 +6,9 @@
   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.
@@ -32,23 +32,23 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-		org.apache.xbean*;version="[3.7,4)",
-      	*
+        org.apache.xbean*;version="[3.7,4)",
+          *
     </activemq.osgi.import.pkg>
   </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.aries.blueprint</groupId>
-			<artifactId>org.apache.aries.blueprint</artifactId>
-			<version>${aries-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-blueprint</artifactId>
-			<version>${xbean-version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <version>${aries-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-blueprint</artifactId>
+            <version>${xbean-version}</version>
+        </dependency>
+    </dependencies>
 
   <build>
     <plugins>
@@ -57,19 +57,18 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-			<!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host-->
-			<Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
+            <!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host-->
+            <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
-	<plugin>
-		<artifactId>maven-resources-plugin</artifactId>
-		<version>2.3</version>
-	</plugin>
-	<plugin>
-		<artifactId>maven-install-plugin</artifactId>
-		<version>2.2</version>
-	</plugin>
+    <plugin>
+      <artifactId>maven-resources-plugin</artifactId>
+    </plugin>
+    <plugin>
+      <artifactId>maven-install-plugin</artifactId>
+      <version>${maven-install-plugin-version}</version>
+    </plugin>
     </plugins>
   </build>
 
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 8645546dfd..5894afc4b1 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -361,7 +361,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.1</version>
+        <version>${findbugs-maven-plugin-version}</version>
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>
@@ -539,29 +539,28 @@
         <artifactId>maven-antrun-plugin</artifactId>
 
         <executions>
-            <execution>
-            <id>package</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-                <echo>Deleting unwanted resources from the test-jar</echo>
-                <delete dir="${project.build.directory}/test-classes" verbose="true">
-                                    <include name="*.*" />
-                                </delete>
-              </tasks>
+          <execution>
+          <id>package</id>
+          <phase>package</phase>
+          <configuration>
+            <tasks>
+              <echo>Deleting unwanted resources from the test-jar</echo>
+              <delete dir="${project.build.directory}/test-classes" verbose="true">
+                <include name="*.*" />
+              </delete>
+            </tasks>
             </configuration>
             <goals>
               <goal>run</goal>
             </goals>
           </execution>
-
           <execution>
             <id>site</id>
             <phase>site</phase>
             <configuration>
               <tasks>
                 <echo>Running the XSDDoc task</echo>
-                <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
+                <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task"/>
                 <mkdir dir="${basedir}/target/site/xsddoc" />
                 <xsddoc file="${basedir}/target/classes/activemq.xsd" out="${basedir}/target/site/xsddoc" doctitle="Apache ActiveMQ XML Schema Reference" header="&lt;a href='http://activemq.apache.org/'&gt;Apache ActiveMQ&lt;/a&gt;" footer="Copyright 2007 (c) the &lt;a href='http://www.apache.org/'&gt;Apache Software Foundation&lt;/a&gt;" verbose="false" />
                 <!--
@@ -598,7 +597,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.0</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -638,7 +636,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.0</version>
         <configuration>
       <check>
             <branchRate>50</branchRate>
@@ -653,7 +650,6 @@
   </build>
 
   <profiles>
-
     <profile>
       <id>openwire-generate</id>
       <dependencies>
@@ -689,7 +685,6 @@
         </plugins>
       </build>
     </profile>
-
   </profiles>
 
 </project>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index e6d72da7f0..119aebe011 100644
--- a/activemq-run/pom.xml
+++ b/activemq-run/pom.xml
@@ -6,9 +6,9 @@
   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.
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>${maven-shade-plugin-version}</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index ae5681bbd0..c823be3ae4 100755
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -6,9 +6,9 @@
   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.
@@ -70,12 +70,12 @@
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>woodstox-core-asl</artifactId>
-      <version>4.0.7</version>
+      <version>${woodstox-core-asl-version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>stax2-api</artifactId>
-      <version>3.0.1</version>
+      <version>${stax2-api-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -123,7 +123,7 @@
       <plugin>
         <groupId>org.jvnet.jaxb2.maven2</groupId>
         <artifactId>maven-jaxb2-plugin</artifactId>
-        <version>0.7.2</version>
+        <version>${maven-jaxb2-plugin-version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/pom.xml b/pom.xml
index dcb4ec3f33..35271852fa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,59 +37,87 @@
     <projectName>Apache ActiveMQ</projectName>
     <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
     <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
-    <spring-version>3.0.3.RELEASE</spring-version>
+    <spring-version>3.0.6.RELEASE</spring-version>
     <spring-osgi-version>1.2.1</spring-osgi-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
-    <ant-version>1.7.1</ant-version>
+    <ant-version>1.8.2</ant-version>
     <aopalliance-version>1.0</aopalliance-version>
     <aries-version>0.2-incubating</aries-version>
     <axion-version>1.0-M3-dev</axion-version>
-    <axis-version>1.2-RC1</axis-version>
+    <axis-version>1.4</axis-version>
     <camel-version>2.8.0</camel-version>
+    <camel-web-version>2.4.0</camel-web-version>
     <cglib-version>2.0</cglib-version>
-    <commons-beanutils-version>1.6.1</commons-beanutils-version>
-    <commons-collections-version>3.2.1</commons-collections-version>
     <openjpa-version>1.2.0</openjpa-version>
-    <commons-dbcp-version>1.2.2</commons-dbcp-version>
+    <commons-beanutils-version>1.8.3</commons-beanutils-version>
+    <commons-collections-version>3.2.1</commons-collections-version>
+    <commons-daemon-version>1.0.5</commons-daemon-version>
+    <commons-dbcp-version>1.4</commons-dbcp-version>
     <commons-httpclient-version>3.1</commons-httpclient-version>
     <commons-io-version>1.4</commons-io-version>
-    <commons-lang-version>2.4</commons-lang-version>
-    <commons-logging-version>1.1</commons-logging-version>
-    <commons-pool-version>1.5.4</commons-pool-version>
+    <commons-lang-version>2.6</commons-lang-version>
+    <commons-logging-version>1.1.1</commons-logging-version>
+    <commons-pool-version>1.5.6</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
+    <commons-net-version>2.2</commons-net-version>
     <directory-version>1.5.7</directory-version>
     <geronimo-version>1.0</geronimo-version>
     <howl-version>0.1.8</howl-version>
     <hsqldb-version>1.7.2.2</hsqldb-version>
-    <jasypt-version>1.7</jasypt-version>
+    <jasypt-version>1.8</jasypt-version>
     <jdom-version>1.0</jdom-version>
     <jetty-version>7.1.6.v20100715</jetty-version>
     <jsp-version>2.1.v20100127</jsp-version>
-    <jettison-version>1.2</jettison-version>
+    <jstl-version>1.1.2</jstl-version>
+    <jettison-version>1.3</jettison-version>
     <jmock-version>2.5.1</jmock-version>
-    <junit-version>4.8.1</junit-version>
+    <josql-version>1.5</josql-version>
+    <junit-version>4.8.2</junit-version>
     <jxta-version>2.0</jxta-version>
     <karaf-version>2.2.0</karaf-version>
     <log4j-version>1.2.16</log4j-version>
     <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <regexp-version>1.3</regexp-version>
-    <rome-version>0.8</rome-version>
-    <slf4j-version>1.6.1</slf4j-version>
-    <spring-oxm-version>1.5.8</spring-oxm-version>
-    <xalan-version>2.6.0</xalan-version>
-    <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
+    <rome-version>1.0</rome-version>
+    <slf4j-version>1.6.2</slf4j-version>
+    <spring-oxm-version>1.5.10</spring-oxm-version>
+    <xalan-version>2.7.0</xalan-version>
+    <xmlbeans-version>2.2.0</xmlbeans-version>
     <xpp3-version>1.1.4c</xpp3-version>
     <xstream-version>1.4.1</xstream-version>
     <xbean-version>3.7</xbean-version>
-    <velocity-version>1.6.2</velocity-version>
-    <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
-    <maven-surefire-plugin-version>2.5</maven-surefire-plugin-version>
-    <commons-net-version>2.0</commons-net-version>
+    <velocity-version>1.6.4</velocity-version>
     <ftpserver-version>1.0.0</ftpserver-version>
     <activemq-protobuf-version>1.1</activemq-protobuf-version>
+    <opensymphony-version>2.4.2</opensymphony-version>
+    <zookeeper-version>3.0.0</zookeeper-version>
+    <org.osgi.core-version>4.3.0</org.osgi.core-version>
+    <woodstox-core-asl-version>4.0.8</woodstox-core-asl-version>
+    <stax2-api-version>3.0.2</stax2-api-version>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+    <!-- Maven Plugin Version for this Project -->
+    <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
+    <maven-surefire-plugin-version>2.9</maven-surefire-plugin-version>
+    <maven-antrun-plugin-version>1.3</maven-antrun-plugin-version>
+    <maven-assembly-plugin-version>2.2.1</maven-assembly-plugin-version>
+    <maven-release-plugin-version>2.2.1</maven-release-plugin-version>
+    <maven-eclipse-plugin-version>2.8</maven-eclipse-plugin-version>
+    <maven-war-plugin-version>2.1.1</maven-war-plugin-version>
+    <maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
+    <maven-source-plugin-version>2.1.2</maven-source-plugin-version>
+    <maven-javadoc-plugin-version>2.8</maven-javadoc-plugin-version>
+    <maven-install-plugin-version>2.3.1</maven-install-plugin-version>
+    <maven-shade-plugin-version>1.4</maven-shade-plugin-version>
+    <maven-jaxb2-plugin-version>0.7.2</maven-jaxb2-plugin-version>
+    <findbugs-maven-plugin-version>2.3.2</findbugs-maven-plugin-version>
+    <javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
+    <cobertura-maven-plugin-version>2.5.1</cobertura-maven-plugin-version>
+    <taglist-maven-plugin-version>2.4</taglist-maven-plugin-version>
+    <build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version>
+    <apache-rat-plugin-version>0.7</apache-rat-plugin-version>
+    <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
     <!-- OSGi bundles properties -->
     <activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
     <activemq.osgi.export.pkg>org.apache.activemq*</activemq.osgi.export.pkg>
@@ -99,7 +127,7 @@
     <activemq.osgi.import>${activemq.osgi.import.pkg}</activemq.osgi.import>
     <activemq.osgi.dynamic.import />
     <activemq.osgi.symbolic.name>${project.groupId}.${project.artifactId}</activemq.osgi.symbolic.name>
-<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <prerequisites>
     <maven>2.0.9</maven>
@@ -436,29 +464,29 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-web</artifactId>
-        <version>2.4.0</version>
+        <version>${camel-web-version}</version>
         <type>war</type>
       </dependency>
 
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
-        <version>4.1.0</version>
+        <version>${org.osgi.core-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
-        <version>3.0.0</version>
+        <version>${zookeeper-version}</version>
         <optional>true</optional>
       </dependency>
 
-    <!-- For jsvc support -->
-    <dependency>
-      <groupId>commons-daemon</groupId>
-      <artifactId>commons-daemon</artifactId>
-      <version>1.0.3</version>
-    </dependency>
+      <!-- For jsvc support -->
+      <dependency>
+        <groupId>commons-daemon</groupId>
+        <artifactId>commons-daemon</artifactId>
+        <version>${commons-daemon-version}</version>
+      </dependency>
 
       <!-- camel testing -->
       <dependency>
@@ -739,7 +767,7 @@
       <dependency>
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
-        <version>2.6.0</version>
+        <version>${xalan-version}</version>
       </dependency>
 
       <dependency>
@@ -888,12 +916,12 @@
       <dependency>
         <groupId>opensymphony</groupId>
         <artifactId>sitemesh</artifactId>
-        <version>2.2.1</version>
+        <version>${opensymphony-version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
-        <version>1.0</version>
+        <version>${jstl-version}</version>
       </dependency>
       <dependency>
         <groupId>taglibs</groupId>
@@ -923,13 +951,13 @@
       <dependency>
         <groupId>net.sf.josql</groupId>
         <artifactId>josql</artifactId>
-        <version>1.5</version>
+        <version>${josql-version}</version>
         <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>net.sf.josql</groupId>
         <artifactId>gentlyweb-utils</artifactId>
-        <version>1.5</version>
+        <version>${josql-version}</version>
         <optional>true</optional>
       </dependency>
 
@@ -947,12 +975,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.1</version>
+          <version>${maven-antrun-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-4</version>
+          <version>${maven-assembly-plugin-version}</version>
           <configuration>
             <tarLongFileMode>gnu</tarLongFileMode>
           </configuration>
@@ -970,7 +998,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.0</version>
+          <version>${maven-release-plugin-version}</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
@@ -997,17 +1025,17 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>ianal-maven-plugin</artifactId>
-          <version>1.0-alpha-1</version>
+          <version>${ianal-maven-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>javacc-maven-plugin</artifactId>
-          <version>2.0</version>
+          <version>${javacc-maven-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
-          <version>0.7</version>
+          <version>${apache-rat-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
@@ -1017,19 +1045,19 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.2</version>
+          <version>${build-helper-maven-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.0</version>
+          <version>${cobertura-maven-plugin-version}</version>
           <configuration>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>${maven-eclipse-plugin-version}</version>
           <configuration>
             <downloadSources>true</downloadSources>
             <downloadJavadocs>false</downloadJavadocs>
@@ -1038,12 +1066,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>${maven-war-plugin-version}</version>
         </plugin>
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>${maven-compiler-plugin-version}</version>
     </plugin>
       </plugins>
     </pluginManagement>
@@ -1196,12 +1224,12 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>${taglist-maven-plugin-version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${maven-javadoc-plugin-version}</version>
         <configuration>
           <links>
             <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
@@ -1238,7 +1266,6 @@
   </reporting>
 
   <profiles>
-
     <profile>
       <id>apache-release</id>
       <activation>
@@ -1267,7 +1294,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.1</version>
+            <version>${maven-source-plugin-version}</version>
             <executions>
               <execution>
                 <id>attach-sources</id>