You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:20:55 UTC
[sling-org-apache-sling-testing-paxexam] 26/39: SLING-6464 Update
options and versions to latest features
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 1bf93a2cc4269f2357ff20035f8b3612c4fdfe36
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 9 19:27:53 2017 +0000
SLING-6464 Update options and versions to latest features
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786226 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/testing/paxexam/SlingOptions.java | 8 ++++----
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 14 +++++++-------
src/main/resources/templates/SlingOptions.txt | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 023e642..21482d7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -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(),
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index 4ac27c2..b83ac18 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -95,12 +95,12 @@ public class SlingVersionResolver implements VersionResolver {
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 implements VersionResolver {
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");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 288890a..5e08f65 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -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(),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.