From 32f01f913e7e5e6cb7fd1cdc6dc945213ea74f60 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Tue, 29 Oct 2024 13:29:02 +0100
Subject: [PATCH] [DSC-2001] Fixes dependency convergence for ehcache and
 jaxb-runtime

---
 dspace-api/pom.xml           | 14 ++++++++++++++
 dspace-iiif/pom.xml          |  6 ++++++
 dspace-oai/pom.xml           |  4 ++++
 dspace-server-webapp/pom.xml |  6 ++++++
 4 files changed, 30 insertions(+)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index ee31a039f4a..6b3c6fba9b8 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -360,6 +360,12 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <version>${ehcache.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache
              Caching dependencies for sherpa service. -->
@@ -621,6 +627,12 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers-standard-package</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -721,10 +733,12 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
         </dependency>
 
         <!-- Jersey / JAX-RS client (javax.ws.rs.*) dependencies needed to integrate with external sources/services -->
diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml
index a160e3e46f1..cc3c4e0e169 100644
--- a/dspace-iiif/pom.xml
+++ b/dspace-iiif/pom.xml
@@ -86,6 +86,12 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <version>${ehcache.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index 604fc1dc90f..12412897ec2 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -55,6 +55,10 @@
             <artifactId>xoai</artifactId>
             <version>${xoai.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.hamcrest</groupId>
                     <artifactId>hamcrest-all</artifactId>
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 3ab678a71f7..442f323cc04 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -686,6 +686,12 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <version>${ehcache.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- TEST DEPENDENCIES -->