diff --git a/pom.xml b/pom.xml
index 424a44e4d1..d1ba6e96c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,7 +481,8 @@
       <share.client.contextPath>/share</share.client.contextPath>
 
       <maven.javadoc.version>3.1.0</maven.javadoc.version>
-      <maven.war.plugin.version>2.6</maven.war.plugin.version>
+      <maven.javadoc.skip>true</maven.javadoc.skip>
+      <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
       <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
       <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
@@ -685,7 +686,6 @@
                   <goals>
                      <goal>jar</goal>
                   </goals>
-
                </execution>
             </executions>
          </plugin>
@@ -1045,6 +1045,12 @@
                <artifactId>maven-war-plugin</artifactId>
                <version>${maven.war.plugin.version}</version>
                <dependencies>
+                  <!-- Needed when creating the community and enterprise rest api wars  -->
+                  <dependency>
+                     <groupId>org.apache.commons</groupId>
+                     <artifactId>commons-compress</artifactId>
+                     <version>1.18</version>
+                  </dependency>
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 2d10b64cb6..583d5b15e7 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -13,6 +13,7 @@
 
    <properties>
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
+      <maven.javadoc.skip>false</maven.javadoc.skip>
       <ags.share>alfresco-governance-services-community-share</ags.share>
       <ags.repo>alfresco-governance-services-community-repo</ags.repo>
       <tas.restapi.version>6.0.0.3</tas.restapi.version>
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java
similarity index 98%
rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java
rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java
index 1b86d8b3ef..12b445b3e3 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEvents.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java
@@ -48,7 +48,7 @@ import org.testng.annotations.Test;
  * @since 2.7
  */
 @AlfrescoTest (jira = "RM-5234")
-public class AuditLoginEvents extends BaseRMRestTest
+public class AuditLoginEventsTests extends BaseRMRestTest
 {
     @Autowired
     private RMAuditAPI rmAuditAPI;
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java
similarity index 97%
rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java
rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java
index af396539f7..5a0f1dfa2e 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearch.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/ShareLiveSearchTests.java
@@ -38,7 +38,7 @@ import org.alfresco.test.AlfrescoTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-public class ShareLiveSearch extends BaseRMRestTest
+public class ShareLiveSearchTests extends BaseRMRestTest
 {
     @Autowired
     SearchAPI searchApi;
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 218230b840..dcfe95b0d4 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -31,6 +31,8 @@
       <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
+      <maven.javadoc.skip>false</maven.javadoc.skip>
+
    </properties>
 
    <build>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index cda7507d96..a9ea0cfccc 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -13,6 +13,7 @@
    <properties>
       <maven.compiler.source>1.8</maven.compiler.source>
       <maven.compiler.target>1.8</maven.compiler.target>
+      <maven.javadoc.skip>false</maven.javadoc.skip>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    </properties>