inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bump dependency.spring.version from 6.0.19 to 6.1.13 (#2909)" (#2919)

Browse Source 
This reverts commit b4c18c9902.
This commit is contained in:
Maciej Pichura
2024-09-18 09:13:40 +02:00
committed by GitHub
parent b1cf324289
commit ba323979ff
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.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>

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="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 -->

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
Assert.notNull(lockState, "The lockState should not be null");
Assert.notNull(lockState);
return lockState;
}