From 60977b9db08fb9ce6ded8c20e56663f004163b4b Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Mon, 21 Aug 2017 13:27:27 +0100
Subject: [PATCH] REPO-2804 Change dependency management

---
 pom.xml     | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 war/pom.xml | 25 ++------------
 zip/pom.xml |  8 -----
 3 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 44a904f4dd..e9691364e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,10 +46,109 @@
         <dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>
         <dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0</dependency.alfresco-server-root.version>
+        <dependency.alfresco-messaging-repo.version>1.2.8</dependency.alfresco-messaging-repo.version>
+        <dependency.alfresco-mbeans.version>6.0</dependency.alfresco-mbeans.version>
 
         <dependency.spring.version>3.2.17.RELEASE</dependency.spring.version>
         <dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
         <dependency.mysql.version>5.1.40</dependency.mysql.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-core</artifactId>
+                <version>${dependency.alfresco-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-core</artifactId>
+                <version>${dependency.alfresco-core.version}</version>
+                <classifier>tests</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-data-model</artifactId>
+                <version>${dependency.alfresco-data-model.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-jlan-embed</artifactId>
+                <version>${dependency.alfresco-jlan.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-mbeans</artifactId>
+                <version>${dependency.alfresco-mbeans.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-remote-api</artifactId>
+                <version>${dependency.alfresco-remote-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-remote-api</artifactId>
+                <version>${dependency.alfresco-remote-api.version}</version>
+                <classifier>tests</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-repository</artifactId>
+                <version>${dependency.alfresco-repository.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-repository</artifactId>
+                <version>${dependency.alfresco-repository.version}</version>
+                <classifier>tests</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-trashcan-cleaner</artifactId>
+                <version>${dependency.alfresco-trashcan-cleaner.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.2-alfresco</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.services</groupId>
+                <artifactId>alfresco-messaging-repo</artifactId>
+                <version>${dependency.alfresco-messaging-repo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-mmt</artifactId>
+                <version>${dependency.alfresco-mmt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-pdf-renderer</artifactId>
+                <version>${dependency.alfresco-pdf-renderer.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-pdf-renderer</artifactId>
+                <version>${dependency.alfresco-pdf-renderer.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-pdf-renderer</artifactId>
+                <version>${dependency.alfresco-pdf-renderer.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-server-root</artifactId>
+                <version>${dependency.alfresco-server-root.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
diff --git a/war/pom.xml b/war/pom.xml
index c573785d0e..aec846ab83 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -20,30 +20,20 @@
         <scm-revision>${buildNumber}</scm-revision>
 
         <licenseName>community</licenseName>
-
-        <dir.root>${project.build.directory}/alf_data</dir.root>
-
-        <dependency.spring.version>3.2.17.RELEASE</dependency.spring.version>
-        <dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
-        <dependency.mysql.version>5.1.40</dependency.mysql.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-trashcan-cleaner</artifactId>
-            <version>${dependency.alfresco-trashcan-cleaner.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
-            <version>${dependency.alfresco-remote-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
-            <version>${dependency.alfresco-repository.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
@@ -59,7 +49,6 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.2-alfresco</version>
         </dependency>
         <dependency>
             <groupId>commons-jxpath</groupId>
@@ -128,11 +117,10 @@
             <scope>provided</scope>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.alfresco.services</groupId>
             <artifactId>alfresco-messaging-repo</artifactId>
-            <version>1.2.8</version>
-        </dependency> 
+        </dependency>
 
         <!-- CORS Filter Libraries -->
         <dependency>
@@ -145,21 +133,18 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
-            <version>${dependency.alfresco-core.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
-            <version>${dependency.alfresco-repository.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
-            <version>${dependency.alfresco-remote-api.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
@@ -193,12 +178,6 @@
             <version>${dependency.mysql.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.192</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/zip/pom.xml b/zip/pom.xml
index 74878bb69d..d8bd2c21b7 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -24,19 +24,16 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-mmt</artifactId>
-            <version>${dependency.alfresco-mmt.version}</version>
         </dependency>
 
         <!-- JAR files, to extract alfresco/extension -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
-            <version>${dependency.alfresco-repository.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
-            <version>${dependency.alfresco-data-model.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
@@ -56,14 +53,12 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-pdf-renderer</artifactId>
-            <version>${dependency.alfresco-pdf-renderer.version}</version>
             <classifier>linux</classifier>
             <type>tgz</type>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-pdf-renderer</artifactId>
-            <version>${dependency.alfresco-pdf-renderer.version}</version>
             <classifier>win64</classifier>
             <type>tgz</type>
         </dependency>
@@ -88,7 +83,6 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-repository</artifactId>
-                                    <version>${dependency.alfresco-repository.version}</version>
                                     <includes>alfresco/keystore/**</includes>
                                 </artifactItem>
                             </artifactItems>
@@ -107,7 +101,6 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-jlan-embed</artifactId>
-                                    <version>${dependency.alfresco-jlan.version}</version>
                                     <classifier>windll</classifier>
                                     <includes>*.dll</includes>
                                 </artifactItem>
@@ -127,7 +120,6 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-server-root</artifactId>
-                                    <version>${dependency.alfresco-server-root.version}</version>
                                     <type>war</type>
                                     <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
                                     <destFileName>ROOT.war</destFileName>