From 7903cf8557fe2fa74a5cef8155ea6c0c96d77055 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Wed, 16 Oct 2024 20:07:19 +0200
Subject: [PATCH] [DSC-1978] Updates dependecies to avoid warning and startup
 errors

---
 dspace-api/pom.xml                 | 12 ++++++++++++
 dspace-server-webapp/pom.xml       |  1 +
 dspace/modules/server-boot/pom.xml |  1 +
 dspace/modules/server/pom.xml      |  3 ++-
 pom.xml                            |  7 +------
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index ee31a039f4aa..2e89182c78e3 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -840,9 +840,21 @@
 		        	<groupId>javax.servlet</groupId>
 	      			<artifactId>servlet-api</artifactId>
 		        </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
             </exclusions>
+            <scope>compile</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
 		<dependency>
 		    <groupId>org.apache.xmlgraphics</groupId>
 		    <artifactId>fop-pdf-images</artifactId>
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 3ab678a71f7e..9337c0b6ad8a 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -692,6 +692,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
index 102d585fedca..19d502f50a2c 100644
--- a/dspace/modules/server-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index 27bcfc766575..b487617f9e85 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -289,8 +289,8 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
             <version>${spring-boot.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
@@ -314,6 +314,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 5fcaccf21abb..d7507bf6c554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
         <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
         <postgresql.driver.version>42.7.3</postgresql.driver.version>
         <solr.client.version>8.11.3</solr.client.version>
+        <xalan.version>2.7.3</xalan.version>
 
         <ehcache.version>3.10.8</ehcache.version>
         <errorprone.version>2.10.0</errorprone.version>
@@ -1423,12 +1424,6 @@
                 <version>${spring.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context-support</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>