You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2015/04/27 14:16:34 UTC
svn commit: r1676246 - in /aries/trunk/transaction/transaction-manager: ./ src/main/java/org/apache/aries/transaction/internal/ src/test/java/org/apache/aries/transaction/internal/

Author: gnodet
Date: Mon Apr 27 12:16:34 2015
New Revision: 1676246

URL: http://svn.apache.org/r1676246
Log:
[ARIES-1313] Upgrade to geronimo transaction manager 3.1.2

Removed:
    aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java
Modified:
    aries/trunk/transaction/transaction-manager/pom.xml
    aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
    aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1676246&r1=1676245&r2=1676246&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Mon Apr 27 12:16:34 2015
@@ -31,7 +31,7 @@
     <artifactId>org.apache.aries.transaction.manager</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Transaction Manager</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager</connection>
@@ -41,8 +41,8 @@
     </scm>
     <properties>
         <aries.osgi.export>
-            org.apache.geronimo.transaction.manager;version="3.0";provide:=true,
-            org.apache.geronimo.transaction*;version="3.0",
+            org.apache.geronimo.transaction.manager;version="3.1";provide:=true,
+            org.apache.geronimo.transaction*;version="3.1",
             org.apache.aries.transaction;version="1.0",
             javax.transaction*;version="1.1.0"
         </aries.osgi.export>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java?rev=1676246&r1=1676245&r2=1676246&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java (original)
+++ aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java Mon Apr 27 12:16:34 2015
@@ -29,6 +29,7 @@ import javax.transaction.xa.XAException;
 
 import org.apache.aries.transaction.AriesTransactionManager;
 import org.apache.aries.util.AriesFrameworkUtil;
+import org.apache.geronimo.transaction.log.HOWLLog;
 import org.apache.geronimo.transaction.log.UnrecoverableLog;
 import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
 import org.apache.geronimo.transaction.manager.TransactionLog;

Modified: aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java?rev=1676246&r1=1676245&r2=1676246&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java (original)
+++ aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java Mon Apr 27 12:16:34 2015
@@ -25,8 +25,7 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.aries.transaction.internal.HOWLLog;
-import org.apache.aries.transaction.internal.XidFactoryImpl;
+import org.apache.geronimo.transaction.log.HOWLLog;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.NamedXAResourceFactory;