svn commit: r1764091 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[bdelacretaz]

Author: bdelacretaz
Date: Mon Oct 10 13:34:46 2016
New Revision: 1764091

URL: http://svn.apache.org/viewvc?rev=1764091&view=rev
Log:
SLING-6124 - use latest JCR snapshots to test oak-server, in preparation for 
SLING-5135

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=1764091&r1=1764090&r2=1764091&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Oct 10 13:34:46 2016
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.base</artifactId>
-      <version>2.4.0</version>
+      <version>2.4.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -266,6 +266,27 @@
       <version>${org.ops4j.pax.exam.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- temporary SNAPSHOTs for OakServerTestSupport -->
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.jcr.resource</artifactId>
+      <version>2.8.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.resourceresolver</artifactId>
+      <version>1.4.19-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.api</artifactId>
+      <version>2.14.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

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=1764091&r1=1764090&r2=1764091&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 Oct 10 13:34:46 2016
@@ -153,6 +153,10 @@ public abstract class OakServerTestSuppo
     }
 
     protected Option launchpad() {
+        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 slingHome = String.format("%s/sling", workingDirectory());
@@ -183,5 +187,4 @@ public abstract class OakServerTestSuppo
                 .asOption()
         );
     }
-
 }