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 2017/08/23 22:30:59 UTC
svn commit: r1805968 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main:
java/org/apache/sling/testing/paxexam/ resources/templates/
Author: olli
Date: Wed Aug 23 22:30:58 2017
New Revision: 1805968
URL: http://svn.apache.org/viewvc?rev=1805968&view=rev
Log:
SLING-7080 Update options and versions to latest features
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/package-info.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1805968&r1=1805967&r2=1805968&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java Wed Aug 23 22:30:58 2017
@@ -22,6 +22,7 @@ import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
@@ -82,7 +83,6 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver),
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver),
http()
);
}
@@ -121,18 +121,17 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourceresolver").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.serviceusermapper").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.settings").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.johnzon").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.mime").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
- mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
mavenBundle().groupId("commons-codec").artifactId("commons-codec").version(versionResolver),
mavenBundle().groupId("commons-collections").artifactId("commons-collections").version(versionResolver),
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver),
+ mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver),
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:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"})
.asOption()
@@ -142,7 +141,8 @@ public class SlingOptions {
public static Option slingAuthForm() {
return composite(
sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.form").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.form").version(versionResolver),
+ mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver)
);
}
@@ -238,6 +238,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.base").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.commons").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.support").version(versionResolver),
+ mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver)
);
@@ -315,7 +316,12 @@ public class SlingOptions {
public static Option slingExtensionFsresource() {
return composite(
sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.fsresource").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.fsresource").version(versionResolver),
+ mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver),
+ mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver)
);
}
@@ -324,6 +330,7 @@ public class SlingOptions {
sling(),
slingJcr(),
slingScripting(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.api").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").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)
@@ -356,19 +363,31 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionModelsJacksonexporter() {
+ return composite(
+ slingExtensionModels(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.jacksonexporter").version(versionResolver),
+ mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version(versionResolver),
+ mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version(versionResolver),
+ mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionPipes() {
return composite(
sling(),
jackrabbitSling(),
slingExtensionQuery(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version(versionResolver)
);
}
public static Option slingExtensionQuery() {
return composite(
sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.query").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.query").version(versionResolver),
+ mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver)
);
}
@@ -426,6 +445,20 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionValidation() {
+ return composite(
+ sling(),
+ slingExtensionI18n(),
+ slingServlets(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.core").version(versionResolver),
+ factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+ .put("user.mapping", new String[]{"org.apache.sling.validation.core=sling-validation"})
+ .asOption()
+ );
+ }
+
+ // DO NOT REMOVE additional system packages
public static Option slingExtensionXss() {
return composite(
sling(),
@@ -433,7 +466,13 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.xss=sling-xss"})
- .asOption()
+ .asOption(),
+ systemPackages(
+ "org.w3c.dom.css",
+ "org.w3c.dom.html",
+ "org.w3c.dom.ranges",
+ "org.w3c.dom.traversal"
+ )
);
}
@@ -712,7 +751,9 @@ public class SlingOptions {
public static Option slingScriptingJavascript() {
return composite(
slingScripting(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.javascript").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.javascript").version(versionResolver),
+ mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.rhino").version(versionResolver)
);
}
@@ -769,12 +810,12 @@ public class SlingOptions {
public static Option slingServlets() {
return composite(
sling(),
- slingJcr(),
+ slingExtensionXss(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.get").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.post").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver").version(versionResolver),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
- .put("user.mapping", new String[]{"org.apache.sling.servlets.resolver:scripts=sling-scripting"})
+ .put("user.mapping", new String[]{"org.apache.sling.servlets.resolver:console=sling-readall", "org.apache.sling.servlets.resolver:scripts=sling-scripting"})
.asOption()
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1805968&r1=1805967&r2=1805968&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java Wed Aug 23 22:30:58 2017
@@ -34,11 +34,11 @@ public class SlingVersionResolver implem
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.1-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.1-SNAPSHOT");
- versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
+ versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.16");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
- versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
+ versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.4");
versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
@@ -48,32 +48,38 @@ public class SlingVersionResolver implem
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2");
- versions.put("org.apache.felix:org.apache.felix.scr", "2.0.8");
- versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.0");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.12");
+ versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.4");
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.swissbox:pax-swissbox-property", "1.8.3");
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
- versions.put("org.slf4j:log4j-over-slf4j", "1.7.24");
- versions.put("com.composum.sling.core:composum-sling-core-commons", "1.7.0");
- versions.put("com.composum.sling.core:composum-sling-core-console", "1.7.0");
- versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.7.0");
- versions.put("com.composum.sling.core:composum-sling-package-manager", "1.7.0");
- versions.put("com.composum.sling.core:composum-sling-user-management", "1.7.0");
+ versions.put("org.slf4j:log4j-over-slf4j", "1.7.25");
+ versions.put("com.composum.sling.core:composum-sling-core-commons", "1.8.2");
+ versions.put("com.composum.sling.core:composum-sling-core-console", "1.8.2");
+ versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.8.2");
+ versions.put("com.composum.sling.core:composum-sling-package-manager", "1.8.2");
+ versions.put("com.composum.sling.core:composum-sling-user-management", "1.8.2");
+ versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.0");
+ versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.0");
+ versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.0");
versions.put("com.google.guava:guava", "15.0");
- versions.put("com.h2database:h2-mvstore", "1.4.193");
+ versions.put("com.h2database:h2-mvstore", "1.4.196");
+ versions.put("com.sun.mail:javax.mail", "1.6.0");
versions.put("commons-codec:commons-codec", "1.10");
versions.put("commons-collections:commons-collections", "3.2.2");
- versions.put("commons-fileupload:commons-fileupload", "1.3.2");
+ versions.put("commons-fileupload:commons-fileupload", "1.3.3");
versions.put("commons-io:commons-io", "2.5");
versions.put("commons-lang:commons-lang", "2.6");
- versions.put("io.dropwizard.metrics:metrics-core", "3.2.0");
+ versions.put("io.dropwizard.metrics:metrics-core", "3.2.4");
versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.0.14-0000");
versions.put("javax.jcr:jcr", "2.0");
+ versions.put("javax.mail:javax.mail-api", "1.6.0");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
versions.put("org.apache.commons:commons-collections4", "4.1");
- versions.put("org.apache.commons:commons-lang3", "3.5");
+ versions.put("org.apache.commons:commons-email", "1.5");
+ versions.put("org.apache.commons:commons-lang3", "3.6");
versions.put("org.apache.commons:commons-math", "2.2");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
versions.put("org.apache.felix:org.apache.felix.jaas", "1.0.2");
@@ -81,7 +87,6 @@ public class SlingVersionResolver implem
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.4");
versions.put("org.apache.geronimo.bundles:commons-httpclient", "3.1_2");
- versions.put("org.apache.geronimo.bundles:json", "20090211_1");
versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.0");
versions.put("org.apache.geronimo.specs:geronimo-el_2.2_spec", "1.0.4");
versions.put("org.apache.geronimo.specs:geronimo-interceptor_1.1_spec", "1.0");
@@ -89,26 +94,26 @@ public class SlingVersionResolver implem
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec", "1.1.1");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.3");
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");
- versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.14.0");
- 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.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.jackrabbit:jackrabbit-api", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-data", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.14.2");
+ versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.14.2");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.6.4");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.6.4");
+ versions.put("org.apache.jackrabbit:oak-core", "1.6.4");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.6.4");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.6.4");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.4");
+ versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.40");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.2_1");
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");
- versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.8");
+ versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.10");
versions.put("org.apache.sling:org.apache.sling.api", "2.16.2");
- versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.24");
+ versions.put("org.apache.sling:org.apache.sling.auth.core", "1.4.0");
versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.auth.openid", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.auth.selector", "1.0.6");
@@ -117,105 +122,110 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.0");
versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
- versions.put("org.apache.sling:org.apache.sling.commons.json", "2.0.18");
- versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.0");
+ versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.0");
+ versions.put("org.apache.sling:org.apache.sling.commons.json", "2.0.20");
+ versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.1.10");
versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
- versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.5.2");
+ versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.6.2");
versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.6");
versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4");
- versions.put("org.apache.sling:org.apache.sling.discovery.base", "1.1.6");
- versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.18");
- versions.put("org.apache.sling:org.apache.sling.discovery.impl", "1.2.10");
- versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.16");
+ versions.put("org.apache.sling:org.apache.sling.discovery.base", "2.0.4");
+ versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.20");
+ versions.put("org.apache.sling:org.apache.sling.discovery.impl", "1.2.12");
+ versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.20");
versions.put("org.apache.sling:org.apache.sling.discovery.standalone", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.discovery.support", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.distribution.api", "0.3.0");
- versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.6");
- versions.put("org.apache.sling:org.apache.sling.engine", "2.6.6");
- versions.put("org.apache.sling:org.apache.sling.event", "4.2.2");
+ versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.8");
+ versions.put("org.apache.sling:org.apache.sling.engine", "2.6.8");
+ versions.put("org.apache.sling:org.apache.sling.event", "4.2.6");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.2");
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.2.2");
- versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.6");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.6");
+ versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.8");
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.8");
versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.6");
+ versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.10");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.installer.hc", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.installer.provider.file", "1.1.0");
- versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.24");
+ versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.26");
versions.put("org.apache.sling:org.apache.sling.jcr.api", "2.4.0");
- versions.put("org.apache.sling:org.apache.sling.jcr.base", "3.0.0");
+ versions.put("org.apache.sling:org.apache.sling.jcr.base", "3.0.4");
versions.put("org.apache.sling:org.apache.sling.jcr.classloader", "3.2.2");
versions.put("org.apache.sling:org.apache.sling.jcr.compiler", "2.1.0");
- versions.put("org.apache.sling:org.apache.sling.jcr.contentloader", "2.1.10");
+ versions.put("org.apache.sling:org.apache.sling.jcr.contentloader", "2.2.4");
versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.8");
- versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager", "2.1.2");
- 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.5-SNAPSHOT");
+ 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.registration", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.4");
- versions.put("org.apache.sling:org.apache.sling.jcr.resource", "2.9.2");
+ versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.4");
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");
versions.put("org.apache.sling:org.apache.sling.jmx.provider", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.karaf-repoinit", "0.2.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.3.2");
- versions.put("org.apache.sling:org.apache.sling.models.impl", "1.3.8");
+ versions.put("org.apache.sling:org.apache.sling.karaf-repoinit", "0.2.0");
+ versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.12");
+ versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.4");
+ versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.2");
+ versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-client", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-resourceprovider", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.nosql.generic", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.nosql.mongodb-resourceprovider", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.pipes", "0.0.10");
- versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.0");
+ versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
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.6");
- versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.3-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.20");
- 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.resource.inventory", "1.0.8");
+ versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.2");
+ versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.4");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.30");
+ versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.2");
+ versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.2.0");
versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.46");
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.3.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "3.0.0");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.0");
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.32");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.8");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.8");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.20");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.36");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.10");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.10");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.22");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.6");
- versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.1-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.security", "1.1.2");
- versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.2.4");
- versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.22");
- versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.14");
- versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.10");
+ versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.0");
+ versions.put("org.apache.sling:org.apache.sling.security", "1.1.6");
+ versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.3.4");
+ versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.26");
+ versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.22");
+ versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.12");
versions.put("org.apache.sling:org.apache.sling.settings", "1.3.8");
versions.put("org.apache.sling:org.apache.sling.urlrewriter", "0.0.2");
- versions.put("org.apache.sling:org.apache.sling.xss", "1.0.18");
+ versions.put("org.apache.sling:org.apache.sling.validation.api", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.validation.core", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.xss", "2.0.0");
versions.put("org.apache.tika:tika-bundle", "1.14");
versions.put("org.apache.tika:tika-core", "1.14");
- versions.put("org.attoparser:attoparser", "2.0.3.RELEASE");
- versions.put("org.codehaus.groovy:groovy", "2.4.9");
- versions.put("org.codehaus.groovy:groovy-json", "2.4.9");
- versions.put("org.codehaus.groovy:groovy-templates", "2.4.9");
+ versions.put("org.attoparser:attoparser", "2.0.4.RELEASE");
+ versions.put("org.codehaus.groovy:groovy", "2.4.12");
+ versions.put("org.codehaus.groovy:groovy-json", "2.4.12");
+ versions.put("org.codehaus.groovy:groovy-templates", "2.4.12");
versions.put("org.javassist:javassist", "3.21.0-GA");
- versions.put("org.mongodb:mongo-java-driver", "3.4.2");
+ versions.put("org.mongodb:mongo-java-driver", "3.5.0");
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.swissbox:pax-swissbox-property", "1.8.3");
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
- versions.put("org.unbescape:unbescape", "1.1.4.RELEASE");
+ versions.put("org.unbescape:unbescape", "1.1.5.RELEASE");
}
private String key(final String groupId, final String artifactId) {
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/package-info.java?rev=1805968&r1=1805967&r2=1805968&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/package-info.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/package-info.java Wed Aug 23 22:30:58 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.0")
+@Version("1.1.0")
package org.apache.sling.testing.paxexam;
import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1805968&r1=1805967&r2=1805968&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt Wed Aug 23 22:30:58 2017
@@ -82,7 +82,6 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver),
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver),
http()
);
}
@@ -132,8 +131,7 @@ public class SlingOptions {
.asOption(),
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
.put("localIndexDir", localIndexDir)
- .asOption(),
- mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver) // OAK-5921
+ .asOption()
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt?rev=1805968&r1=1805967&r2=1805968&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt Wed Aug 23 22:30:58 2017
@@ -34,11 +34,11 @@ public class SlingVersionResolver implem
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.1-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.1-SNAPSHOT");
- versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
+ versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.16");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
- versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
+ versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.4");
versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
@@ -48,14 +48,14 @@ public class SlingVersionResolver implem
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2");
- versions.put("org.apache.felix:org.apache.felix.scr", "2.0.8");
- versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.0");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.12");
+ versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.4");
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.swissbox:pax-swissbox-property", "1.8.3");
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
- versions.put("org.slf4j:log4j-over-slf4j", "1.7.24");[# th:each="bundle : ${bundles}"]
+ versions.put("org.slf4j:log4j-over-slf4j", "1.7.25");[# th:each="bundle : ${bundles}"]
versions.put("[(${bundle.groupId})]:[(${bundle.artifactId})]", "[(${bundle.version})]");
[/] }