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.acs-event-model.version>1.0.2</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.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.spring-security.version>6.3.4</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>
<dependency.cxf.version>4.0.5</dependency.cxf.version> <dependency.cxf.version>4.0.5</dependency.cxf.version>
<dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.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.bouncycastle.version>1.79</dependency.bouncycastle.version>
<dependency.mockito-core.version>5.14.1</dependency.mockito-core.version> <dependency.mockito-core.version>5.14.1</dependency.mockito-core.version>
<dependency.assertj.version>3.26.3</dependency.assertj.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( final TransactionAttribute txnAttr = getTransactionAttributeSource().getTransactionAttribute(
method, invocation.getThis().getClass()); method, invocation.getThis().getClass());
final TransactionManager tm = determineTransactionManager(txnAttr); final TransactionManager tm = determineTransactionManager(txnAttr, null);
if (tm != null && !(tm instanceof PlatformTransactionManager)) if (tm != null && !(tm instanceof PlatformTransactionManager))
{ {

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

@@ -37,7 +37,7 @@
<!-- Support for permissions --> <!-- 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"> <property name="proxyInterfaces">
<value>org.alfresco.repo.security.permissions.PermissionServiceSPI</value> <value>org.alfresco.repo.security.permissions.PermissionServiceSPI</value>
</property> </property>