From 79095ce544367f5fefd7c48bfbc268ba125c3ef2 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Wed, 5 May 2021 21:26:14 +0100
Subject: [PATCH] Simplify dependencies so they are inherited.

Includes Cezar's removal of eclipse profiles.

[ags]

(cherry picked from commit cd2afea3be4a89f25b1585af3f5d4f7519e9d464)
---
 amps/ags/pom.xml                              | 65 +------------------
 amps/ags/rm-automation/pom.xml                | 28 --------
 .../rm-automation-community-rest-api/pom.xml  |  8 +--
 amps/ags/rm-community/pom.xml                 | 10 ---
 .../rm-community/rm-community-repo/pom.xml    | 46 -------------
 amps/share-services/pom.xml                   |  1 -
 data-model/pom.xml                            | 37 -----------
 packaging/war/pom.xml                         | 19 ------
 pom.xml                                       | 30 ++++++++-
 repository/pom.xml                            | 51 ---------------
 10 files changed, 31 insertions(+), 264 deletions(-)

diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 2c4e8de8d0..1aa7824543 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -47,26 +47,6 @@
          <artifactId>jakarta.jws-api</artifactId>
          <scope>provided</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>-->
-<!--         <scope>provided</scope>-->
-<!--      </dependency>-->
-
-<!--      <dependency>-->
-<!--         <groupId>org.apache.bcel</groupId>-->
-<!--         <artifactId>bcel</artifactId>-->
-<!--         <version>6.2.99</version>-->
-<!--         <scope>provided</scope>-->
-<!--      </dependency>-->
    </dependencies>
 
    <build>
@@ -277,49 +257,6 @@
                   </execution>
                </executions>
             </plugin>
-            <plugin>
-               <groupId>org.eclipse.m2e</groupId>
-               <artifactId>lifecycle-mapping</artifactId>
-               <version>1.0.0</version>
-               <configuration>
-                  <lifecycleMappingMetadata>
-                     <pluginExecutions>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                              <groupId>org.apache.maven.plugins</groupId>
-                              <artifactId>maven-enforcer-plugin</artifactId>
-                              <versionRange>[1.0.0,)</versionRange>
-                              <goals>
-                                 <goal>enforce</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                                <groupId>
-                                    org.codehaus.mojo
-                                </groupId>
-                                <artifactId>
-                                    build-helper-maven-plugin
-                                </artifactId>
-                                <versionRange>
-                                    [1.9.1,)
-                                </versionRange>
-                              <goals>
-                                 <goal>regex-properties</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                     </pluginExecutions>
-                  </lifecycleMappingMetadata>
-               </configuration>
-            </plugin>
             <plugin>
                <artifactId>maven-enforcer-plugin</artifactId>
                <version>${maven.enforcer.plugin}</version>
@@ -429,7 +366,7 @@
                   <dependency>
                      <groupId>org.apache.maven.shared</groupId>
                      <artifactId>maven-filtering</artifactId>
-                     <version>3.1.1</version>
+                     <version>${dependency.maven-filtering.version}</version>
                   </dependency>
                </dependencies>
                <configuration>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 4ade32c99c..c8903f7c6b 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -38,33 +38,5 @@
             </configuration>
          </plugin>
       </plugins>
-      <pluginManagement>
-         <plugins>
-            <plugin>
-               <groupId>org.eclipse.m2e</groupId>
-               <artifactId>lifecycle-mapping</artifactId>
-               <version>1.0.0</version>
-               <configuration>
-                  <lifecycleMappingMetadata>
-                     <pluginExecutions>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                              <groupId>org.codehaus.mojo</groupId>
-                              <artifactId>license-maven-plugin</artifactId>
-                              <versionRange>[1.8,)</versionRange>
-                              <goals>
-                                 <goal>update-file-header</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                     </pluginExecutions>
-                  </lifecycleMappingMetadata>
-               </configuration>
-            </plugin>
-         </plugins>
-      </pluginManagement>
    </build>
 </project>
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 896d7a3b1c..2175452cdf 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
@@ -12,8 +12,6 @@
 
    <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>
@@ -51,7 +49,6 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
-         <version>${dependency.tas-restapi.version}</version>
          <exclusions>
             <exclusion>
                <groupId>com.fasterxml.jackson.core</groupId>
@@ -71,14 +68,13 @@
       <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>${fluent.json.version}</version>
+         <version>2.0.0</version>
       </dependency>
       <dependency>
          <groupId>org.alfresco.test</groupId>
@@ -88,7 +84,6 @@
       <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-collections4</artifactId>
-         <version>4.1</version>
       </dependency>
       <dependency>
          <groupId>com.github.docker-java</groupId>
@@ -98,7 +93,6 @@
       <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
-         <version>${jackson.databind.version}</version>
       </dependency>
    </dependencies>
 </project>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 2fdcfcf9a8..c450b93df3 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -20,14 +20,4 @@
          <name>LGPL 3</name>
       </license>
    </licenses>
-
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${dependency.spring.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 3e352d91fd..1e6708d089 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -12,10 +12,7 @@
    </parent>
 
    <properties>
-      <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
-
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
-
       <maven.javadoc.skip>false</maven.javadoc.skip>
    </properties>
 
@@ -101,14 +98,12 @@
       <dependency>
          <groupId>io.swagger</groupId>
          <artifactId>swagger-parser</artifactId>
-         <version>1.0.52</version>
          <scope>test</scope>
       </dependency>
       <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
       <dependency>
          <groupId>com.github.fge</groupId>
          <artifactId>json-schema-validator</artifactId>
-         <version>2.2.6</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -387,47 +382,6 @@
             </configuration>
          </plugin>
       </plugins>
-
-      <pluginManagement>
-         <plugins>
-            <plugin>
-               <groupId>org.eclipse.m2e</groupId>
-               <artifactId>lifecycle-mapping</artifactId>
-               <configuration>
-                  <lifecycleMappingMetadata>
-                     <pluginExecutions>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                              <groupId>org.codehaus.mojo</groupId>
-                              <artifactId>properties-maven-plugin</artifactId>
-                              <versionRange>[1.0-alpha-2,)</versionRange>
-                              <goals>
-                                 <goal>read-project-properties</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                              <groupId>org.codehaus.mojo</groupId>
-                              <artifactId>license-maven-plugin</artifactId>
-                              <versionRange>[1.8,)</versionRange>
-                              <goals>
-                                 <goal>update-file-header</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                     </pluginExecutions>
-                  </lifecycleMappingMetadata>
-               </configuration>
-            </plugin>
-         </plugins>
-      </pluginManagement>
    </build>
 
    <profiles>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 62bdc35278..53eb4bfda2 100644
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -131,7 +131,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${dependency.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index a98cd03154..6c9a98aec2 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -73,43 +73,6 @@
                 </executions>
             </plugin>
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.jibx</groupId>
-                                        <artifactId>
-                                            maven-jibx-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [1.2.5,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>bind</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute>
-                                            <runOnConfiguration>true</runOnConfiguration>
-                                            <runOnIncremental>true</runOnIncremental>
-                                        </execute>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <dependencies>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 9b6f5540b6..d230eabfac 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -249,23 +249,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <profiles>
-        <!-- Tweaks required to make the build work in Eclipse -->
-        <profile>
-            <id>m2e</id>
-            <dependencies>
-                <dependency>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-                   <!-- This is needed for Maven tomcat run -->
-                   <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                </dependency>
-            </dependencies>
-       </profile>
-    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 11504caa78..6c9f1c0f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,9 @@
         <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>
+        <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
+        <dependency.swagger-parser.version>1.0.52</dependency.swagger-parser.version>
+        <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.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>
@@ -632,6 +634,11 @@
                 <artifactId>junrar</artifactId>
                 <version>7.4.0</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.fge</groupId>
+                <artifactId>json-schema-validator</artifactId>
+                <version>2.2.6</version>
+            </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
                 <groupId>org.jsoup</groupId>
@@ -649,6 +656,11 @@
                 <artifactId>commons-csv</artifactId>
                 <version>1.8</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>4.2</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.postgresql</groupId>
@@ -846,6 +858,22 @@
                 <artifactId>taglibs-standard-jstlel</artifactId>
                 <version>${dependency.apache.taglibs.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>0.9.12</version>
+            </dependency>
+            <!-- swagger parser -->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-parser</artifactId>
+                <version>${dependency.swagger-parser.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.6</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/repository/pom.xml b/repository/pom.xml
index 7308041ec2..2be77ad9a3 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -1025,57 +1025,6 @@
                     <artifactId>license-maven-plugin</artifactId>
                     <version>2.0.0</version>
                 </plugin>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.apache.maven.plugins
-                                        </groupId>
-                                        <artifactId>
-                                            maven-surefire-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [2.14,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>test</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.jibx</groupId>
-                                        <artifactId>
-                                            maven-jibx-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [1.2.5,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>bind</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute>
-                                            <runOnConfiguration>true</runOnConfiguration>
-                                            <runOnIncremental>true</runOnIncremental>
-                                        </execute>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>