commit c081f92898f67c748cf1d66b9df4140c5bb63cdd
author Julian Sedding <jsedding@apache.org> Mon Nov 14 15:14:05 2016 +0000
committer Julian Sedding <jsedding@apache.org> Mon Nov 14 15:14:05 2016 +0000
tree 2a96ecad48073948e341c672ca7e0802ae3fdde7
parent d2dc37b5a40a9b96d2c7ffbd57383e65e58cf0f4

prepare oak-server for release, temporarily downgrade paxexam

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769647 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index d8e0ab0..c5c9cb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.paxexam</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+      <version>0.0.2</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.1-SNAPSHOT</version>
+      <version>2.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

diff --git a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
index 3dc19b2..27985d4 100644
--- a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
@@ -161,10 +161,10 @@
     }
 
     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.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.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());