Merge pull request #9229 from jbosstm/WFLY-7241

WFLY-7241 Upgrade Narayana to 5.3.5.Final
wildfly · Sep 30, 2016 · e4bfd3a · e4bfd3a
2 parents 71de14e + 1f87f9c
commit e4bfd3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -162,9 +162,9 @@
         <version.org.jboss.iiop-client>1.0.0.Final</version.org.jboss.iiop-client>
         <version.org.jboss.ironjacamar>1.3.4.Final</version.org.jboss.ironjacamar>
         <version.org.jboss.jandex>2.0.3.Final</version.org.jboss.jandex>
-        <version.org.jboss.jboss-transaction-spi>7.3.3.Final</version.org.jboss.jboss-transaction-spi>
+        <version.org.jboss.jboss-transaction-spi>7.5.0.Final</version.org.jboss.jboss-transaction-spi>
         <version.org.jboss.metadata>10.0.0.Final</version.org.jboss.metadata>
-        <version.org.jboss.narayana>5.3.4.Final</version.org.jboss.narayana>
+        <version.org.jboss.narayana>5.3.5.Final</version.org.jboss.narayana>
         <version.org.jboss.mod_cluster>1.3.3.Final</version.org.jboss.mod_cluster>
         <version.org.jboss.openjdk-orb>8.0.6.Final</version.org.jboss.openjdk-orb>
         <version.org.jboss.xnio.netty.netty-xnio-transport>0.1.1.Final</version.org.jboss.xnio.netty.netty-xnio-transport>

diff --git a/.../java/org/jboss/as/test/xts/annotation/compensationScoped/CompensationScopedTestCase.java b/.../java/org/jboss/as/test/xts/annotation/compensationScoped/CompensationScopedTestCase.java
@@ -24,8 +24,8 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.as.test.xts.util.DeploymentHelper;
-import org.jboss.narayana.compensations.impl.BAController;
-import org.jboss.narayana.compensations.impl.BAControllerFactory;
+import org.jboss.narayana.compensations.internal.BAController;
+import org.jboss.narayana.compensations.internal.BAControllerFactory;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.After;
 import org.junit.Assert;

diff --git a/transactions/src/main/java/org/jboss/as/txn/service/ArjunaRecoveryManagerService.java b/transactions/src/main/java/org/jboss/as/txn/service/ArjunaRecoveryManagerService.java
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.arjuna.ats.internal.jta.recovery.jts.JCAServerTransactionRecoveryModule;
 import org.jboss.as.network.ManagedBinding;
 import org.jboss.as.network.SocketBinding;
 import org.jboss.as.network.SocketBindingManager;
@@ -130,6 +131,7 @@ public synchronized void start(StartContext context) throws StartException {
 
             recoveryExtensions.add(TopLevelTransactionRecoveryModule.class.getName());
             recoveryExtensions.add(ServerTransactionRecoveryModule.class.getName());
+            recoveryExtensions.add(JCAServerTransactionRecoveryModule.class.getName());
             recoveryExtensions.add(com.arjuna.ats.internal.jta.recovery.jts.XARecoveryModule.class.getName());
             expiryScanners.add(ExpiredContactScanner.class.getName());
             expiryScanners.add(ExpiredToplevelScanner.class.getName());