From d7fb4a47447edf5e911b33ec200200dd307cf67c Mon Sep 17 00:00:00 2001
From: Vitor Moreira <vitor.moreira-v@alfresco.com>
Date: Mon, 23 May 2022 10:33:29 +0100
Subject: [PATCH] MNT-22946: upgrade spring to 5.3.18

---
 pom.xml                                          |  2 +-
 search-services/alfresco-solrclient-lib/pom.xml  |  2 +-
 .../src/main/resources/licenses/notice.txt       | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98bf46609..bd35c902c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
       <dependency.hadoop.version>2.7.7</dependency.hadoop.version>
       <dependency.restlet.version>2.3.12</dependency.restlet.version>
       <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
-      <dependency.spring.version>5.3.7</dependency.spring.version>
+      <dependency.spring.version>5.3.18</dependency.spring.version>
       <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
       <dependency.codehaus.jackson.version>1.9.14-atlassian-6</dependency.codehaus.jackson.version>
    </properties>
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index bca0f46bf..babc21689 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <properties>
-        <dependency.alfresco-data-model.version>11.8</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>13.4</dependency.alfresco-data-model.version>
         <dependency.jackson.version>2.12.2</dependency.jackson.version>
     </properties>
 
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 77676ebd9..a63a3a639 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -61,14 +61,14 @@ jackson-annotations-2.12.2.jar https://github.com/FasterXML/jackson
 jackson-databind-2.12.2.jar https://github.com/FasterXML/jackson
 jackson-dataformat-smile-2.12.2.jar https://github.com/FasterXML/jackson
 commons-httpclient-3.1.jar      http://jakarta.apache.org/commons/
-spring-aop-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-beans-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-context-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-core-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-expression-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-jdbc-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-orm-5.3.7.jar http://projects.spring.io/spring-framework/
-spring-tx-5.3.7.jar http://projects.spring.io/spring-framework/
+spring-aop-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-beans-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-context-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-core-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-expression-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-jdbc-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-orm-5.3.18.jar http://projects.spring.io/spring-framework/
+spring-tx-5.3.18.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/