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 2014/06/02 10:13:38 UTC
svn commit: r1599113 - in /aries/trunk/transaction/transaction-itests:
pom.xml
src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
Author: gnodet
Date: Mon Jun 2 08:13:37 2014
New Revision: 1599113
URL: http://svn.apache.org/r1599113
Log:
Fix transactions integration tests
Modified:
aries/trunk/transaction/transaction-itests/pom.xml
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1599113&r1=1599112&r2=1599113&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Mon Jun 2 08:13:37 2014
@@ -52,15 +52,15 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
@@ -109,6 +109,16 @@
<scope>test</scope>
<version>4.0</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- pax exam -->
<dependency>
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=1599113&r1=1599112&r2=1599113&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 Jun 2 08:13:37 2014
@@ -61,16 +61,20 @@ public abstract class AbstractIntegratio
systemProperty("org.apache.aries.proxy.weaving.enabled").value("none"),
// Bundles
- mavenBundle("org.osgi", "org.osgi.compendium"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mavenBundle("org.apache.derby", "derby"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager"),
- mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint"),
- mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.jdbc"),
- mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.testbundle"),
- mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.testds"),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.jdbc").versionAsInProject(),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.testbundle").versionAsInProject(),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.testds").versionAsInProject(),
//new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
//new TimeoutOption( 0 ),