From e636a87b14fec560b4f1097ab78b87fc724b9eec Mon Sep 17 00:00:00 2001
From: Abdul Mohammed <abdul.mohammed@alfresco.com>
Date: Thu, 28 Nov 2019 13:01:10 +0000
Subject: [PATCH] REPO-4774: classpath collision commons-logging (#677)

* Exclude spring-jcl sub module that is being brought in by spring-core to avoid classpath confict

* Bump alfresco-core to 7.23 and alfresco-data-model to 8.56 to Exclude spring-jcl sub-module

* Exclude spring-jcl from spring-orm to extra guard classpath collission of commons-logging module
---
 pom.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3c386af347..114e0d9326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
         <maven.build.sourceVersion>11</maven.build.sourceVersion>
 
-        <dependency.alfresco-data-model.version>8.55</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.56</dependency.alfresco-data-model.version>
         <dependency.alfresco-core.version>7.23</dependency.alfresco-core.version>
 
         <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>
@@ -275,11 +275,27 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>${dependency.spring.version}</version>
+            <!-- exclude spring-jcl which is brought in by spring-core -->
+            <!-- see https://issues.alfresco.com/jira/browse/REPO-4774 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
             <version>${dependency.spring.version}</version>
+            <!-- exclude spring-jcl which is brought in by spring-orm -->
+            <!-- see https://issues.alfresco.com/jira/browse/REPO-4774 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>