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:45 UTC
[sling-org-apache-sling-testing-paxexam] 16/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 ed1d1a8c84fbcd2a56d2c2a0a778cf0d45947f97
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 24 10:23:09 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@1780053 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 6 +++---
.../testing/paxexam/SlingVersionResolver.java | 25 +++++++++++++---------
2 files changed, 18 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 3389f6b..6c8ba7a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -134,7 +134,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.commons").artifactId("commons-math").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
- .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:read=sling-readall"})
+ .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"})
.asOption()
);
}
@@ -324,7 +324,6 @@ public class SlingOptions {
slingJcr(),
slingScripting(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
);
@@ -553,7 +552,7 @@ public class SlingOptions {
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),
newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
- .put("references", new String[]{"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt"})
+ .put("references", new String[]{"raw:classpath://org.apache.sling.karaf-repoinit/sling.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-discovery.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-event.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-i18n.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-installer-jcr.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-scripting.txt", "raw:classpath://org.apache.sling [...]
.asOption(),
factoryConfiguration("org.apache.felix.jaas.Configuration.factory")
.put("jaas.classname", "org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule")
@@ -817,6 +816,7 @@ public class SlingOptions {
return composite(
slingLaunchpadOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").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(),
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 4a558a3..882b17c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -85,6 +85,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec", "1.1.1");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.2");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
+ versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.6");
versions.put("org.apache.jackrabbit:jackrabbit-api", "2.14.0");
versions.put("org.apache.jackrabbit:jackrabbit-data", "2.14.0");
versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.14.0");
@@ -92,12 +93,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.5.17");
- versions.put("org.apache.jackrabbit:oak-commons", "1.5.17");
- versions.put("org.apache.jackrabbit:oak-core", "1.5.17");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.5.17");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.5.17");
- versions.put("org.apache.jackrabbit:oak-segment", "1.5.17");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-core", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-segment", "1.5.18");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.30");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.1_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter", "4.0.4_1");
@@ -133,9 +134,8 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.extensions.explorer", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.0");
- versions.put("org.apache.sling:org.apache.sling.fsresource", "1.1.4");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
- versions.put("org.apache.sling:org.apache.sling.hc.jmx", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.hc.support", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.hc.webconsole", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.6");
@@ -172,14 +172,14 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.1.0");
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.5.8");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.0");
versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.1.12");
versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.44");
versions.put("org.apache.sling:org.apache.sling.scripting.groovy", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.scripting.java", "2.1.2");
versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "2.0.30");
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.2");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.4");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp.taglib", "2.2.6");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.28");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4");
@@ -202,6 +202,11 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.codehaus.groovy:groovy-templates", "2.4.7");
versions.put("org.javassist:javassist", "3.20.0-GA");
versions.put("org.mongodb:mongo-java-driver", "3.4.1");
+ versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
+ versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
+ versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.2");
+ versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.