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:04:01 UTC
svn commit: r1693905 - in /aries/trunk/jpa/itests/jpa-container-itest:
pom.xml src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
Author: cschneider
Date: Mon Aug 3 14:04:01 2015
New Revision: 1693905
URL: http://svn.apache.org/r1693905
Log:
Upgrade to transaction.manager 1.3.0-SNAPSHOT
Modified:
aries/trunk/jpa/itests/jpa-container-itest/pom.xml
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1693905&r1=1693904&r2=1693905&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Mon Aug 3 14:04:01 2015
@@ -293,10 +293,37 @@
<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>
- <version>1.1.1</version>
+ <version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java?rev=1693905&r1=1693904&r2=1693905&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java Mon Aug 3 14:04:01 2015
@@ -33,7 +33,6 @@ import javax.transaction.UserTransaction
import org.junit.Before;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -284,12 +283,12 @@ public abstract class AbstractJPAItest {
}
protected 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")
+ return composite(
+ 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()
);
}