From f0fe4c99a6bbca7bb7c5fec0eedcb2b7fa5db19d Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Wed, 5 May 2021 21:26:34 +0100
Subject: [PATCH] Too many changes, but think it fixes the 2 failing tests.
 [skip repo][skip db][skip tas][ags]

(cherry picked from commit f461667be9d8f4d14cba5f4fdb79f552f3702841)
---
 amps/ags/pom.xml                              | 26 +++++++++++++------
 .../rm-automation-community-rest-api/pom.xml  |  9 +++++--
 pom.xml                                       |  6 ++---
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 1aa7824543..c4508389d8 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -41,6 +41,12 @@
    </properties>
 
    <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.13.2</version>
+         <scope>test</scope>
+      </dependency>
       <!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
       <dependency>
          <groupId>jakarta.jws</groupId>
@@ -130,6 +136,7 @@
          </plugin>
          <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.1.0</version>
             <configuration>
                <doclint>none</doclint>
             </configuration>
@@ -160,6 +167,7 @@
          </plugin>
          <plugin>
             <artifactId>maven-install-plugin</artifactId>
+            <version>2.5.2</version>
             <executions>
                <execution>
                   <id>default-install</id>
@@ -238,7 +246,7 @@
          <plugins>
             <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-               <version>${maven.compiler.version}</version>
+               <version>3.8.0</version>
                <configuration>
                   <source>${maven.compiler.source}</source>
                   <target>${maven.compiler.target}</target>
@@ -259,7 +267,7 @@
             </plugin>
             <plugin>
                <artifactId>maven-enforcer-plugin</artifactId>
-               <version>${maven.enforcer.plugin}</version>
+               <version>3.0.0-M2</version>
             </plugin>
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
@@ -282,7 +290,7 @@
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
-               <version>${maven.buildhelper.version}</version>
+               <version>1.9.1</version>
             </plugin>
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
@@ -361,12 +369,12 @@
             </plugin>
             <plugin>
                <artifactId>maven-resources-plugin</artifactId>
-               <version>${maven.resources.version}</version>
+               <version>3.1.0</version>
                <dependencies>
                   <dependency>
                      <groupId>org.apache.maven.shared</groupId>
                      <artifactId>maven-filtering</artifactId>
-                     <version>${dependency.maven-filtering.version}</version>
+                     <version>3.1.1</version>
                   </dependency>
                </dependencies>
                <configuration>
@@ -403,17 +411,18 @@
             </plugin>
             <plugin>
                <artifactId>maven-war-plugin</artifactId>
+               <version>3.2.2</version>
                <dependencies>
                   <!-- Needed when creating the community and enterprise rest api wars  -->
                   <dependency>
                      <groupId>org.apache.commons</groupId>
                      <artifactId>commons-compress</artifactId>
-                     <version>${dependency.apache-compress.version}</version>
+                     <version>1.19</version>
                   </dependency>
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
-                     <version>${alfresco.maven-plugin.version}</version>
+                     <version>2.1.1</version>
                   </dependency>
                </dependencies>
                <configuration>
@@ -537,6 +546,7 @@
 
                <plugin>
                   <artifactId>maven-javadoc-plugin</artifactId>
+                  <version>3.1.0</version>
                   <configuration>
                      <doclet>com.docflex.javadoc.Doclet</doclet>
                      <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
@@ -576,7 +586,7 @@
                <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>build-helper-maven-plugin</artifactId>
-                  <version>${maven.buildhelper.version}</version>
+                  <version>1.9.1</version>
                   <executions>
                      <execution>
                         <id>add-env-test-properties</id>
diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 2175452cdf..907e0879b7 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -11,7 +11,8 @@
    </parent>
 
    <properties>
-      <maven.javadoc.skip>false</maven.javadoc.skip>
+      <fluent.json.version>2.0.0</fluent.json.version>
+      <jackson.databind.version>2.7.9.1</jackson.databind.version>
    </properties>
 
    <build>
@@ -49,6 +50,7 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
+         <version>${dependency.tas-restapi.version}</version>
          <exclusions>
             <exclusion>
                <groupId>com.fasterxml.jackson.core</groupId>
@@ -68,13 +70,14 @@
       <dependency>
          <groupId>org.projectlombok</groupId>
          <artifactId>lombok</artifactId>
+         <version>1.18.6</version>
          <scope>provided</scope>
       </dependency>
       <!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored -->
       <dependency>
          <groupId>org.jglue.fluent-json</groupId>
          <artifactId>fluent-json</artifactId>
-         <version>2.0.0</version>
+         <version>${fluent.json.version}</version>
       </dependency>
       <dependency>
          <groupId>org.alfresco.test</groupId>
@@ -84,6 +87,7 @@
       <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-collections4</artifactId>
+         <version>4.1</version>
       </dependency>
       <dependency>
          <groupId>com.github.docker-java</groupId>
@@ -93,6 +97,7 @@
       <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
+         <version>${jackson.databind.version}</version>
       </dependency>
    </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 6c9f1c0f0a..8e21c399d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
         <image.registry>quay.io</image.registry>
 
         <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.build.sourceVersion>11</maven.build.sourceVersion>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
         <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
         <maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>