inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Spring from 6.0.19 to 6.1.13

Browse Source
This commit is contained in:
Krystian Dąbrowski
2024-09-19 10:18:04 +02:00
parent b7642b5813
commit c7d53eab93
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -57,7 +57,7 @@
<dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version> <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
<dependency.aspectj.version>1.9.22.1</dependency.aspectj.version> <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
<dependency.spring.version>6.0.19</dependency.spring.version> <dependency.spring.version>6.1.13</dependency.spring.version>
<dependency.spring-security.version>6.3.1</dependency.spring-security.version> <dependency.spring-security.version>6.3.1</dependency.spring-security.version>
<dependency.antlr.version>3.5.3</dependency.antlr.version> <dependency.antlr.version>3.5.3</dependency.antlr.version>
<dependency.jackson.version>2.17.2</dependency.jackson.version> <dependency.jackson.version>2.17.2</dependency.jackson.version>

2
remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
View File

@@ -250,7 +250,7 @@
<property name="delegate" ref="webscript.content.streamer" /> <property name="delegate" ref="webscript.content.streamer" />
<property name="contentService" ref="contentService" /> <property name="contentService" ref="contentService" />
<property name="repository" ref="repositoryHelper" /> <property name="repository" ref="repositoryHelper" />
<property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}')}" /> <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}'.split(','))}" />
</bean> </bean>
<!-- Content Info --> <!-- Content Info -->

2
repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
View File

@@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService,
} }
// Never return a null LockState // Never return a null LockState
Assert.notNull(lockState); Assert.notNull(lockState, "The lockState should not be null");
return lockState; return lockState;
} }

2
scripts/ci/docker-compose/docker-compose.yaml
View File

@@ -68,4 +68,4 @@ services:
volumes: volumes:
- ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
ports: ports:
- 8999:8080 - 8999:8080