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 2018/01/26 12:01:15 UTC
[sling-org-apache-sling-testing-paxexam] branch feature/oak-1.8
created (now d70d3c2)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
at d70d3c2 SLING-7438 Update options and versions to Oak 1.8
This branch includes the following new commits:
new d70d3c2 SLING-7438 Update options and versions to Oak 1.8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 01/01: SLING-7438 Update
options and versions to Oak 1.8
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit d70d3c2e73c3dec6d9c2cabeb80949ee15bb18b6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 26 12:56:48 2018 +0100
SLING-7438 Update options and versions to Oak 1.8
---
.../apache/sling/testing/paxexam/SlingOptions.java | 19 ++++++++++++-------
.../testing/paxexam/SlingVersionResolver.java | 22 +++++++++++++++-------
2 files changed, 27 insertions(+), 14 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 75279ee..320bc98 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -718,7 +718,6 @@ public class SlingOptions {
public static Option slingQuickstartOakTar() {
return composite(
slingQuickstartOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").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.index.lucene.LuceneIndexProviderService")
@@ -735,6 +734,7 @@ public class SlingOptions {
return composite(
slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-document").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
@@ -890,10 +890,18 @@ public class SlingOptions {
scr(),
jackrabbit(),
tika(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-core").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-api").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob-plugins").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-core").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-core-spi").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jcr").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-query-spi").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-security-spi").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-composite").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-spi").version(versionResolver),
+ mavenBundle().groupId("io.dropwizard.metrics").artifactId("metrics-core").version(versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(versionResolver)
);
@@ -943,7 +951,6 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingQuickstartOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").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")
@@ -952,9 +959,6 @@ public class SlingOptions {
newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
- .asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
- .put("localIndexDir", localIndexDir)
.asOption()
);
}
@@ -965,6 +969,7 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingQuickstartOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-document").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
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 1facd1e..3490eb0 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -106,12 +106,20 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.16.0");
versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.16.0");
versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.16.0");
- versions.put("org.apache.jackrabbit:oak-blob", "1.6.7");
- versions.put("org.apache.jackrabbit:oak-commons", "1.6.7");
- versions.put("org.apache.jackrabbit:oak-core", "1.6.7");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.6.7");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.6.7");
- versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-api", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-blob-plugins", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-core", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-core-spi", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-query-spi", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-security-spi", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-store-composite", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-store-document", "1.8.1");
+ versions.put("org.apache.jackrabbit:oak-store-spi", "1.8.1");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.42");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.4_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.2_1");
@@ -167,7 +175,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.10");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager", "3.0.0");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", "2.2.6");
- versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.1.4");
+ versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.2.0-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.registration", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.6");
versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.8");
--
To stop receiving notification emails like this one, please contact
olli@apache.org.