diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index e13f1a379a..2adc4fd369 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -30,7 +30,6 @@
    <packaging>jar</packaging>
 
    <properties>
-      <activemq.version>${project.version}</activemq.version>
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
    </properties>
 
@@ -83,12 +82,12 @@
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-server</artifactId>
-         <version>${activemq.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-jms-server</artifactId>
-         <version>${activemq.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 6962143fc3..b168313a5c 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -195,9 +195,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-               <skip>true</skip>
-            </configuration>
          </plugin>
          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a87f40bf49..bde3214458 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -57,9 +57,6 @@ under the License.
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-               <skip>true</skip>
-            </configuration>
          </plugin>
       </plugins>
    </build>
diff --git a/pom.xml b/pom.xml
index 40346a2e97..f1fd6c8b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
       <skipRestTests>true</skipRestTests>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+      <additionalparam>-Xdoclint:none</additionalparam>
 
      <!--
 
@@ -648,6 +649,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
+               
                <version>2.9</version>
             </plugin>
             <plugin>