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 28bbfe8b1f0fadd3e559d3f572cb60658bfc3450
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Wed Feb 14 13:39:24 2018 +0100
SLING-7438 Update options and versions to Oak 1.8
* use Oak 1.8.2
* re-add oak-lucene to slingQuickstartOakTar options
* add missing oak-store-document to slingQuickstartOakMongo
---
.../apache/sling/testing/paxexam/SlingOptions.java | 7 ++++++
.../testing/paxexam/SlingVersionResolver.java | 28 +++++++++++-----------
src/main/resources/templates/SlingOptions.hbs | 2 ++
3 files changed, 23 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 5105691..a44e849 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -719,7 +719,9 @@ 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.jackrabbit").artifactId("oak-store-document").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")
.put("localIndexDir", "sling/repository/index")
@@ -951,7 +953,9 @@ 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.jackrabbit").artifactId("oak-store-document").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)
@@ -959,6 +963,9 @@ 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()
);
}
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 8992169..8ee2187 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -106,20 +106,20 @@ public class SlingVersionResolver implements
VersionResolver {
versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.16.1");
versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.16.1");
versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.16.1");
- 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:oak-api", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-blob-plugins", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-core", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-core-spi", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-query-spi", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-security-spi", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-store-composite", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-store-document", "1.8.2");
+ versions.put("org.apache.jackrabbit:oak-store-spi", "1.8.2");
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.8_1");
diff --git a/src/main/resources/templates/SlingOptions.hbs
b/src/main/resources/templates/SlingOptions.hbs
index 1188e64..6ccadcb 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -143,6 +143,7 @@ public class SlingOptions {
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.jackrabbit").artifactId("oak-store-document").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)
@@ -164,6 +165,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),
--
To stop receiving notification emails like this one, please contact
o...@apache.org.
