From fe56544235afd94026e6a7f03bb9fd434501394a Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Tue, 26 Mar 2019 13:50:09 +0200
Subject: [PATCH 01/10] update the maven javadoc, maven war  and alfresco-maven
 plugin  to be compatible with OpenJDK 11 add javax libraries

---
 pom.xml                                | 69 ++++++++++++++++++++------
 rm-community/rm-community-repo/pom.xml |  1 +
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aa32a6479..475bc0d4da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,11 +157,13 @@
 
                <plugin>
                   <artifactId>maven-javadoc-plugin</artifactId>
-                  <version>2.10.3</version>
+                  <version>${maven.javadoc.version}</version>
                   <configuration>
                      <doclet>com.docflex.javadoc.Doclet</doclet>
                      <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
-                     <additionalparam>
+                     <doclint>none</doclint>
+                     <additionalOptions>
+
                          -license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license
                          -template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl
                          -nodialog
@@ -169,7 +171,8 @@
                          -p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi
                          -p:docTitle "${project.name} ${project.version} Public API"
                          -p:windowTitle "${project.name} ${project.version} Public API"
-                     </additionalparam>
+
+                     </additionalOptions>
                   </configuration>
                </plugin>
             </plugins>
@@ -471,6 +474,8 @@
 
       <share.client.contextPath>/share</share.client.contextPath>
 
+      <maven.javadoc.version>3.0.1</maven.javadoc.version>
+      <maven.war.plugin.version>2.6</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>
@@ -512,6 +517,8 @@
       <image.name>imageNameNotSet</image.name>
       <image.tag>latest</image.tag>
       <image.registry>quay.io</image.registry>
+
+      <javax-jaxb.version>2.3.1</javax-jaxb.version>
    </properties>
 
    <dependencyManagement>
@@ -552,6 +559,33 @@
          <version>4.12</version>
          <scope>test</scope>
       </dependency>
+      <!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
+      <dependency>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jaxb-api</artifactId>
+         <version>${javax-jaxb.version}</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>com.sun.xml.bind</groupId>
+         <artifactId>jaxb-impl</artifactId>
+         <version>${javax-jaxb.version}</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>com.sun.xml.bind</groupId>
+         <artifactId>jaxb-core</artifactId>
+         <version>${javax-jaxb.version}</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.bcel</groupId>
+         <artifactId>bcel</artifactId>
+         <version>6.2.99</version>
+         <scope>provided</scope>
+      </dependency>
    </dependencies>
 
    <build>
@@ -640,21 +674,27 @@
          </plugin>
          <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.4</version>
+            <version>${maven.javadoc.version}</version>
+            <configuration>
+               <doclint>none</doclint>
+               <!--<additionalparam>-Xdoclint:none</additionalparam>-->
+            </configuration>
             <executions>
                <execution>
                   <id>attach-javadocs</id>
+                  <configuration>
+                     <doclint>none</doclint>
+
+                     <failOnWarnings>false</failOnWarnings>
+                     <failOnError>false</failOnError>
+                     <!--<additionalparam>-Xdoclint:none</additionalparam>-->
+                  </configuration>
                   <goals>
                      <goal>jar</goal>
                   </goals>
-                  <configuration>
-                     <additionalparam>-Xdoclint:none</additionalparam>
-                  </configuration>
+
                </execution>
             </executions>
-            <configuration>
-               <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
          </plugin>
          <plugin>
             <artifactId>maven-clean-plugin</artifactId>
@@ -790,7 +830,7 @@
             <plugin>
                <groupId>org.alfresco.maven.plugin</groupId>
                <artifactId>alfresco-maven-plugin</artifactId>
-               <version>2.1.1</version>
+               <version>2.2.0</version>
                <extensions>true</extensions>
                <configuration>
                   <snapshotToTimestamp>true</snapshotToTimestamp>
@@ -901,7 +941,8 @@
             <plugin>
                <artifactId>maven-javadoc-plugin</artifactId>
                <configuration>
-                  <additionalparam>-Xdoclint:none</additionalparam>
+                  <doclint>none</doclint>
+                  <!--<additionalparam>-Xdoclint:none</additionalparam>-->
                </configuration>
             </plugin>
 
@@ -1000,12 +1041,12 @@
             </plugin>
             <plugin>
                <artifactId>maven-war-plugin</artifactId>
-               <version>2.5</version>
+               <version>${maven.war.plugin.version}</version>
                <dependencies>
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
-                     <version>2.1.1</version>
+                     <version>2.2.0</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 9e05d0758d..7fedc30eb2 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -265,6 +265,7 @@
                      <attachClasses>true</attachClasses>
                      <attachConfig>true</attachConfig>
                      <includeDependencies>true</includeDependencies>
+                     <ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
                   </configuration>
                </execution>
                <execution>

From a891f75568451faeece3cb51f8bff657dcf546d7 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 28 Mar 2019 09:44:43 +0200
Subject: [PATCH 02/10] fix compilation error

---
 .../test/integration/issue/RM4804Test.java                       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
index e6ed70983b..25ec841ed7 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
@@ -46,7 +46,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.extensions.webscripts.GUID;
 
-import javax.xml.soap.Node;
 
 /**
  * Integration test for RM-4804

From 8c70dbce5bbd4460ff2a0f2bc0cf08dce670da38 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 28 Mar 2019 09:48:45 +0200
Subject: [PATCH 03/10] change back alfresco-maven-plugin comment out thejava
 version from the maven-enforcer-plugin

---
 pom.xml                                | 55 +++++++++++++-------------
 rm-community/rm-community-repo/pom.xml |  4 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

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>

From d97b8c37852ba394c3df27181948fa9e2636feff Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 28 Mar 2019 11:19:32 +0200
Subject: [PATCH 04/10] update the maven.enforcer.plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a816ca4925..673b4cd32f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,7 +481,7 @@
       <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
       <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
       <maven.compiler.version>3.8.0</maven.compiler.version>
-      <maven.enforcer.plugin>1.4</maven.enforcer.plugin>
+      <maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
       <maven.resources.version>2.7</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 

From afa64ad3d1923f51cad0d52f87e1d5b751ee2668 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 28 Mar 2019 17:21:14 +0200
Subject: [PATCH 05/10] update the versions for surefire and failsafe plugins
 and add an additional argument --illegal-access=permit  to allow all
 reflection access for third party libraries:

---
 pom.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 673b4cd32f..8f5f9182e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -654,7 +654,6 @@
          </plugin>
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.18</version>
             <configuration>
                <includes>
                   <include>**/*UnitTest.java</include>
@@ -814,7 +813,12 @@
          <plugins>
             <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
-               <version>2.18</version>
+               <version>2.22.0</version>
+               <configuration>
+                  <argLine>
+                     --illegal-access=permit
+                  </argLine>
+               </configuration>
             </plugin>
             <plugin>
                <artifactId>maven-install-plugin</artifactId>
@@ -912,7 +916,12 @@
             </plugin>
             <plugin>
                <artifactId>maven-failsafe-plugin</artifactId>
-               <version>2.19</version>
+               <version>2.22.0</version>
+               <configuration>
+                  <argLine>
+                     --illegal-access=permit
+                  </argLine>
+               </configuration>
             </plugin>
             <plugin>
                <artifactId>maven-antrun-plugin</artifactId>

From 84796a516deb8cadb901234c1e5b36b5be06c94a Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 28 Mar 2019 17:53:00 +0200
Subject: [PATCH 06/10] update maven enforce plugin

---
 pom.xml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f5f9182e5..fe775201d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,25 +592,24 @@
    <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>
+            <executions>
+               <execution>
+                  <id>enforce-java</id>
+                  <goals>
+                     <goal>enforce</goal>
+                  </goals>
+                  <configuration>
+                     <rules>
+                        <requireJavaVersion>
+                           <version>[1.8.0,)</version>
+                        </requireJavaVersion>
+                     </rules>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>

From e5ddc93262db424c2be3be367dd06449dd80e251 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Fri, 29 Mar 2019 10:14:03 +0200
Subject: [PATCH 07/10] update the maven java doc plugin to fix the Error
 fetching link: .../target/apidocs/package-list. add the
 fabric8.docker.version to fix the warning "build.plugins.plugin.version' for
 io.fabric8:docker-maven-plugin is missing."

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe775201d7..b3b82816c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -474,7 +474,7 @@
 
       <share.client.contextPath>/share</share.client.contextPath>
 
-      <maven.javadoc.version>3.0.1</maven.javadoc.version>
+      <maven.javadoc.version>3.1.0</maven.javadoc.version>
       <maven.war.plugin.version>2.6</maven.war.plugin.version>
       <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
@@ -683,9 +683,6 @@
                   <id>attach-javadocs</id>
                   <configuration>
                      <doclint>none</doclint>
-
-                     <failOnWarnings>false</failOnWarnings>
-                     <failOnError>false</failOnError>
                      <!--<additionalparam>-Xdoclint:none</additionalparam>-->
                   </configuration>
                   <goals>

From 1bb3a5681e5c1b3696faacfa9a3c53051bc9f6a6 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Mon, 1 Apr 2019 11:11:43 +0300
Subject: [PATCH 08/10] fix getResourceAsStream() for OpenJdk11

---
 .../test/integration/destroy/DestroyContentTest.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java
index 489c8335c3..bea15c57b2 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java
@@ -111,7 +111,7 @@ public class DestroyContentTest extends BaseRMTestCase
 
                 Map<QName, Serializable> props = new HashMap<QName, Serializable>(1);
                 props.put(ContentModel.PROP_TITLE, GUID.generate());
-                InputStream is = System.class.getResourceAsStream("/alfresco/test/content/Image.jpg");
+                InputStream is = DestroyContentTest.class.getResourceAsStream("/alfresco/test/content/Image.jpg");
 
                 subRecord = utils.createRecord(destroyableFolder, GUID.generate(), props, MimetypeMap.MIMETYPE_IMAGE_JPEG, is);
 

From ae5ea087d9a4353a606186ccdab18354aa06d125 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Tue, 2 Apr 2019 12:41:22 +0300
Subject: [PATCH 09/10] tidy up

---
 rm-community/rm-community-repo/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index c4b1b34949..094995701c 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -265,8 +265,6 @@
                      <attachClasses>true</attachClasses>
                      <attachConfig>true</attachConfig>
                      <includeDependencies>true</includeDependencies>
-                     <!--<ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>-->
-                     <!--<ampFinalDir>${project.build.directory}/${project.build.finalName}</ampFinalDir>-->
 
                   </configuration>
                </execution>

From e363bc7b502ce0ea914324b6ba34afc119c6c819 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Tue, 2 Apr 2019 12:43:16 +0300
Subject: [PATCH 10/10] version updates for the plugins used for OpenJDK 11

---
 pom.xml | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index b3b82816c0..48edb2850f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
    </ciManagement>
 
    <prerequisites>
-      <maven>3.2.5</maven>
+      <maven>3.3.9</maven>
    </prerequisites>
 
    <repositories>
@@ -131,7 +131,7 @@
             <plugins>
                <plugin>
                   <artifactId>maven-dependency-plugin</artifactId>
-                  <version>2.10</version>
+                  <version>3.1.1</version>
                   <executions>
                      <!-- Unzips the docflex/javadoc doclet -->
                      <execution>
@@ -482,13 +482,13 @@
       <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
       <maven.compiler.version>3.8.0</maven.compiler.version>
       <maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
-      <maven.resources.version>2.7</maven.resources.version>
+      <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
       <jackson.version>2.9.8</jackson.version>
       <fabric8.docker.version>0.25.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
-      <postgresql.version>42.2.1</postgresql.version>
+      <postgresql.version>42.2.5</postgresql.version>
       <postgresql.port>5432</postgresql.port>
       <mysql.version>5.1.40</mysql.version>
       <mysql.port>3306</mysql.port>
@@ -518,7 +518,7 @@
       <image.tag>latest</image.tag>
       <image.registry>quay.io</image.registry>
 
-      <javax-jaxb.version>2.3.1</javax-jaxb.version>
+      <javax-jaxb.version>2.3.0</javax-jaxb.version>
    </properties>
 
    <dependencyManagement>
@@ -574,13 +574,6 @@
          <scope>provided</scope>
       </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>
          <artifactId>bcel</artifactId>
@@ -676,14 +669,12 @@
             <version>${maven.javadoc.version}</version>
             <configuration>
                <doclint>none</doclint>
-               <!--<additionalparam>-Xdoclint:none</additionalparam>-->
             </configuration>
             <executions>
                <execution>
                   <id>attach-javadocs</id>
                   <configuration>
                      <doclint>none</doclint>
-                     <!--<additionalparam>-Xdoclint:none</additionalparam>-->
                   </configuration>
                   <goals>
                      <goal>jar</goal>
@@ -694,7 +685,7 @@
          </plugin>
          <plugin>
             <artifactId>maven-clean-plugin</artifactId>
-            <version>2.6.1</version>
+            <version>3.1.0</version>
             <executions>
                <execution>
                   <id>default-clean</id>
@@ -733,7 +724,7 @@
          </plugin>
          <plugin>
             <artifactId>maven-site-plugin</artifactId>
-            <version>3.3</version>
+            <version>3.7.1</version>
             <executions>
                <execution>
                   <id>default-site</id>
@@ -809,7 +800,7 @@
          <plugins>
             <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
-               <version>2.22.0</version>
+               <version>2.22.1</version>
                <configuration>
                   <argLine>
                      --illegal-access=permit
@@ -822,11 +813,11 @@
             </plugin>
             <plugin>
                <artifactId>maven-jar-plugin</artifactId>
-               <version>2.5</version>
+               <version>3.1.0</version>
             </plugin>
             <plugin>
                <artifactId>maven-assembly-plugin</artifactId>
-               <version>2.2-beta-5</version>
+               <version>3.1.0</version>
             </plugin>
             <plugin>
                <groupId>org.alfresco.maven.plugin</groupId>
@@ -912,7 +903,7 @@
             </plugin>
             <plugin>
                <artifactId>maven-failsafe-plugin</artifactId>
-               <version>2.22.0</version>
+               <version>2.22.1</version>
                <configuration>
                   <argLine>
                      --illegal-access=permit
@@ -948,14 +939,13 @@
                <artifactId>maven-javadoc-plugin</artifactId>
                <configuration>
                   <doclint>none</doclint>
-                  <!--<additionalparam>-Xdoclint:none</additionalparam>-->
                </configuration>
             </plugin>
 
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>license-maven-plugin</artifactId>
-               <version>1.8</version>
+               <version>1.16</version>
                <configuration>
 
                    <verbose>${license.verbose}</verbose>
@@ -1066,11 +1056,11 @@
             </plugin>
             <plugin>
                <artifactId>maven-clean-plugin</artifactId>
-               <version>2.6.1</version>
+               <version>3.1.0</version>
             </plugin>
             <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
-               <version>2.9</version>
+               <version>3.1.1</version>
             </plugin>
             <plugin>
                <artifactId>maven-archetype-plugin</artifactId>