You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2016/11/14 15:57:25 UTC
svn commit: r1769656 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Author: jsedding
Date: Mon Nov 14 15:57:25 2016
New Revision: 1769656

URL: http://svn.apache.org/viewvc?rev=1769656&view=rev
Log:
revert temporary changes of r1769647

Modified:
    sling/trunk/bundles/jcr/oak-server/pom.xml
    sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1769656&r1=1769655&r2=1769656&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 14 15:57:25 2016
@@ -189,7 +189,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.paxexam</artifactId>
-      <version>0.0.2</version>
+      <version>0.0.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- OSGi -->
@@ -271,7 +271,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.resource</artifactId>
-      <version>2.8.2</version>
+      <version>2.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1769656&r1=1769655&r2=1769656&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java (original)
+++ sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java Mon Nov 14 15:57:25 2016
@@ -161,10 +161,10 @@ public abstract class OakServerTestSuppo
     }
 
     protected Option launchpad() {
-        SlingOptions.versionResolver.setVersion("org.apache.sling", "org.apache.sling.jcr.base", "2.4.2");
-        SlingOptions.versionResolver.setVersion("org.apache.sling", "org.apache.sling.jcr.resource", "2.8.2");
-        SlingOptions.versionResolver.setVersion("org.apache.sling", "org.apache.sling.resourceresolver", "1.5.2");
-        SlingOptions.versionResolver.setVersion("org.apache.sling", "org.apache.sling.api", "2.15.0");
+        SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.jcr.base");
+        SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.jcr.resource");
+        SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.resourceresolver");
+        SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
         SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
         SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
         final String repoinit = String.format("raw:file:%s/src/test/resources/repoinit.txt", PathUtils.getBaseDir());