This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_0_X by this push: new a39709e764 qualifying domainTransactionManager as primary bean in persistence context (#1147) a39709e764 is described below commit a39709e764705aed5f0e392b3725a547851789ee Author: Andrea Patricelli <andreapatrice...@apache.org> AuthorDate: Tue Jul 29 13:48:56 2025 +0200 qualifying domainTransactionManager as primary bean in persistence context (#1147) --- .../org/apache/syncope/core/persistence/jpa/PersistenceContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java index 9eee3cbcd5..4d31d9e4f0 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java @@ -198,6 +198,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Primary; import org.springframework.core.env.Environment; import org.springframework.core.io.ResourceLoader; import org.springframework.data.jpa.repository.support.JpaRepositoryFactory; @@ -269,7 +270,8 @@ public class PersistenceContext { } @ConditionalOnMissingBean - @Bean + @Bean(name = "domainTransactionManager") + @Primary public PlatformTransactionManager domainTransactionManager(final EntityManagerFactory entityManagerFactory) { return new JpaTransactionManager(entityManagerFactory); }