(syncope) branch master updated: qualifying domainTransactionManager as primary bean in persistence context (#1147)

[andreapatricelli]

This is an automated email from the ASF dual-hosted git repository.

andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new b6111db46c qualifying domainTransactionManager as primary bean in 
persistence context (#1147)
b6111db46c is described below

commit b6111db46c96d09f395085d782056e8d5722333c
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);
     }