From 5e206666f0ed18e2db40dadba03524d9f2a35bc7 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Wed, 23 Nov 2016 10:57:14 +0000
Subject: [PATCH] HHH-11439 Switch from Geronimo JTA to Narayana JTA

---
 .../quickstart/tutorials/osgi/managed-jpa/features.xml        | 2 +-
 .../quickstart/tutorials/osgi/unmanaged-jpa/features.xml      | 2 +-
 .../quickstart/tutorials/osgi/unmanaged-native/features.xml   | 2 +-
 hibernate-osgi/hibernate-osgi.gradle                          | 4 ++--
 libraries.gradle                                              | 4 +---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml
index f64fd8995e..c712d512f4 100644
--- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml
+++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml
@@ -17,7 +17,7 @@
       aries.transaction.howl.maxBlocksPerFile = 512
       aries.transaction.howl.bufferSizeKBytes = 4
     </config>
-    <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle dependency="true" start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
     <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/1.0.0</bundle>
     <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
 
diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
index cb3def9af0..3252004918 100644
--- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
+++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
@@ -9,7 +9,7 @@
   <feature name="hibernate-test">
 
     <!-- JTA -->
-    <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
 
     <!-- JPA -->
     <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml
index 2bc3a68202..3adcef2c30 100644
--- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml
+++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml
@@ -11,7 +11,7 @@
     <!--<feature>karaf-framework</feature>-->
 
     <!-- JTA -->
-    <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
 
     <!-- JPA -->
     <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index e2e79ee014..6e3bcf2525 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -178,8 +178,8 @@ karafFeatures {
 			}
 			bundle {
 				match {
-					group = 'org.apache.geronimo.specs'
-					module = 'geronimo-jta_1.1_spec'
+					group = 'org.jboss.spec.javax.transaction'
+					module = 'jboss-transaction-api_1.2_spec'
 				}
 				dependency = true
 			}
diff --git a/libraries.gradle b/libraries.gradle
index 1a6bc40cd1..1e86cca98d 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -54,9 +54,7 @@ ext {
 
             // javax
             jpa:            'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final',
-            // There is a bug in the OSGi information in the JBoss one.  See https://issues.jboss.org/browse/JBEE-160
-            //jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final',
-            jta:            'org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1',
+            jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final',
             validation:     'javax.validation:validation-api:1.1.0.Final',
             jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',