From 9853aa5bb45ceef6ba6e01a08515f0cdea68f92c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 11 Nov 2024 16:45:59 -0600
Subject: [PATCH] Fix error in running Handle Server in GitHub Actions. Must
 exclude "spring-jcl" from dependencies as it conflicts with "commons-logging"
 (used by more of our dependencies)

---
 dspace-api/pom.xml           | 7 +++++++
 dspace-iiif/pom.xml          | 5 +++++
 dspace-oai/pom.xml           | 5 +++++
 dspace-rdf/pom.xml           | 5 +++++
 dspace-server-webapp/pom.xml | 5 +++++
 dspace-services/pom.xml      | 7 +++++++
 dspace-sword/pom.xml         | 5 +++++
 dspace-swordv2/pom.xml       | 5 +++++
 pom.xml                      | 7 +++++++
 9 files changed, 51 insertions(+)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index bdf035179b..c3ef2c8604 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -396,6 +396,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
+            <exclusions>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml
index 64dd5106f0..49ee02b565 100644
--- a/dspace-iiif/pom.xml
+++ b/dspace-iiif/pom.xml
@@ -38,6 +38,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index 28b610e996..bfa2c8a273 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -80,6 +80,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/dspace-rdf/pom.xml b/dspace-rdf/pom.xml
index e656a920a1..075f2d7038 100644
--- a/dspace-rdf/pom.xml
+++ b/dspace-rdf/pom.xml
@@ -67,6 +67,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 5a4e1b3212..35fa473fc1 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -405,6 +405,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index 51c6dea624..7c85ff7f0f 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -85,6 +85,13 @@
             <artifactId>spring-context-support</artifactId>
             <version>${spring.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml
index 1403c779e7..01aa68dfbf 100644
--- a/dspace-sword/pom.xml
+++ b/dspace-sword/pom.xml
@@ -60,6 +60,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index 4703888831..f575898c12 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -80,6 +80,11 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
+                <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 02579c0329..b0d9d1819d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1171,6 +1171,13 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-orm</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-jcl</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.swordapp</groupId>