HSEARCH-1308 Upgrade from JBoss Transactions 4.16.4 to Narayana 4.17.4

hibernate · Apr 23, 2013 · 29a168b · 29a168b
1 parent 4fe8176
commit 29a168b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/hibernate-search-integrationtest/pom.xml b/hibernate-search-integrationtest/pom.xml
@@ -177,8 +177,8 @@
     <dependencies>
         <!-- JBoss TS -->
         <dependency>
-            <groupId>org.jboss.jbossts</groupId>
-            <artifactId>jbossjta</artifactId>
+            <groupId>org.jboss.jbossts.jta</groupId>
+            <artifactId>narayana-jta</artifactId>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -151,7 +151,7 @@
         <bytemanVersion>2.1.0</bytemanVersion>
         <jbossLoggingVersion>3.1.0.GA</jbossLoggingVersion>
         <jbossLoggingProcessorVersion>1.0.3.Final</jbossLoggingProcessorVersion>
-        <jbossJTAVersion>4.16.4.Final</jbossJTAVersion>
+        <narayanaVersion>4.17.4.Final</narayanaVersion>
         <avroVersion>1.6.3</avroVersion>
         <jacksonAslVersion>1.9.2</jacksonAslVersion>
         <commonsIoVersion>1.4</commonsIoVersion>
@@ -374,14 +374,22 @@
                 <version>${bytemanVersion}</version>
             </dependency>
             <dependency>
-                <groupId>org.jboss.jbossts</groupId>
-                <artifactId>jbossjta</artifactId>
-                <version>${jbossJTAVersion}</version>
+                <groupId>org.jboss.jbossts.jta</groupId>
+                <artifactId>narayana-jta</artifactId>
+                <version>${narayanaVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jboss.ws.native</groupId>
                         <artifactId>jbossws-native-core</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.byteman</groupId>
+                        <artifactId>byteman</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.byteman</groupId>
+                        <artifactId>byteman-submit</artifactId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>emma</artifactId>
                         <groupId>emma</groupId>
@@ -394,9 +402,17 @@
                         <artifactId>hornetq-core</artifactId>
                         <groupId>org.hornetq</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>hornetq-journal</artifactId>
+                        <groupId>org.hornetq</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>hornetq-commons</artifactId>
+                        <groupId>org.hornetq</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>netty</artifactId>
-                        <groupId>org.jboss.netty</groupId>
+                        <groupId>io.netty</groupId>
                     </exclusion>
                     <exclusion>
                         <artifactId>wrapper</artifactId>
@@ -446,6 +462,14 @@
                         <groupId>org.jboss.logging</groupId>
                         <artifactId>jboss-logging-generator</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.logmanager</groupId>
+                        <artifactId>jboss-logmanager</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jfree</groupId>
+                        <artifactId>jcommon</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>