You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/03/09 19:27:53 UTC
svn commit: r1786226 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main:
java/org/apache/sling/testing/paxexam/SlingOptions.java
java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
resources/templates/SlingOptions.txt
Author: olli
Date: Thu Mar 9 19:27:53 2017
New Revision: 1786226
URL: http://svn.apache.org/viewvc?rev=1786226&view=rev
Log:
SLING-6464 Update options and versions to latest features
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1786226&r1=1786225&r2=1786226&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java Thu Mar 9 19:27:53 2017
@@ -641,9 +641,9 @@ public class SlingOptions {
public static Option slingLaunchpadOakTar() {
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("name", "Default NodeStore")
.put("repository.home", "sling/repository")
.asOption()
@@ -861,12 +861,12 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
.asOption(),
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1786226&r1=1786225&r2=1786226&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java Thu Mar 9 19:27:53 2017
@@ -95,12 +95,12 @@ public class SlingVersionResolver implem
versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.14.0");
versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.14.0");
versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.14.0");
- versions.put("org.apache.jackrabbit:oak-blob", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-commons", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-core", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-segment", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-core", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.1");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.30");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.1_1");
@@ -158,7 +158,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", "2.2.4");
versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.1.3-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.registration", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.2");
+ versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.3-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.resource", "2.9.2");
versions.put("org.apache.sling:org.apache.sling.jcr.webconsole", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.8");
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1786226&r1=1786225&r2=1786226&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt Thu Mar 9 19:27:53 2017
@@ -122,12 +122,12 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
.asOption(),