sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1615549 - in /sling/trunk/bundles/jcr/it-jackrabbit-oak: pom.xml src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Date Mon, 04 Aug 2014 13:12:23 GMT
Author: rombert
Date: Mon Aug  4 13:12:23 2014
New Revision: 1615549

URL: http://svn.apache.org/r1615549
Log:
SLING-3813 - Pax-Exam tests fail when executed under Java 8

Update jcr/it-jackrabbit-oak to use more recent versions of pax-exam,
pax-link and felix.framework.

Also removed com.google.code.findbugs:jsr305 from the bundle list, as it
is not a valid bundle and pax-exam now fails the test in such cases.

Also switched to the pax-exam-container-forked, to prevent classpath
conflicts.

Modified:
    sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1615549&r1=1615548&r2=1615549&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon Aug  4 13:12:23 2014
@@ -23,8 +23,8 @@
     <inceptionYear>2013</inceptionYear>
 
     <properties>
-        <exam.version>3.3.0</exam.version>
-        <url.version>1.5.2</url.version>
+        <exam.version>3.5.0</exam.version>
+        <url.version>2.1.0</url.version>
         <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
         <org.ops4j.pax.url.mvn.settings></org.ops4j.pax.url.mvn.settings>
         <oak.version>1.0.0</oak.version>
@@ -200,7 +200,7 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-native</artifactId>
+            <artifactId>pax-exam-container-forked</artifactId>
             <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
@@ -225,7 +225,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>3.2.2</version>
+            <version>4.4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -234,5 +234,11 @@
             <version>2.7.1</version>
             <scope>test</scope>
         </dependency>
-     </dependencies>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1615549&r1=1615548&r2=1615549&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Mon Aug  4 13:12:23 2014
@@ -102,7 +102,6 @@ public class OakRepositoryIT extends Com
                 // Oak
                 mavenBundle("org.apache.sling", "org.apache.sling.jcr.oak.server", slingOakServerVersion),
                 mavenBundle("com.google.guava", "guava", "15.0"),
-                mavenBundle("com.google.code.findbugs", "jsr305", "2.0.0"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-api", "2.7.5"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons", "2.7.5"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi", "2.4.2"),



Mime
View raw message