sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-testing-paxexam] 25/39: SLING-6464 Update options and versions to latest features
Date Tue, 07 Nov 2017 10:20:54 GMT
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 8f415b9eb87587e02f68f2c5e9cc4e63898eb772
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Thu Mar 9 13:43:40 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@1786168
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/testing/paxexam/SlingOptions.java | 39 +++++++++++++-
 .../testing/paxexam/SlingVersionResolver.java      | 59 ++++++++++++----------
 2 files changed, 70 insertions(+), 28 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 654de10..023e642 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -182,6 +182,7 @@ public class SlingOptions {
             webconsole(),
             slingCommonsClassloader(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.fsclassloader").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
             mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
             mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver)
         );
@@ -381,6 +382,16 @@ public class SlingOptions {
         );
     }
 
+    public static Option slingExtensionResourcePresence() {
+        return composite(
+            sling(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resource.presence").version(versionResolver),
+            factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+                .put("user.mapping", new String[]{"org.apache.sling.resource.presence=sling-readall"})
+                .asOption()
+        );
+    }
+
     public static Option slingExtensionResourcemerger() {
         return composite(
             sling(),
@@ -417,6 +428,19 @@ public class SlingOptions {
         );
     }
 
+    public static Option slingExtensionValidation() {
+        return composite(
+            sling(),
+            slingExtensionI18n(),
+            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),
+            mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").version(versionResolver),
+            factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+                .put("user.mapping", new String[]{"org.apache.sling.validation.core=sling-validation"})
+                .asOption()
+        );
+    }
+
     public static Option slingExtensionXss() {
         return composite(
             sling(),
@@ -437,6 +461,14 @@ public class SlingOptions {
         );
     }
 
+    public static Option slingInstallerHealthcheck() {
+        return composite(
+            slingInstaller(),
+            slingExtensionHealthcheck(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.hc").version(versionResolver)
+        );
+    }
+
     public static Option slingInstallerProviderFile() {
         return composite(
             slingInstaller(),
@@ -472,7 +504,7 @@ public class SlingOptions {
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webconsole").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version(versionResolver),
             factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment")
-                .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons",
"org.apache.sling.discovery.base", "org.apache.sling.discovery.oak", "org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.i18n", "org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader",
"org.apache.sling.jcr.contentloader", "org.apache.sling.jcr.davex", "org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.oak.server", "org.apache.sling.jcr.repoinit", [...]
+                .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons",
"org.apache.sling.discovery.base", "org.apache.sling.discovery.oak", "org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader", "org.apache.sling.jcr.contentloader",
"org.apache.sling.jcr.davex", "org.apache.sling.jcr.jackrabbit.usermanager", "org.apache.sling.jcr.oak.server",
"org.apache.sling.jcr.repoinit", "org.apache.sling.jcr.re [...]
                 .put("whitelist.name", "sling")
                 .asOption(),
             factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
@@ -563,7 +595,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/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
[...]
+                .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")
@@ -731,6 +763,9 @@ public class SlingOptions {
             slingScripting(),
             slingExtensionI18n(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
+            mavenBundle().groupId("org.attoparser").artifactId("attoparser").version(versionResolver),
+            mavenBundle().groupId("org.unbescape").artifactId("unbescape").version(versionResolver),
+            mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ognl").version(versionResolver),
             mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver),
             factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
                 .put("user.mapping", new String[]{"org.apache.sling.scripting.thymeleaf=sling-scripting"})
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 93eb5e7..4ac27c2 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -36,20 +36,20 @@ public class SlingVersionResolver implements VersionResolver {
     public SlingVersionResolver() {
         versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
         versions.put("javax.el:javax.el-api", "2.2.1");
-        versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.12");
+        versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
         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.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.2");
+        versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
         versions.put("org.apache.aries:org.apache.aries.util", "1.1.3");
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.7");
         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.6");
-        versions.put("org.apache.felix:org.apache.felix.webconsole", "4.2.16");
+        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.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");
@@ -67,18 +67,18 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("commons-fileupload:commons-fileupload", "1.3.2");
         versions.put("commons-io:commons-io", "2.5");
         versions.put("commons-lang:commons-lang", "2.6");
-        versions.put("io.dropwizard.metrics:metrics-core", "3.1.2");
+        versions.put("io.dropwizard.metrics:metrics-core", "3.2.0");
         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.5.6");
         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-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");
         versions.put("org.apache.felix:org.apache.felix.prefs", "1.1.0");
         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.2");
+        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");
@@ -102,6 +102,7 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.jackrabbit:oak-lucene", "1.6.0");
         versions.put("org.apache.jackrabbit:oak-segment", "1.6.0");
         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.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");
@@ -111,9 +112,9 @@ public class SlingVersionResolver implements VersionResolver {
         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");
         versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.2.0");
-        versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.1-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.0");
         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.4");
+        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");
@@ -129,23 +130,24 @@ public class SlingVersionResolver implements VersionResolver {
         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.4");
+        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.1-SNAPSHOT");
-        versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.1-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.event", "4.2.2");
+        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.5-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.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.7-SNAPSHOT");
+        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.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.23-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.24");
         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.classloader", "3.2.2");
@@ -174,22 +176,23 @@ public class SlingVersionResolver implements VersionResolver {
         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.1-SNAPSHOT");
         versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
-        versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
+        versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.18");
         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.45-SNAPSHOT");
+        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.2.7-SNAPSHOT");
         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.30");
-        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.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.19-SNAPSHOT");
+        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.models.provider",
"1.0.6");
-        versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.0.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.0.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");
@@ -197,19 +200,23 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.10");
         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.17-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.validation.api", "1.0.0-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.validation.core", "1.0.0-SNAPSHOT");
+        versions.put("org.apache.sling:org.apache.sling.xss", "1.0.18");
         versions.put("org.apache.tika:tika-bundle", "1.14");
         versions.put("org.apache.tika:tika-core", "1.14");
-        versions.put("org.codehaus.groovy:groovy", "2.4.7");
-        versions.put("org.codehaus.groovy:groovy-json", "2.4.7");
-        versions.put("org.codehaus.groovy:groovy-templates", "2.4.7");
-        versions.put("org.javassist:javassist", "3.20.0-GA");
+        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.javassist:javassist", "3.21.0-GA");
         versions.put("org.mongodb:mongo-java-driver", "3.4.2");
         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");
+        versions.put("org.unbescape:unbescape", "1.1.4.RELEASE");
     }
 
     private String key(final String groupId, final String artifactId) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message