From 2f9f5698cb3423cc4b2856ebbe0d48015deefdf6 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Wed, 5 May 2021 21:22:47 +0100
Subject: [PATCH] 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]

(cherry picked from commit 1237c3c810a698753e1018db6c6bdeab8391943a)
---
 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 67e288dad8..76e814b2fb 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>