diff --git a/pom.xml b/pom.xml
index 475bc0d4da..a816ca4925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,7 +480,7 @@
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
       <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
       <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
-      <maven.compiler.version>3.2</maven.compiler.version>
+      <maven.compiler.version>3.8.0</maven.compiler.version>
       <maven.enforcer.plugin>1.4</maven.enforcer.plugin>
       <maven.resources.version>2.7</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
@@ -574,11 +574,12 @@
          <scope>provided</scope>
       </dependency>
 
-      <dependency>
-         <groupId>com.sun.xml.bind</groupId>
-         <artifactId>jaxb-core</artifactId>
-         <version>${javax-jaxb.version}</version>
-      </dependency>
+      <!--<dependency>-->
+         <!--<groupId>com.sun.xml.bind</groupId>-->
+         <!--<artifactId>jaxb-core</artifactId>-->
+         <!--<version>${javax-jaxb.version}</version>-->
+         <!--<scope>provided</scope>-->
+      <!--</dependency>-->
 
       <dependency>
          <groupId>org.apache.bcel</groupId>
@@ -591,25 +592,25 @@
    <build>
       <finalName>${project.artifactId}-${project.version}</finalName>
       <plugins>
-         <plugin>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-               <execution>
-                  <id>enforce-java</id>
-                  <goals>
-                     <goal>enforce</goal>
-                  </goals>
-                  <configuration>
-                     <rules>
-                        <requireJavaVersion>
-                           <version>1.8</version>
-                        </requireJavaVersion>
-                     </rules>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
+         <!--<plugin>-->
+            <!--<artifactId>maven-enforcer-plugin</artifactId>-->
+            <!--<version>1.4</version>-->
+            <!--<executions>-->
+               <!--<execution>-->
+                  <!--<id>enforce-java</id>-->
+                  <!--<goals>-->
+                     <!--<goal>enforce</goal>-->
+                  <!--</goals>-->
+                  <!--<configuration>-->
+                     <!--<rules>-->
+                        <!--<requireJavaVersion>-->
+                           <!--<version>1.8</version>-->
+                        <!--</requireJavaVersion>-->
+                     <!--</rules>-->
+                  <!--</configuration>-->
+               <!--</execution>-->
+            <!--</executions>-->
+         <!--</plugin>-->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
@@ -830,7 +831,7 @@
             <plugin>
                <groupId>org.alfresco.maven.plugin</groupId>
                <artifactId>alfresco-maven-plugin</artifactId>
-               <version>2.2.0</version>
+               <version>2.1.1</version>
                <extensions>true</extensions>
                <configuration>
                   <snapshotToTimestamp>true</snapshotToTimestamp>
@@ -1046,7 +1047,7 @@
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
-                     <version>2.2.0</version>
+                     <version>2.1.1</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 7fedc30eb2..c4b1b34949 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -265,7 +265,9 @@
                      <attachClasses>true</attachClasses>
                      <attachConfig>true</attachConfig>
                      <includeDependencies>true</includeDependencies>
-                     <ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
+                     <!--<ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>-->
+                     <!--<ampFinalDir>${project.build.directory}/${project.build.finalName}</ampFinalDir>-->
+
                   </configuration>
                </execution>
                <execution>