From f8ac3870cd032e527580313d3650765abf4d1364 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Wed, 5 May 2021 21:23:38 +0100
Subject: [PATCH] Move common ags vars to community-repo [ags]

(cherry picked from commit 79017a60552f7733e6df1deef4637684e4b2c8a0)
---
 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 4cadc16db8..9b6f5540b6 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 efce577ea5..431e74d990 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>