aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject svn commit: r1793985 - in /aries/trunk/transaction: transaction-blueprint/ transaction-itests/ transaction-itests/src/test/java/org/apache/aries/transaction/itests/ transaction-jdbc/ transaction-jms/ transaction-manager/
Date Fri, 05 May 2017 08:54:28 GMT
Author: ggrzybek
Date: Fri May  5 08:54:28 2017
New Revision: 1793985

URL: http://svn.apache.org/viewvc?rev=1793985&view=rev
Log:
[tests] Fix transaction-itests by using aries-util-1.1.3 (which exports internal package)

Modified:
    aries/trunk/transaction/transaction-blueprint/pom.xml
    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-jdbc/pom.xml
    aries/trunk/transaction/transaction-jms/pom.xml
    aries/trunk/transaction/transaction-manager/pom.xml

Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1793985&r1=1793984&r2=1793985&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri May  5 08:54:28 2017
@@ -51,6 +51,16 @@
         <lastReleaseVersion>1.1.0</lastReleaseVersion>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1793985&r1=1793984&r2=1793985&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Fri May  5 08:54:28 2017
@@ -44,6 +44,16 @@
         <url.version>1.6.0</url.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.osgi</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=1793985&r1=1793984&r2=1793985&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
Fri May  5 08:54:28 2017
@@ -42,6 +42,7 @@ import org.ops4j.pax.exam.Configuration;
 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.extra.CleanCachesOption;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
@@ -69,6 +70,7 @@ public abstract class AbstractIntegratio
         }
         return composite(
                 junitBundles(),
+                new CleanCachesOption(true), // change to 'false' if investigation is needed
                 // this is how you set the default log level when using pax
                 // logging (logProfile)
                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),

Modified: aries/trunk/transaction/transaction-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/pom.xml?rev=1793985&r1=1793984&r2=1793985&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/pom.xml (original)
+++ aries/trunk/transaction/transaction-jdbc/pom.xml Fri May  5 08:54:28 2017
@@ -69,6 +69,16 @@
         <additionalparam>-Xdoclint:none</additionalparam>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
@@ -78,7 +88,6 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/transaction/transaction-jms/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/pom.xml?rev=1793985&r1=1793984&r2=1793985&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/pom.xml (original)
+++ aries/trunk/transaction/transaction-jms/pom.xml Fri May  5 08:54:28 2017
@@ -62,6 +62,16 @@
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1793985&r1=1793984&r2=1793985&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri May  5 08:54:28 2017
@@ -70,15 +70,24 @@
         </aries.osgi.include.resource>
         <lastReleaseVersion>1.3.0</lastReleaseVersion>
         <aries.skip.version.check>false</aries.skip.version.check>
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+        <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>provided</scope>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>



Mime
View raw message