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:17 UTC
[sling-org-apache-sling-testing-paxexam] 37/48: update SlingOptions
and SlingVersionResolver (repoinit)
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 352c46c85b981f7c01bb64ade03fb192521ad756
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jul 30 11:48:38 2016 +0000
update SlingOptions and SlingVersionResolver (repoinit)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754619 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 7 +++++++
.../org/apache/sling/testing/paxexam/SlingVersionResolver.java | 5 +++--
2 files changed, 10 insertions(+), 2 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 60fe2c3..87ada63 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -446,12 +446,18 @@ public class SlingOptions {
sling(),
slingServlets(),
slingInstaller(),
+ slingJcrRepoinit(),
slingExtensionAdapter(),
slingExtensionBundleresource(),
slingExtensionDiscoveryOak(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.prefs").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.memoryusage").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.packageadmin").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.karaf-repoinit").version(versionResolver),
+ newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
+ .put("model.section.name", "")
+ .put("text.url", "classpath://org.apache.sling.karaf-repoinit/repoinit.txt")
+ .asOption(),
newConfiguration("org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge")
.put("resource.change.types", "[\"ADDED\", \"CHANGED\", \"REMOVED\"]")
.put("resource.paths", "/")
@@ -825,6 +831,7 @@ public class SlingOptions {
return composite(
slingJcrOak(),
slingLaunchpadOak(),
+ paxUrlClasspath(), // for reading repoinit from bundle
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
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 1b9cf33..32ceec4 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -155,11 +155,12 @@ 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.0.1-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.0.0");
+ versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.0.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.resource", "2.8.0");
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.4");
versions.put("org.apache.sling:org.apache.sling.jmx.provider", "1.0.2");
+ versions.put("org.apache.sling:org.apache.sling.karaf-repoinit", "0.1.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.8");
versions.put("org.apache.sling:org.apache.sling.models.api", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.models.impl", "1.2.8");
@@ -169,7 +170,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.nosql.mongodb-resourceprovider", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.4.4");
versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
- versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.0.2");
+ versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.0.3-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.0");
versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.4.16");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.