From 1b03b6dcf3fc862f11981b3ba15773b202b9d116 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Sun, 4 Jan 2015 17:19:08 +0100
Subject: [PATCH] DATAJPA-653 - Workaround in tests for regression in Spring
 4.1.3.

Spring 4.1.3 introduces a regression in the way transaction managers are detected if multiple ones are available. This can be worked around my marking the default transaction manager as primary which is what we do for our tests now.

Related issue: SPR-12577.
---
 .../resources/multiple-entity-manager-integration-context.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/multiple-entity-manager-integration-context.xml b/src/test/resources/multiple-entity-manager-integration-context.xml
index f2d7b5d37..0bafb31bd 100644
--- a/src/test/resources/multiple-entity-manager-integration-context.xml
+++ b/src/test/resources/multiple-entity-manager-integration-context.xml
@@ -31,7 +31,7 @@
 		</property>
 	</bean>
 
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager" primary="true">
 		<property name="entityManagerFactory" ref="entityManagerFactory" />
 	</bean>