From ba323979ff627bedd1f4917946fe72b1699fc612 Mon Sep 17 00:00:00 2001
From: Maciej Pichura <41297682+mpichura@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:13:40 +0200
Subject: [PATCH] Revert "Bump dependency.spring.version from 6.0.19 to 6.1.13
 (#2909)" (#2919)

This reverts commit b4c18c9902f0fb1357b822cb294e5f32eb89d2b0.
---
 pom.xml                                                         | 2 +-
 .../main/resources/alfresco/web-scripts-application-context.xml | 2 +-
 .../src/main/java/org/alfresco/repo/lock/LockServiceImpl.java   | 2 +-
 scripts/ci/docker-compose/docker-compose.yaml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f022686f1..5bcefe51ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
 
         <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
-        <dependency.spring.version>6.1.13</dependency.spring.version>
+        <dependency.spring.version>6.0.19</dependency.spring.version>
         <dependency.spring-security.version>6.3.1</dependency.spring-security.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.17.2</dependency.jackson.version>
diff --git a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
index c220f74010..f255f96162 100644
--- a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
+++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
@@ -250,7 +250,7 @@
       <property name="delegate" ref="webscript.content.streamer" />
       <property name="contentService" ref="contentService" />
       <property name="repository" ref="repositoryHelper" />
-      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}'.split(','))}" />
+      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}')}" />
    </bean>
    
    <!--  Content Info -->
diff --git a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
index 41b670c545..df0d2ea0b9 100644
--- a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService,
         }
         
         // Never return a null LockState
-        Assert.notNull(lockState, "The lockState should not be null");
+        Assert.notNull(lockState);
         return lockState;
     }
 
diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml
index 29604ba4bc..bf96f0d391 100644
--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -68,4 +68,4 @@ services:
     volumes:
       - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
     ports:
-      - 8999:8080
+      - 8999:8080
\ No newline at end of file