From c2ab2b0a5a1b815211001b083cb415da4d5c3b45 Mon Sep 17 00:00:00 2001
From: "Cezar.Leahu" <cezar.leahu@ness.com>
Date: Wed, 26 Aug 2020 21:57:10 +0300
Subject: [PATCH] ACS-550 Reorganize dependencies for the maven-release-plugin

---
 data-model/pom.xml    |  1 +
 packaging/war/pom.xml |  5 +++
 pom.xml               | 91 -------------------------------------------
 remote-api/pom.xml    |  4 ++
 repository/pom.xml    |  4 ++
 5 files changed, 14 insertions(+), 91 deletions(-)

diff --git a/data-model/pom.xml b/data-model/pom.xml
index 2de489424c..0cd9a7a492 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -117,6 +117,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <!--
             | provided dependencies (are not transitive and not included in webapps)
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 5e36f4805b..c88ae6d93a 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -21,10 +21,12 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
@@ -77,18 +79,21 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index cdb4fe0537..fc7f90cab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,6 @@
     </modules>
 
     <properties>
-        <dependency.alfresco-community-repo.version>${project.version}</dependency.alfresco-community-repo.version>
-
         <!-- Set to "Community Early Access" to add to the version.edition property in version.properties  -->
         <version.edition>Community</version.edition>
 
@@ -111,60 +109,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>content-services-community</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <type>war</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-core</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-core</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-data-model</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-data-model</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-repository</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-repository</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-remote-api</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-remote-api</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-jlan-embed</artifactId>
@@ -592,41 +536,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-cmis-test</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-email-test</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-integration-test</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-restapi-test</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-webdav-test</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>utility</artifactId>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 00271aaa7b..f14895df9c 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -23,10 +23,12 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <!-- Duplicate classes from com.sun.activation:jakarta.activation-->
                 <exclusion>
@@ -138,12 +140,14 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
             <exclusions>
diff --git a/repository/pom.xml b/repository/pom.xml
index 98f6f01001..bc98a1481a 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
                 <exclusion>
@@ -908,6 +909,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
             <exclusions>
@@ -926,6 +928,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
             <exclusions>
@@ -944,6 +947,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <!-- Duplicate classes from com.sun.activation:jakarta.activation-->
                 <exclusion>