Author: gnodet
Date: Wed May 15 15:08:35 2013
New Revision: 1482889
URL: http://svn.apache.org/r1482889
Log:
Update transaction integration tests to test the latest transaction-manager and
transaction-jdbc bundles.
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=1482889&r1=1482888&r2=1482889&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Wed May 15 15:08:35 2013
@@ -102,19 +102,19 @@
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.wrappers</artifactId>
+ <artifactId>org.apache.aries.transaction.jdbc</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>2.0.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=1482889&r1=1482888&r2=1482889&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
Wed May 15 15:08:35 2013
@@ -20,6 +20,7 @@ package org.apache.aries.transaction.ite
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
@@ -46,18 +47,18 @@ public abstract class AbstractIntegratio
// this is how you set the default log level when using pax
// logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
systemProperty("org.apache.aries.proxy.weaving.enabled").value("none"),
// Bundles
mavenBundle("org.osgi", "org.osgi.compendium"),
- mavenBundle("org.ow2.asm", "asm-all"),
+ //mavenBundle("org.ow2.asm", "asm-all"),
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("asm", "asm-all"),
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.wrappers"),
+ 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"),
