diff --git a/pom.xml b/pom.xml index 8f022686f1..5bcefe51ee 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 0.0.27 1.9.22.1 - 6.1.13 + 6.0.19 6.3.1 3.5.3 2.17.2 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 @@ - + 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