ISPN-3824 Upgrade do JBoss Narayana 5.0.4

Sanne · Jan 19, 2015 · b79e171 · b79e171
1 parent f4de0a7
commit b79e171
Showing 1 changed file with 37 additions and 7 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -131,12 +131,13 @@
       <version.jackson>1.9.13</version.jackson>
       <version.javax.cache.cache-tests>${version.javax.cache}</version.javax.cache.cache-tests>
       <version.javax.servlet>2.5</version.javax.servlet>
-      <version.jbossjta>4.17.13.Final</version.jbossjta>
+      <version.jbossjta>5.0.4.Final</version.jbossjta>
       <version.jboss.logging.processor>1.1.0.Final</version.jboss.logging.processor>
       <version.jboss.logmanager>1.3.1.Final</version.jboss.logmanager>
       <version.jboss.remotingjmx>2.0.0.Final</version.jboss.remotingjmx>
       <version.jboss.sasl>1.0.4.Final</version.jboss.sasl>
       <version.jboss.spec>1.0.0.Final</version.jboss.spec>
+      <version.jboss.jboss-transaction-spi>7.1.0.Final</version.jboss.jboss-transaction-spi>
       <version.jboss.xnio>3.2.2.Final</version.jboss.xnio>
       <version.jcipannotations>1.0</version.jcipannotations>
       <version.jetty>6.1.25</version.jetty>
@@ -610,6 +611,29 @@
             <artifactId>solder-impl</artifactId>
             <version>${version.solder}</version>
          </dependency>
+         <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jboss-transaction-spi</artifactId>
+            <version>${version.jboss.jboss-transaction-spi}</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>org.jboss.logging</groupId>
+                  <artifactId>jboss-logging-spi</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>org.jboss.ironjacamar</groupId>
+                  <artifactId>ironjacamar-spec-api</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>org.jboss.spec.javax.resource</groupId>
+                  <artifactId>jboss-connector-api_1.5_spec</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>org.jboss.spec.javax.transaction</groupId>
+                  <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>
          <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core</artifactId>
@@ -693,7 +717,7 @@
             <version>${version.httpclient}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.jbossts.jta</groupId>
+            <groupId>org.jboss.narayana.jta</groupId>
             <artifactId>narayana-jta</artifactId>
             <version>${version.jbossjta}</version>
             <exclusions>
@@ -797,10 +821,6 @@
                   <artifactId>jboss-connector-api_1.5_spec</artifactId>
                   <groupId>org.jboss.spec.javax.resource</groupId>
                </exclusion>
-               <exclusion>
-                  <artifactId>jboss-transaction-spi</artifactId>
-                  <groupId>org.jboss.integration</groupId>
-               </exclusion>
                <exclusion>
                   <artifactId>jboss-remoting</artifactId>
                   <groupId>org.jboss.remoting</groupId>
@@ -994,7 +1014,17 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.jbossts.jta</groupId>
+         <groupId>org.jboss</groupId>
+         <artifactId>jboss-transaction-spi</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.narayana.jta</groupId>
+         <artifactId>narayana-jta</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.narayana.jta</groupId>
          <artifactId>narayana-jta</artifactId>
          <scope>test</scope>
       </dependency>