diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java
index abb8c9c6d..824f141d0 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Search Services E2E Test
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -324,13 +324,13 @@ public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringCont
     {
         SearchResponse response = query(searchRequest);
 
-        if (restClient.getStatusCode().matches(HttpStatus.OK.toString()))
+        if (restClient.getStatusCode().matches(String.valueOf(HttpStatus.OK.value())))
         {
             return isContentInSearchResponse(response, contentName);
         }
         else
         {
-            throw new RuntimeException("API returned status code:" + restClient.getStatusCode() + " Expected: " + HttpStatus.OK + "; Response body: " + response);
+            throw new RuntimeException("API returned status code:" + restClient.getStatusCode() + " Expected: " + HttpStatus.OK.value() + "; Response body: " + response);
         }
     }
 
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
index 3c831fa7e..d0ed79329 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Search Services E2E Test
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -168,8 +168,8 @@ public abstract class AbstractSearchExactTermTest extends AbstractE2EFunctionalT
     {
         queryAsUser(testUser, query);
         Assert.assertTrue(
-            restClient.getStatusCode().equals(String.valueOf(HttpStatus.NOT_IMPLEMENTED)) ||
-            restClient.getStatusCode().equals(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR)), 
+            restClient.getStatusCode().equals(String.valueOf(HttpStatus.NOT_IMPLEMENTED.value())) ||
+            restClient.getStatusCode().equals(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR.value())),
             "Status code is not as expected.");
     }
 
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java
index d688785ab..43ef61334 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Search Services E2E Test
  * %%
- * Copyright (C) 2005 - 2023 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -117,7 +117,7 @@ public abstract class AbstractSearchServicesE2ETest extends AbstractE2EFunctiona
     protected SearchResponse queryUntilResponseEntriesListNotEmpty(UserModel user, String queryString)
     {
        SearchResponse response = queryUntilStatusIsOk(user, queryString);
-       if (restClient.getStatusCode().matches(HttpStatus.OK.toString()))
+       if (restClient.getStatusCode().matches(String.valueOf(HttpStatus.OK.value())))
        {
            for (int readAttempts = 0; readAttempts < MAX_ATTEMPTS_TO_READ_RESPONSE; readAttempts++)
            {
@@ -140,7 +140,7 @@ public abstract class AbstractSearchServicesE2ETest extends AbstractE2EFunctiona
             try
             {
                 SearchResponse response = queryAsUser(user, queryString);
-                if (restClient.getStatusCode().matches(HttpStatus.OK.toString()))
+                if (restClient.getStatusCode().matches(String.valueOf(HttpStatus.OK.value())))
                 {
                     return response;
                 }
diff --git a/pom.xml b/pom.xml
index 36eaa314e..f58801382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
       <license.update.copyright>false</license.update.copyright>
 
       <dependency.alfresco.xml-factory.version>1.3</dependency.alfresco.xml-factory.version>
-      <dependency.alfresco-data-model.version>17.190</dependency.alfresco-data-model.version>
+      <dependency.alfresco-data-model.version>18.20</dependency.alfresco-data-model.version>
 
       <dependency.jackson.version>2.15.2</dependency.jackson.version>
 
@@ -89,9 +89,17 @@
       <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>
    </properties>
    <dependencyManagement>
       <dependencies>
+         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-framework-bom</artifactId>
+            <version>${dependency.spring.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
          <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 655f1d7b8..1021c989a 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -62,14 +62,14 @@ jackson-core-2.15.2.jar https://github.com/FasterXML/jackson
 jackson-annotations-2.15.2.jar https://github.com/FasterXML/jackson
 jackson-databind-2.15.2.jar https://github.com/FasterXML/jackson
 commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/
-spring-aop-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-beans-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-context-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-core-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-expression-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-jdbc-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-orm-5.3.23.jar http://projects.spring.io/spring-framework/
-spring-tx-5.3.23.jar http://projects.spring.io/spring-framework/
+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-5.3.33.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/
 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/