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

[ACS-9045] Bump Spring Framework to 6.2.0 (#3083)

Browse Source 
* [ACS-9045] Bump Spring Framework to 6.2.0

* [ACS-9045] Bump Surf Webscripts to 10.0

* [ACS-9045] Force bean initiation order

* [ACS-9045] Use not Deprecated determineTransactionManager method

Co-authored-by: Damian Ujma <damian.ujma@hyland.com>
This commit is contained in:
Kacper Magdziarz
2025-01-13 13:12:04 +01:00
committed by GitHub
parent 85648077e6
commit c7e79193b0
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -57,13 +57,13 @@
<dependency.acs-event-model.version>1.0.2</dependency.acs-event-model.version>
<dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
<dependency.spring.version>6.1.14</dependency.spring.version>
<dependency.spring.version>6.2.1</dependency.spring.version>
<dependency.spring-security.version>6.3.4</dependency.spring-security.version>
<dependency.antlr.version>3.5.3</dependency.antlr.version>
<dependency.jackson.version>2.17.2</dependency.jackson.version>
<dependency.cxf.version>4.0.5</dependency.cxf.version>
<dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
<dependency.webscripts.version>9.4</dependency.webscripts.version>
<dependency.webscripts.version>10.0</dependency.webscripts.version>
<dependency.bouncycastle.version>1.79</dependency.bouncycastle.version>
<dependency.mockito-core.version>5.14.1</dependency.mockito-core.version>
<dependency.assertj.version>3.26.3</dependency.assertj.version>

2
repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
View File

@@ -64,7 +64,7 @@ public class RetryingTransactionInterceptor extends TransactionAspectSupport imp
final TransactionAttribute txnAttr = getTransactionAttributeSource().getTransactionAttribute(
method, invocation.getThis().getClass());
final TransactionManager tm = determineTransactionManager(txnAttr);
final TransactionManager tm = determineTransactionManager(txnAttr, null);
if (tm != null && !(tm instanceof PlatformTransactionManager))
{

56
repository/src/main/resources/alfresco/public-services-security-context.xml
View File

@@ -32,12 +32,12 @@
<ref bean="dictionaryService" />
</property>
</bean>
<!-- ======================= -->
<!-- Support for permissions -->
<!-- ========================-->
<bean id='permissionService' class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<bean id="permissionService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" depends-on="transactionManager, permissionServiceImpl">
<property name="proxyInterfaces">
<value>org.alfresco.repo.security.permissions.PermissionServiceSPI</value>
</property>
@@ -57,7 +57,7 @@
<!--
<bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.noop.PermissionServiceNOOPImpl" />
-->
<bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.impl.PermissionServiceImpl" init-method="init">
<property name="nodeService">
<ref bean="mtAwareNodeService"/>
@@ -112,7 +112,7 @@
</property>
<property name="policyIgnoreUtil" ref="policyIgnoreUtil"/>
</bean>
<bean id="fixedAclUpdater" class="org.alfresco.repo.domain.permissions.FixedAclUpdater" init-method="init">
<property name="jobLockService" ref="jobLockService"/>
<property name="transactionService" ref="transactionService"/>
@@ -127,7 +127,7 @@
<property name="policyComponent" ref="policyComponent"/>
<property name="policyIgnoreUtil" ref="policyIgnoreUtil"/>
</bean>
<!-- =================== -->
<!-- Dynamic Authorities -->
<!-- =================== -->
@@ -172,9 +172,9 @@
<!-- =========================== -->
<!-- Permissions Model Bootstrap -->
<!-- =========================== -->
<bean id="permissionModelBootstrap" class="org.alfresco.repo.security.permissions.impl.model.PermissionModelBootstrap" abstract="true" init-method="init">
<property name="permissionModel" ref="permissionsModelDAO"/>
<property name="permissionModel" ref="permissionsModelDAO"/>
</bean>
<!-- ====== -->
@@ -284,7 +284,7 @@
<value>${security.postProcessDenies}</value>
</property>
</bean>
<bean id="afterAclMarking" class="org.alfresco.repo.security.permissions.impl.acegi.MarkingAfterInvocationProvider" />
<!-- Link up after method call security -->
@@ -492,7 +492,7 @@
</value>
</property>
</bean>
<bean id="FileFolderService_security_list" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
<property name="methodSecurityInterceptor" ref="FileFolderService_security" />
<property name="service" value="org.alfresco.service.cmr.model.FileFolderService" />
@@ -576,7 +576,7 @@
<!-- Category queries are filtered for nodes that are visible to the current user -->
<!-- Other methods are unrestricted at the moment -->
<!-- Uses the public node service for all mutations - access is allowed here and enforced by the public node service -->
<bean id="CategoryService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
@@ -1005,11 +1005,11 @@
</value>
</property>
</bean>
<!-- ============ -->
<!-- Blog Service -->
<!-- ============ -->
<bean id="BlogService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -1023,12 +1023,12 @@
</value>
</property>
</bean>
<!-- ============ -->
<!-- Site Service -->
<!-- ============ -->
<bean id="SiteService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -1072,13 +1072,13 @@
</value>
</property>
</bean>
<bean id="SiteService_security_listSites" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
<property name="methodSecurityInterceptor" ref="SiteService_security" />
<property name="service" value="org.alfresco.service.cmr.site.SiteService" />
<property name="methodName" value="listSites" />
</bean>
<!-- ==================== -->
<!-- The Calendar Service -->
@@ -1132,7 +1132,7 @@
<property name="service" value="org.alfresco.service.cmr.download.DownloadService" />
<property name="methodName" value="deleteDownloads" />
</bean>
<!-- ==================== -->
<!-- The Links Service -->
<!-- ==================== -->
@@ -1140,7 +1140,7 @@
<!-- The links service itself does not require any security restrictions, -->
<!-- they are imposed by the node and site services it uses to do its work. -->
<bean id="LinksService_security" class="org.alfresco.repo.security.permissions.impl.AlwaysProceedMethodInterceptor" />
<!-- The canned queries that the links service uses do however need to check -->
<bean id="LinksService_CannedQuery_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
@@ -1166,7 +1166,7 @@
<!-- The discussion service itself does not require any security restrictions, -->
<!-- they are imposed by the node and site services it uses to do its work. -->
<bean id="DiscussionService_security" class="org.alfresco.repo.security.permissions.impl.AlwaysProceedMethodInterceptor" />
<!-- The canned queries that the discussion services use do however need to check -->
<bean id="DiscussionService_CannedQuery_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
@@ -1198,9 +1198,9 @@
<!-- ======================== -->
<!-- Repository Admin Service -->
<!-- ======================== -->
<!-- TODO: Add repository admin security -->
<bean id="RepoAdminService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -1217,10 +1217,10 @@
<!-- ===================== -->
<!-- Content Usage Service -->
<!-- ===================== -->
<!-- TODO: Add content usage security -->
<bean id="ContentUsageService_security" class="org.alfresco.repo.security.permissions.impl.AlwaysProceedMethodInterceptor" />
<bean id="PublicServiceAccessService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager">
<ref bean="authenticationManager"/>
@@ -1236,14 +1236,14 @@
</value>
</property>
</bean>
<!-- ==================== -->
<!-- The Archived Nodes service -->
<!-- ==================== -->
<!-- This service currently has no restrictions. -->
<bean id="ArchivedNodes_security" class="org.alfresco.repo.security.permissions.impl.AlwaysProceedMethodInterceptor" />
<bean id="ArchivedNodes_security_listArchivedNodes" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">

2
repository/src/test/resources/log4j2.properties
View File

@@ -463,4 +463,4 @@ logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.name=org.alfresco.repo.t
logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.level=debug
logger.alfresco-repo-rendition2-RenditionService2Impl.name=org.alfresco.repo.rendition2.RenditionService2Impl
logger.alfresco-repo-rendition2-RenditionService2Impl.level=debug
logger.alfresco-repo-rendition2-RenditionService2Impl.level=debug