Merge branch '1.4.x' into 1.5.x

kinow · Sep 29, 2016 · b4d052a · b4d052a
2 parents 26c9d5a + 33ea739
commit b4d052a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java b/...java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
@@ -23,6 +23,7 @@
 import javax.transaction.UserTransaction;
 
 import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
+import org.jboss.tm.XAResourceRecoveryRegistry;
 
 import org.springframework.boot.ApplicationHome;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -50,7 +51,7 @@
  */
 @Configuration
 @ConditionalOnClass({ JtaTransactionManager.class,
-		com.arjuna.ats.jta.UserTransaction.class })
+		com.arjuna.ats.jta.UserTransaction.class, XAResourceRecoveryRegistry.class })
 @ConditionalOnMissingBean(PlatformTransactionManager.class)
 public class NarayanaJtaConfiguration {