Author: cschneider
Date: Fri Aug 14 09:32:06 2015
New Revision: 1695853
URL: http://svn.apache.org/r1695853
Log:
Make sure only one version of jta is installed
Modified:
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EclipseAdditionalTest.java
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerEclipseLinkTest.java
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerOpenJPATest.java
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/src/test/java/org/apache/aries/jpa/container/itest/EclipseAdditionalTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EclipseAdditionalTest.java?rev=1695853&r1=1695852&r2=1695853&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EclipseAdditionalTest.java
(original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EclipseAdditionalTest.java
Fri Aug 14 09:32:06 2015
@@ -59,6 +59,7 @@ public class EclipseAdditionalTest exten
return new Option[] {//
baseOptions(),//
ariesJpa21(),//
+ jta12Bundles(), //
eclipseLink(),//
derbyDSF(), //
testBundleEclipseLink().noStart(),//
Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerEclipseLinkTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerEclipseLinkTest.java?rev=1695853&r1=1695852&r2=1695853&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerEclipseLinkTest.java
(original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerEclipseLinkTest.java
Fri Aug 14 09:32:06 2015
@@ -32,6 +32,7 @@ public class JPAContainerEclipseLinkTest
return new Option[] {
baseOptions(), //
ariesJpa21(), //
+ jta12Bundles(), //
eclipseLink(), //
derbyDSF(), //
testBundle()
Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java?rev=1695853&r1=1695852&r2=1695853&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
(original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
Fri Aug 14 09:32:06 2015
@@ -26,6 +26,7 @@ public class JPAContainerHibernateTest e
baseOptions(), //
ariesJpa20(), //
derbyDSF(), //
+ jta12Bundles(), //
hibernate(), //
testBundle(), //
};
Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerOpenJPATest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerOpenJPATest.java?rev=1695853&r1=1695852&r2=1695853&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerOpenJPATest.java
(original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerOpenJPATest.java
Fri Aug 14 09:32:06 2015
@@ -38,6 +38,7 @@ public class JPAContainerOpenJPATest ext
return new Option[] {
baseOptions(), //
ariesJpa20(), //
+ jta11Bundles(), // Openjpa currently does not work with jta 1.2. See https://issues.apache.org/jira/browse/OPENJPA-2607
openJpa(), //
derbyDSF(), //
testBundle()
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=1695853&r1=1695852&r2=1695853&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
Fri Aug 14 09:32:06 2015
@@ -203,7 +203,6 @@ public abstract class AbstractJPAItest {
mvnBundle("org.apache.aries.jpa", "org.apache.aries.jpa.support"),
mvnBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint"),
- mvnBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mvnBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager"),
mvnBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint"),
@@ -282,13 +281,19 @@ public abstract class AbstractJPAItest {
);
}
+ protected Option jta11Bundles() {
+ return composite(
+ mvnBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")
+ );
+ }
+
protected Option jta12Bundles() {
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()
+ mvnBundle("javax.interceptor", "javax.interceptor-api"),
+ mvnBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax-inject"),
+ mvnBundle("javax.el", "javax.el-api"),
+ mvnBundle("javax.enterprise", "cdi-api"),
+ mvnBundle("javax.transaction", "javax.transaction-api")
);
}
|