From 44097da33a8e3a7a580ca36ff2e12befda325b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20=C5=BBurek?= <Piotr.Zurek@hyland.com>
Date: Tue, 5 Nov 2024 20:02:25 +0100
Subject: [PATCH] PRODSEC-9479 Bump Spring Dependencies (#2152)

---
 e2e-test/pom.xml                              | 11 +++++
 pom.xml                                       |  9 +---
 .../alfresco-solrclient-lib/pom.xml           | 44 +++++++++++++++++++
 .../src/main/resources/licenses/notice.txt    | 12 ++---
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index 4420104f1..30f0e838b 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -50,6 +50,17 @@
          </plugin>
       </plugins>
    </build>
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-framework-bom</artifactId>
+            <version>${dependency.spring-e2e-test.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
    <dependencies>
       <dependency>
          <groupId>org.alfresco</groupId>
diff --git a/pom.xml b/pom.xml
index 0a36e7512..8bd74947b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,8 @@
       <dependency.commons-fileupload.version>1.5</dependency.commons-fileupload.version>
       <dependency.commons-io.version>2.15.1</dependency.commons-io.version>
       <dependency.commons-codec.version>1.16.1</dependency.commons-codec.version>
-      <dependency.spring.version>5.3.33</dependency.spring.version>
-      <dependency.spring-expression.version>6.1.12</dependency.spring-expression.version>
+      <dependency.spring.version>6.1.14</dependency.spring.version>
+      <dependency.spring-e2e-test.version>5.3.39</dependency.spring-e2e-test.version>
       <dependency.zookeeper.version>3.4.14</dependency.zookeeper.version>
       <dependency.mime4j.version>0.8.11</dependency.mime4j.version>
    </properties>
@@ -103,11 +103,6 @@
             <type>pom</type>
             <scope>import</scope>
          </dependency>
-          <dependency>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-expression</artifactId>
-              <version>${dependency.spring-expression.version}</version>
-          </dependency>
          <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index c89bb5a0c..1c6653885 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -16,6 +16,10 @@
             <artifactId>alfresco-data-model</artifactId>
             <version>${dependency.alfresco-data-model.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>*</artifactId>
@@ -34,6 +38,46 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 49ac76e48..f2f205e9e 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -63,14 +63,10 @@ jackson-core-2.17.2.jar https://github.com/FasterXML/jackson
 jackson-annotations-2.17.2.jar https://github.com/FasterXML/jackson
 jackson-databind-2.17.2.jar https://github.com/FasterXML/jackson
 commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/
-spring-aop-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-beans-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-context-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-core-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-expression-6.1.12.jar http://projects.spring.io/spring-framework/
-spring-jdbc-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-orm-5.3.33.jar http://projects.spring.io/spring-framework/
-spring-tx-5.3.33.jar http://projects.spring.io/spring-framework/
+spring-beans-6.1.14.jar http://projects.spring.io/spring-framework/
+spring-context-6.1.14.jar http://projects.spring.io/spring-framework/
+spring-core-6.1.14.jar http://projects.spring.io/spring-framework/
+spring-expression-6.1.14.jar http://projects.spring.io/spring-framework/
 guessencoding-1.4.jar   http://docs.codehaus.org/display/GUESSENC/
 jug-2.0.0-asl.jar   http://jug.safehaus.org/
 acegi-security-0.8.2_patched.jar        http://sourceforge.net/projects/acegisecurity/