You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/08/03 16:03:54 UTC
svn commit: r1693904 - in /aries/trunk/transaction:
transaction-itests/pom.xml
transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
transaction-manager/pom.xml
Author: cschneider
Date: Mon Aug 3 14:03:53 2015
New Revision: 1693904
URL: http://svn.apache.org/r1693904
Log:
[ARIES-1364] Remove transaction API from transaction.manager to avoid cascading refreshs
Modified:
aries/trunk/transaction/transaction-itests/pom.xml
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
aries/trunk/transaction/transaction-manager/pom.xml
Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1693904&r1=1693903&r2=1693904&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Mon Aug 3 14:03:53 2015
@@ -68,11 +68,39 @@
<version>1.0.0</version>
<scope>test</scope>
</dependency>
+
+ <!-- JTA 1.2 -->
+ <dependency>
+ <groupId>javax.interceptor</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
+ <version>1_2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
<scope>test</scope>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1693904&r1=1693903&r2=1693904&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original)
+++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Mon Aug 3 14:03:53 2015
@@ -107,11 +107,11 @@ public abstract class AbstractIntegratio
private Option jta12Bundles() {
return CoreOptions.composite(
- mavenBundle("javax.interceptor", "javax.interceptor-api", "1.2"),
- mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax-inject", "1_2"),
- mavenBundle("javax.el", "javax.el-api", "3.0.0"),
- mavenBundle("javax.enterprise", "cdi-api", "1.2"),
- mavenBundle("javax.transaction", "javax.transaction-api", "1.2")
+ mavenBundle("javax.interceptor", "javax.interceptor-api").versionAsInProject(),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax-inject").versionAsInProject(),
+ mavenBundle("javax.el", "javax.el-api").versionAsInProject(),
+ mavenBundle("javax.enterprise", "cdi-api").versionAsInProject(),
+ mavenBundle("javax.transaction", "javax.transaction-api").versionAsInProject()
);
}
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1693904&r1=1693903&r2=1693904&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Mon Aug 3 14:03:53 2015
@@ -31,7 +31,7 @@
<artifactId>org.apache.aries.transaction.manager</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Transaction Manager</name>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager</connection>
@@ -43,8 +43,7 @@
<aries.osgi.export>
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"
+ org.apache.aries.transaction;version="1.0"
</aries.osgi.export>
<aries.osgi.import>
org.springframework.*;resolution:=optional;version="[2.5,5)",
@@ -52,7 +51,6 @@
javax.resource.spi;resolution:=optional,
org.osgi.framework,
org.osgi.service.cm,
- javax.transaction*,
*
</aries.osgi.import>
<aries.osgi.private.pkg>
@@ -70,6 +68,7 @@
javax/resource/spi/XATerminator.class=target/classes/javax/resource/spi/XATerminator.class
</aries.osgi.include.resource>
<lastReleaseVersion>1.1.0</lastReleaseVersion>
+ <aries.skip.version.check>true</aries.skip.version.check>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
</properties>