From 1237c3c810a698753e1018db6c6bdeab8391943a Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 29 Apr 2021 12:34:41 +0100
Subject: [PATCH 1/6] Simplify poms 1

Upgrade maven-surefire-plugin 2.22.1 -> 2.22.2
Upgrade maven-jar-plugin 3.1.0 (in ags) to -> 3.2.0 (was in repo)
Upgrade alfresco-maven-plugin 2.1.1 (ags), 3.0.1 (c-pack) -> 4.0.1 (was in e-pack)

swagger-ui.version 3.38  moved to community-repo
stripped out java versions from ags poms
alfresco-maven-plugin removed snapshotToTimestamp as we now use releases in ags
moved project...Encoding to the 2 top level ags poms - did not want to try system wide - too big a change

[ags]
---
 amps/ags/pom.xml                              | 30 -------------------
 .../rm-community-rest-api-explorer/pom.xml    |  2 --
 pom.xml                                       | 20 +++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 6341a0871b..7ce9912946 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -38,9 +38,6 @@
       <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>
-      <java.version>11</java.version>
-      <maven.compiler.source>${java.version}</maven.compiler.source>
-      <maven.compiler.target>${java.version}</maven.compiler.target>
       <testJavaVersion>${java.version}</testJavaVersion>
       <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
       <maven.compiler.version>3.8.0</maven.compiler.version>
@@ -252,7 +249,6 @@
          </plugin>
          <plugin>
             <artifactId>maven-install-plugin</artifactId>
-            <version>2.5.2</version>
             <executions>
                <execution>
                   <id>default-install</id>
@@ -353,35 +349,10 @@
 
       <pluginManagement>
          <plugins>
-            <plugin>
-               <artifactId>maven-surefire-plugin</artifactId>
-               <version>2.22.1</version>
-               <configuration>
-                  <argLine>
-                     --illegal-access=permit
-                  </argLine>
-               </configuration>
-            </plugin>
-            <plugin>
-               <artifactId>maven-install-plugin</artifactId>
-               <version>2.5.2</version>
-            </plugin>
-            <plugin>
-               <artifactId>maven-jar-plugin</artifactId>
-               <version>3.1.0</version>
-            </plugin>
-            <plugin>
-               <artifactId>maven-assembly-plugin</artifactId>
-               <version>3.1.0</version>
-            </plugin>
             <plugin>
                <groupId>org.alfresco.maven.plugin</groupId>
                <artifactId>alfresco-maven-plugin</artifactId>
-               <version>2.1.1</version>
                <extensions>true</extensions>
-               <configuration>
-                  <snapshotToTimestamp>true</snapshotToTimestamp>
-               </configuration>
             </plugin>
             <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
@@ -604,7 +575,6 @@
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
-                     <version>2.1.1</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
index ea502f70e8..1d0702ba78 100644
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -12,8 +12,6 @@
 
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 4dc130f93a..561109c720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
         <dependency.activemq.version>5.16.1</dependency.activemq.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.0.3</dependency.awaitility.version>
+        <swagger-ui.version>3.38.0</swagger-ui.version>
 
         <dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version>
         <dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version>
@@ -824,6 +825,25 @@
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>0.34.1</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                    <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <runOrder>alphabetical</runOrder>
+                        <argLine>
+                            --illegal-access=permit
+                        </argLine>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.alfresco.maven.plugin</groupId>
+                    <artifactId>alfresco-maven-plugin</artifactId>
+                    <configuration>
+                        <attachClasses>true</attachClasses>
+                        <ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.2.0</version>

From 66eae76a753c31c1f0d0d4f30541573bb71719d3 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 29 Apr 2021 14:09:45 +0100
Subject: [PATCH 2/6] Undo alfresco-maven-plugin change in last commit - build
 failures

---
 amps/ags/pom.xml | 2 ++
 pom.xml          | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 7ce9912946..69a48fa295 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -352,6 +352,7 @@
             <plugin>
                <groupId>org.alfresco.maven.plugin</groupId>
                <artifactId>alfresco-maven-plugin</artifactId>
+               <version>2.1.1</version>
                <extensions>true</extensions>
             </plugin>
             <plugin>
@@ -575,6 +576,7 @@
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
+                     <version>2.1.1</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/pom.xml b/pom.xml
index 561109c720..49be0916eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,14 +836,6 @@
                         </argLine>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.alfresco.maven.plugin</groupId>
-                    <artifactId>alfresco-maven-plugin</artifactId>
-                    <configuration>
-                        <attachClasses>true</attachClasses>
-                        <ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.2.0</version>

From c592fd7c0253f7c77c745fc7783bfb739d703e95 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 29 Apr 2021 17:36:26 +0100
Subject: [PATCH 3/6] Fix: [WARNING] Reporting configuration should be done in
 <reporting> section,...

---
 amps/ags/pom.xml | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 69a48fa295..5c108d3aef 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -282,14 +282,6 @@
                   <goals>
                      <goal>site</goal>
                   </goals>
-                  <configuration>
-                     <reportPlugins>
-                        <reportPlugin>
-                           <groupId>org.apache.maven.plugins</groupId>
-                           <artifactId>maven-project-info-reports-plugin</artifactId>
-                        </reportPlugin>
-                     </reportPlugins>
-                  </configuration>
                </execution>
                <execution>
                   <id>default-deploy</id>
@@ -297,24 +289,8 @@
                   <goals>
                      <goal>deploy</goal>
                   </goals>
-                  <configuration>
-                     <reportPlugins>
-                        <reportPlugin>
-                           <groupId>org.apache.maven.plugins</groupId>
-                           <artifactId>maven-project-info-reports-plugin</artifactId>
-                        </reportPlugin>
-                     </reportPlugins>
-                  </configuration>
                </execution>
             </executions>
-            <configuration>
-               <reportPlugins>
-                  <reportPlugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                  </reportPlugin>
-               </reportPlugins>
-            </configuration>
          </plugin>
       </plugins>
       <extensions>
@@ -644,6 +620,15 @@
       </pluginManagement>
    </build>
 
+   <reporting>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+         </plugin>
+      </plugins>
+   </reporting>
+
    <profiles>
       <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
       <profile>

From 79017a60552f7733e6df1deef4637684e4b2c8a0 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Fri, 30 Apr 2021 14:36:19 +0100
Subject: [PATCH 4/6] Move common ags vars to community-repo [ags]

---
 amps/ags/pom.xml      | 55 -----------------------------------------
 packaging/war/pom.xml |  1 -
 pom.xml               | 57 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 5c108d3aef..d955748358 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -16,62 +16,10 @@
    </modules>
 
    <properties>
-      <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
-      <alfresco.data.location>${session.executionRootDirectory}/alf_data_dev</alfresco.data.location>
-      <alfresco.db.datasource.class>org.gjt.mm.mysql.Driver</alfresco.db.datasource.class>
-      <alfresco.db.name>alf_dev</alfresco.db.name>
-      <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
-      <alfresco.db.password>alfresco</alfresco.db.password>
-      <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
-      <alfresco.db.username>alfresco</alfresco.db.username>
-      <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
-      <api.explorer.version>7.0.0</api.explorer.version>
-
-      <alfresco.min.version>7.0.0</alfresco.min.version>
-
-      <activemq.port1>61616</activemq.port1>
-      <activemq.port2>5672</activemq.port2>
-      <camel.mock.version>3.7.0</camel.mock.version>
-      <share.client.contextPath>/share</share.client.contextPath>
-
-      <maven.javadoc.version>3.1.0</maven.javadoc.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>
-      <testJavaVersion>${java.version}</testJavaVersion>
-      <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>3.1.0</maven.resources.version>
-      <maven.tomcat.port>8080</maven.tomcat.port>
-
-      <jackson.version>2.12.1</jackson.version>
-      <jackson-databind.version>2.12.1</jackson-databind.version>
-      <fabric8.docker.version>0.34.1</fabric8.docker.version>
-      <mockito.version>1.10.19</mockito.version>
-
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-
-      <license.update.dryrun>true</license.update.dryrun>
-      <license.verbose>false</license.verbose>
-
-      <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
-      <app.amp.folder>src/main/amp</app.amp.folder>
-      <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
       <app.filtering.enabled>true</app.filtering.enabled>
-      <app.log.dir>${project.build.directory}/</app.log.dir>
-      <app.log.root.level>WARN</app.log.root.level>
-      <app.properties.include>**</app.properties.include>
-      <app.properties.folder>src/main/properties/local</app.properties.folder>
-      <app.properties.test.include>**</app.properties.test.include>
-      <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
-
-      <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
-      <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
-      <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-      <apache-compress.version>1.19</apache-compress.version>
    </properties>
 
    <dependencyManagement>
@@ -218,7 +166,6 @@
          </plugin>
          <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${maven.javadoc.version}</version>
             <configuration>
                <doclint>none</doclint>
             </configuration>
@@ -541,7 +488,6 @@
             </plugin>
             <plugin>
                <artifactId>maven-war-plugin</artifactId>
-               <version>${maven.war.plugin.version}</version>
                <dependencies>
                   <!-- Needed when creating the community and enterprise rest api wars  -->
                   <dependency>
@@ -676,7 +622,6 @@
 
                <plugin>
                   <artifactId>maven-javadoc-plugin</artifactId>
-                  <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>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index cbe5cd465a..1e8f49c69f 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -183,7 +183,6 @@
 
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
                 <!-- This allows overlays to be prepared on the FS for minification and faster run -->
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
index 49be0916eb..a67659827f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,8 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.build.sourceVersion>11</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>
 
         <dir.root>${project.build.directory}/alf_data</dir.root>
 
@@ -112,6 +114,55 @@
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
         <dependency.tas-ftp.version>1.5</dependency.tas-ftp.version>
         <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>
+
+        <!-- AGS properties shared between community and enterprise -->
+
+        <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
+        <api.explorer.version>7.0.0</api.explorer.version>
+
+        <alfresco.min.version>7.0.0</alfresco.min.version>
+
+        <activemq.version>5.15.8</activemq.version>
+        <activemq.port1>61616</activemq.port1>
+        <activemq.port2>5672</activemq.port2>
+        <camel.mock.version>3.7.0</camel.mock.version>
+        <share.client.contextPath>/share</share.client.contextPath>
+
+        <testJavaVersion>${java.version}</testJavaVersion>
+
+        <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>3.1.0</maven.resources.version>
+        <maven.tomcat.port>8080</maven.tomcat.port>
+
+        <jackson.version>2.12.1</jackson.version>
+        <jackson-databind.version>2.12.1</jackson-databind.version>
+        <fabric8.docker.version>0.34.1</fabric8.docker.version>
+        <mockito.version>1.10.19</mockito.version>
+
+        <postgresql.version>42.2.16</postgresql.version>
+        <postgresql.port>5432</postgresql.port>
+        <mysql.version>5.1.40</mysql.version>
+        <mysql.port>3306</mysql.port>
+        <!--This prevents a clash when postgres is already running natively on the machine.-->
+        <database.port>5431</database.port>
+
+        <license.update.dryrun>true</license.update.dryrun>
+        <license.verbose>false</license.verbose>
+
+        <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
+        <app.amp.folder>src/main/amp</app.amp.folder>
+        <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
+        <app.properties.include>**</app.properties.include>
+        <app.properties.folder>src/main/properties/local</app.properties.folder>
+        <app.properties.test.include>**</app.properties.test.include>
+        <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
+
+        <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
+        <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
+        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
+        <apache-compress.version>1.19</apache-compress.version>
     </properties>
 
     <scm>
@@ -840,10 +891,14 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.2.0</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven.war.plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>${maven.javadoc.plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 17ed9181c89a1d04b632b68e93f6d57bcaa711b5 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Fri, 30 Apr 2021 16:42:43 +0100
Subject: [PATCH 5/6] alfresco.api-explorer.version 7.0.0 +
 alfresco.maven-plugin.version 2.2.0 [ags]

---
 amps/ags/pom.xml                                   |  8 +-------
 .../rm-community-rest-api-explorer/pom.xml         |  2 +-
 pom.xml                                            | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index d955748358..aa7fee8de1 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -272,12 +272,6 @@
 
       <pluginManagement>
          <plugins>
-            <plugin>
-               <groupId>org.alfresco.maven.plugin</groupId>
-               <artifactId>alfresco-maven-plugin</artifactId>
-               <version>2.1.1</version>
-               <extensions>true</extensions>
-            </plugin>
             <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>${maven.compiler.version}</version>
@@ -498,7 +492,7 @@
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
                      <artifactId>alfresco-maven-plugin</artifactId>
-                     <version>2.1.1</version>
+                     <version>${alfresco.maven-plugin.version}</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
index 1d0702ba78..1993ca3f96 100644
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -66,7 +66,7 @@
       <dependency>
          <groupId>org.alfresco</groupId>
          <artifactId>api-explorer</artifactId>
-         <version>${api.explorer.version}</version>
+         <version>${alfresco.api-explorer.version}</version>
          <type>war</type>
       </dependency>
    </dependencies>
diff --git a/pom.xml b/pom.xml
index a67659827f..945b31f1a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,9 @@
 
         <alfresco.googledrive.version>3.2.1</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.4.0</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>7.0.0</alfresco.api-explorer.version>
+        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
+
 
         <dependency.postgresql.version>42.2.19</dependency.postgresql.version>
         <dependency.mysql.version>8.0.23</dependency.mysql.version>
@@ -118,7 +121,6 @@
         <!-- AGS properties shared between community and enterprise -->
 
         <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
-        <api.explorer.version>7.0.0</api.explorer.version>
 
         <alfresco.min.version>7.0.0</alfresco.min.version>
 
@@ -910,6 +912,16 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>3.1.2</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.alfresco.maven.plugin</groupId>
+                    <artifactId>alfresco-maven-plugin</artifactId>
+                    <version>${alfresco.maven-plugin.version}</version>
+                    <extensions>true</extensions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

From 6ddf2afb0b0fb0a3946d6a4c4a4ee29a55d12675 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Sat, 1 May 2021 10:47:03 +0100
Subject: [PATCH 6/6] common versions pt1

---
 amps/ags/pom.xml                              | 98 ++++++++-----------
 amps/ags/rm-community/pom.xml                 | 25 -----
 .../rm-community/rm-community-repo/pom.xml    | 21 +---
 pom.xml                                       | 75 ++++++--------
 4 files changed, 74 insertions(+), 145 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index aa7fee8de1..2c4e8de8d0 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -17,72 +17,56 @@
 
    <properties>
       <maven.javadoc.skip>true</maven.javadoc.skip>
+
+      <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>3.1.0</maven.resources.version>
+      <maven.tomcat.port>8080</maven.tomcat.port>
+
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+      <license.update.dryrun>true</license.update.dryrun>
+      <license.verbose>false</license.verbose>
+
+      <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
+      <app.amp.folder>src/main/amp</app.amp.folder>
+      <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
       <app.filtering.enabled>true</app.filtering.enabled>
+      <app.properties.include>**</app.properties.include>
+      <app.properties.folder>src/main/properties/local</app.properties.folder>
+      <app.properties.test.include>**</app.properties.test.include>
+      <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
    </properties>
 
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.alfresco.surf</groupId>
-            <artifactId>spring-webscripts</artifactId>
-            <version>${alfresco-spring-webscripts.version}</version>
-            <classifier>tests</classifier>
-         </dependency>
-         <dependency>
-            <groupId>postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${alfresco.postgres.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${dependency.mysql.version}</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
    <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>javax.xml.bind</groupId>
-         <artifactId>jaxb-api</artifactId>
-         <version>${javax-jaxb.version}</version>
+         <groupId>jakarta.jws</groupId>
+         <artifactId>jakarta.jws-api</artifactId>
          <scope>provided</scope>
       </dependency>
 
-      <dependency>
-         <groupId>org.apache.camel</groupId>
-         <artifactId>camel-mock</artifactId>
-         <version>${camel.mock.version}</version>
-         <scope>test</scope>
-      </dependency>
+<!--      <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-impl.version}</version>
-         <scope>provided</scope>
-      </dependency>
+<!--      <dependency>-->
+<!--         <groupId>com.sun.xml.bind</groupId>-->
+<!--         <artifactId>jaxb-impl</artifactId>-->
+<!--         <scope>provided</scope>-->
+<!--      </dependency>-->
 
-      <dependency>
-         <groupId>org.apache.bcel</groupId>
-         <artifactId>bcel</artifactId>
-         <version>6.2.99</version>
-         <scope>provided</scope>
-      </dependency>
+<!--      <dependency>-->
+<!--         <groupId>org.apache.bcel</groupId>-->
+<!--         <artifactId>bcel</artifactId>-->
+<!--         <version>6.2.99</version>-->
+<!--         <scope>provided</scope>-->
+<!--      </dependency>-->
    </dependencies>
 
    <build>
@@ -123,7 +107,7 @@
                      <regexPropertySettings>
                         <regexPropertySetting>
                            <name>ags.module.repo.version.min</name>
-                           <value>${alfresco.min.version}</value>
+                           <value>${amp.min.version}</value>
                            <regex>(\d+)\.(\d+).*</regex>
                            <replacement>$1.$2</replacement>
                            <failIfNoMatch>false</failIfNoMatch>
@@ -287,8 +271,8 @@
                         <goal>testCompile</goal>
                      </goals>
                      <configuration>
-                        <source>${testJavaVersion}</source>
-                        <target>${testJavaVersion}</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                      </configuration>
                   </execution>
                </executions>
@@ -487,7 +471,7 @@
                   <dependency>
                      <groupId>org.apache.commons</groupId>
                      <artifactId>commons-compress</artifactId>
-                     <version>${apache-compress.version}</version>
+                     <version>${dependency.apache-compress.version}</version>
                   </dependency>
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index a83000e57a..2fdcfcf9a8 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -28,31 +28,6 @@
             <artifactId>spring-test</artifactId>
             <version>${dependency.spring.version}</version>
          </dependency>
-         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-         </dependency>
       </dependencies>
    </dependencyManagement>
 </project>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index a358e10a02..3e352d91fd 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -12,24 +12,7 @@
    </parent>
 
    <properties>
-      <alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
-      <alfresco.db.hibernate.dialect>org.alfresco.repo.domain.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
-      <alfresco.db.name>alfresco</alfresco.db.name>
-      <alfresco.db.username>alfresco</alfresco.db.username>
-      <alfresco.db.password>alfresco</alfresco.db.password>
-      <alfresco.db.host>localhost</alfresco.db.host>
-      <alfresco.test.db.name>alfresco-test</alfresco.test.db.name>
-
-      <mysql.version>5.7.23</mysql.version>
-      <mysql.port>3306</mysql.port>
-      <mysql.tests.port>3307</mysql.tests.port>
-
-      <postgresql.port>5432</postgresql.port>
-      <!--This prevents a clash when postgres is already running natively on the machine.-->
-      <postgresql.tests.port>5431</postgresql.tests.port>
-
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
-      <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
 
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
@@ -99,7 +82,7 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>postgresql</groupId>
+         <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
          <scope>test</scope>
       </dependency>
@@ -563,7 +546,7 @@
                   <configuration>
                      <images>
                         <image>
-                           <name>mysql:${mysql.version}</name>
+                           <name>mysql:${dependency.mysql-image.version}</name>
                            <run>
                               <ports>
                                  <port>${mysql.tests.port}:${mysql.port}</port>
diff --git a/pom.xml b/pom.xml
index 945b31f1a9..fb4567c9b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
         <acs.version.minor>1</acs.version.minor>
         <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
+        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
         <version.edition>Community</version.edition>
         <licenseName>community</licenseName>
@@ -65,6 +66,7 @@
         <dependency.webscripts.version>8.18</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.68</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.8.0</dependency.mockito-core.version>
+        <dependency.mockito-all.version>1.10.19</dependency.mockito-all.version>
         <dependency.org-json.version>20210307</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.8.0</dependency.commons-io.version>
@@ -85,6 +87,7 @@
         <dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version>
         <dependency.camel.version>3.7.1</dependency.camel.version>
         <dependency.activemq.version>5.16.1</dependency.activemq.version>
+        <dependency.apache-compress.version>1.20</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.0.3</dependency.awaitility.version>
         <swagger-ui.version>3.38.0</swagger-ui.version>
@@ -105,9 +108,9 @@
         <alfresco.api-explorer.version>7.0.0</alfresco.api-explorer.version>
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
 
-
         <dependency.postgresql.version>42.2.19</dependency.postgresql.version>
         <dependency.mysql.version>8.0.23</dependency.mysql.version>
+        <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.2</dependency.mariadb.version>
         <dependency.tas-utility.version>3.0.44</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
@@ -119,52 +122,20 @@
         <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>
 
         <!-- AGS properties shared between community and enterprise -->
-
-        <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
-
-        <alfresco.min.version>7.0.0</alfresco.min.version>
-
-        <activemq.version>5.15.8</activemq.version>
         <activemq.port1>61616</activemq.port1>
         <activemq.port2>5672</activemq.port2>
-        <camel.mock.version>3.7.0</camel.mock.version>
-        <share.client.contextPath>/share</share.client.contextPath>
-
-        <testJavaVersion>${java.version}</testJavaVersion>
-
-        <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>3.1.0</maven.resources.version>
-        <maven.tomcat.port>8080</maven.tomcat.port>
-
-        <jackson.version>2.12.1</jackson.version>
-        <jackson-databind.version>2.12.1</jackson-databind.version>
-        <fabric8.docker.version>0.34.1</fabric8.docker.version>
-        <mockito.version>1.10.19</mockito.version>
-
-        <postgresql.version>42.2.16</postgresql.version>
         <postgresql.port>5432</postgresql.port>
-        <mysql.version>5.1.40</mysql.version>
+        <postgresql.tests.port>5431</postgresql.tests.port>
         <mysql.port>3306</mysql.port>
-        <!--This prevents a clash when postgres is already running natively on the machine.-->
-        <database.port>5431</database.port>
+        <mysql.tests.port>3307</mysql.tests.port>
 
-        <license.update.dryrun>true</license.update.dryrun>
-        <license.verbose>false</license.verbose>
-
-        <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
-        <app.amp.folder>src/main/amp</app.amp.folder>
-        <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
-        <app.properties.include>**</app.properties.include>
-        <app.properties.folder>src/main/properties/local</app.properties.folder>
-        <app.properties.test.include>**</app.properties.test.include>
-        <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
-
-        <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
-        <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
-        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <apache-compress.version>1.19</apache-compress.version>
+        <alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
+        <alfresco.db.hibernate.dialect>org.alfresco.repo.domain.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
+        <alfresco.db.name>alfresco</alfresco.db.name>
+        <alfresco.db.username>alfresco</alfresco.db.username>
+        <alfresco.db.password>alfresco</alfresco.db.password>
+        <alfresco.db.host>localhost</alfresco.db.host>
+        <alfresco.test.db.name>alfresco-test</alfresco.test.db.name>
     </properties>
 
     <scm>
@@ -528,6 +499,16 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${dependency.jackson-databind.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-joda</artifactId>
+                <version>${dependency.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${dependency.jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
@@ -661,7 +642,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.20</version>
+                <version>${dependency.apache-compress.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -750,7 +731,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.13.1</version>
+                <version>4.13.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -759,6 +740,12 @@
                 <version>${dependency.antlr.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>${dependency.mockito-all.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>