sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [sling-org-apache-sling-testing-paxexam] 01/02: SLING-8146 Update options and versions to latest features
Date Thu, 20 Dec 2018 20:53:52 GMT
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git

commit 121728b018ba065d1b91ce3f96de28fb0f2575fa
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Thu Dec 20 21:52:07 2018 +0100

    SLING-8146 Update options and versions to latest features
---
 .../apache/sling/testing/paxexam/SlingOptions.java | 130 +++++++++----
 .../testing/paxexam/SlingVersionResolver.java      | 210 +++++++++++----------
 .../it/tests/SlingOptionsSlingAuthFormIT.java      |  48 -----
 .../it/tests/SlingOptionsSlingAuthOpenidIT.java    |  48 -----
 .../it/tests/SlingOptionsSlingAuthSelectorIT.java  |  48 -----
 .../it/tests/SlingOptionsSlingDiscoveryImplIT.java |  48 -----
 6 files changed, 201 insertions(+), 331 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 1f1221e..d6c2af4 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -135,7 +135,7 @@ public class SlingOptions {
             management(),
             http(),
             httpWhiteboard(),
-            slingCommonsClassloader(),
+            slingCommonsFsclassloader(),
             slingCommonsScheduler(),
             slingCommonsThreads(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.api").version(versionResolver),
@@ -169,18 +169,11 @@ public class SlingOptions {
         );
     }
 
-    public static ModifiableCompositeOption slingAuthOpenid() {
-        return composite(
-            sling(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.openid").version(versionResolver)
-        );
-    }
-
-    public static ModifiableCompositeOption slingAuthSelector() {
+    public static ModifiableCompositeOption slingCommonsClam() {
         return composite(
-            slingAuthForm(),
-            slingAuthOpenid(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.selector").version(versionResolver)
+            scr(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.clam").version(versionResolver),
+            mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver)
         );
     }
 
@@ -213,7 +206,8 @@ public class SlingOptions {
     public static ModifiableCompositeOption slingCommonsHtml() {
         return composite(
             scr(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver)
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver)
         );
     }
 
@@ -228,11 +222,11 @@ public class SlingOptions {
     public static ModifiableCompositeOption slingCommonsScheduler() {
         return composite(
             scr(),
+            slingCommonsMetrics(),
             slingCommonsThreads(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.scheduler").version(versionResolver),
             mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
-            mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver),
-            mavenBundle().groupId("io.dropwizard.metrics").artifactId("metrics-core").version(versionResolver)
+            mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver)
         );
     }
 
@@ -257,24 +251,45 @@ public class SlingOptions {
         );
     }
 
-    public static ModifiableCompositeOption slingDiscovery() {
+    public static ModifiableCompositeOption slingCaconfig() {
         return composite(
             sling(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.api").version(versionResolver),
-            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)
+            slingScripting(),
+            slingXss(),
+            webconsole(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.caconfig.api").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.caconfig.impl").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.caconfig.spi").version(versionResolver),
+            factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+                .put("scripts", new String[]{"create path (sling:Folder) /conf"})
+                .asOption(),
+            factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+                .put("user.mapping", new String[]{"org.apache.sling.caconfig.impl=sling-readall"})
+                .asOption()
         );
     }
 
-    public static ModifiableCompositeOption slingDiscoveryImpl() {
+    public static ModifiableCompositeOption slingClam() {
         return composite(
-            webconsole(),
-            slingDiscovery(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.impl").version(versionResolver)
+            sling(),
+            slingCommonsClam(),
+            slingEvent(),
+            slingJcr(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.clam").version(versionResolver),
+            factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+                .put("scripts", new String[]{"create service user sling-clam\n\n  create path (sling:Folder) /var/clam/results(sling:OrderedFolder)\n\n  set ACL for sling-clam\n\n    allow   jcr:read    on /\n\n    allow   rep:write   on /var/clam\n\n  end"})
+                .asOption(),
+            factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+                .put("user.mapping", new String[]{"org.apache.sling.clam=sling-clam", "org.apache.sling.clam:result-writer=sling-clam"})
+                .asOption()
+        );
+    }
+
+    public static ModifiableCompositeOption slingDiscovery() {
+        return composite(
+            sling(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.api").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.support").version(versionResolver)
         );
     }
 
@@ -283,7 +298,12 @@ public class SlingOptions {
             webconsole(),
             slingDiscovery(),
             slingHealthcheck(),
+            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.oak").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),
             factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
                 .put("scripts", new String[]{"create service user sling-discovery\n\n  create path (sling:Folder) /var/discovery\n\n  create path (sling:Folder) /var/discovery/oak\n\n  set ACL for sling-discovery\n\n    allow   jcr:read    on /var/discovery\n\n    allow   rep:write   on /var/discovery\n\n  end"})
                 .asOption(),
@@ -343,9 +363,9 @@ public class SlingOptions {
             jackrabbitVault(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.fsresource").version(versionResolver),
             mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
+            mavenBundle().groupId("com.google.guava").artifactId("guava").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("com.google.guava").artifactId("guava").version(versionResolver)
+            mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver)
         );
     }
 
@@ -404,6 +424,7 @@ public class SlingOptions {
         return composite(
             sling(),
             jackrabbit(),
+            jackrabbitVault(),
             slingEvent(),
             slingModels(),
             slingQuery(),
@@ -448,7 +469,10 @@ public class SlingOptions {
         return composite(
             sling(),
             slingCommonsHtml(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.rewriter").version(versionResolver)
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.rewriter").version(versionResolver),
+            factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+                .put("user.mapping", new String[]{"org.apache.sling.rewriter=sling-readall"})
+                .asOption()
         );
     }
 
@@ -494,7 +518,8 @@ public class SlingOptions {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.xss").version(versionResolver),
-            mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
+            mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
+            mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
             factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
                 .put("scripts", new String[]{"create service user sling-xss\n\n  create path (sling:Folder) /apps/sling/xss\n\n  create path (sling:Folder) /libs/sling/xss\n\n  set ACL for sling-xss\n\n    allow   jcr:read    on /apps/sling/xss\n\n    allow   jcr:read    on /libs/sling/xss\n\n  end"})
                 .asOption(),
@@ -557,10 +582,8 @@ public class SlingOptions {
             tika(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.api").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.base").version(versionResolver),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.classloader").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.contentloader").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.davex").version(versionResolver),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.registration").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.resource").version(versionResolver),
             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),
@@ -667,7 +690,8 @@ public class SlingOptions {
             slingJcrRepoinit(),
             slingAdapter(),
             slingBundleresource(),
-            slingDiscoveryOak(),
+            slingDiscoveryStandalone(),
+            slingHealthcheck(),
             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),
@@ -731,8 +755,8 @@ public class SlingOptions {
             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.mongodb").artifactId("mongo-java-driver").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")
@@ -760,6 +784,16 @@ public class SlingOptions {
         );
     }
 
+    public static ModifiableCompositeOption slingScriptingFreemarker() {
+        return composite(
+            sling(),
+            slingAdapter(),
+            slingScripting(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.freemarker").version(versionResolver),
+            mavenBundle().groupId("org.freemarker").artifactId("freemarker").version(versionResolver)
+        );
+    }
+
     public static ModifiableCompositeOption slingScriptingGroovy() {
         return composite(
             sling(),
@@ -794,6 +828,7 @@ public class SlingOptions {
         return composite(
             slingScripting(),
             slingCommonsCompiler(),
+            slingCaconfig(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp.taglib").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-api").version(versionResolver),
@@ -811,13 +846,14 @@ public class SlingOptions {
             slingModels(),
             slingXss(),
             slingCommonsCompiler(),
-            slingCommonsFsclassloader(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.compiler").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.compiler.java").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.js.provider").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.models.provider").version(versionResolver),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.runtime").version(versionResolver),
             mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.rhino").version(versionResolver),
+            mavenBundle().groupId("org.antlr").artifactId("antlr4-runtime").version(versionResolver),
             factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
                 .put("user.mapping", new String[]{"org.apache.sling.scripting.sightly.js.provider=sling-scripting"})
                 .asOption()
@@ -830,6 +866,7 @@ public class SlingOptions {
             slingScripting(),
             slingI18n(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
+            mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.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),
@@ -843,6 +880,7 @@ public class SlingOptions {
     public static ModifiableCompositeOption slingServlets() {
         return composite(
             sling(),
+            slingScripting(),
             slingXss(),
             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),
@@ -853,6 +891,15 @@ public class SlingOptions {
         );
     }
 
+    public static ModifiableCompositeOption slingStarterContent() {
+        return composite(
+            sling(),
+            slingAuthForm(),
+            composum(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.starter.content").version(versionResolver)
+        );
+    }
+
     public static ModifiableCompositeOption jackrabbit() {
         return composite(
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver),
@@ -883,6 +930,8 @@ public class SlingOptions {
     public static ModifiableCompositeOption jackrabbitOak() {
         return composite(
             scr(),
+            slingCommonsMetrics(),
+            slingCommonsThreads(),
             jackrabbit(),
             tika(),
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-api").version(versionResolver),
@@ -896,7 +945,6 @@ public class SlingOptions {
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-security-spi").version(versionResolver),
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-composite").version(versionResolver),
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-spi").version(versionResolver),
-            mavenBundle().groupId("io.dropwizard.metrics").artifactId("metrics-core").version(versionResolver),
             mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(versionResolver)
         );
@@ -917,7 +965,10 @@ public class SlingOptions {
     public static ModifiableCompositeOption tika() {
         return composite(
             mavenBundle().groupId("org.apache.tika").artifactId("tika-core").version(versionResolver),
-            mavenBundle().groupId("org.apache.tika").artifactId("tika-bundle").version(versionResolver)
+            mavenBundle().groupId("org.apache.tika").artifactId("tika-parsers").version(versionResolver),
+            mavenBundle().groupId("org.apache.pdfbox").artifactId("pdfbox").version(versionResolver),
+            mavenBundle().groupId("org.apache.pdfbox").artifactId("fontbox").version(versionResolver),
+            mavenBundle().groupId("org.apache.pdfbox").artifactId("jempbox").version(versionResolver)
         );
     }
 
@@ -929,6 +980,7 @@ public class SlingOptions {
             slingEvent(),
             jackrabbitVault(),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-commons").version(versionResolver),
+            mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-config").version(versionResolver),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-console").version(versionResolver),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-jslibs").version(versionResolver),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-user-management").version(versionResolver),
@@ -969,8 +1021,8 @@ public class SlingOptions {
         final String localIndexDir = String.format("%s/index", repositoryHome);
         return composite(
             slingQuickstartOak(),
-            mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-store-document").version(versionResolver),
             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),
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 e5eb1a7..08e780d 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -61,30 +61,32 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("ch.qos.logback:logback-core", "1.2.3");
         versions.put("ch.qos.logback:logback-classic", "1.2.3");
         versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0");
-        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.4");
-        versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.4");
-        versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.4");
+        versions.put("com.composum.sling.core:composum-sling-core-commons", "1.9.3");
+        versions.put("com.composum.sling.core:composum-sling-core-config", "1.9.3");
+        versions.put("com.composum.sling.core:composum-sling-core-console", "1.9.3");
+        versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.9.3");
+        versions.put("com.composum.sling.core:composum-sling-package-manager", "1.9.3");
+        versions.put("com.composum.sling.core:composum-sling-user-management", "1.9.3");
+        versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.8");
+        versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.8");
+        versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.8");
         versions.put("com.google.guava:guava", "15.0");
-        versions.put("com.h2database:h2-mvstore", "1.4.196");
-        versions.put("com.sun.mail:javax.mail", "1.6.1");
+        versions.put("com.h2database:h2-mvstore", "1.4.197");
+        versions.put("com.sun.mail:javax.mail", "1.6.2");
         versions.put("commons-codec:commons-codec", "1.11");
         versions.put("commons-collections:commons-collections", "3.2.2");
         versions.put("commons-fileupload:commons-fileupload", "1.3.3");
         versions.put("commons-io:commons-io", "2.6");
         versions.put("commons-lang:commons-lang", "2.6");
         versions.put("io.dropwizard.metrics:metrics-core", "3.2.6");
-        versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.0.14-0000");
+        versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.3.8-0000");
         versions.put("javax.jcr:jcr", "2.0");
-        versions.put("javax.mail:javax.mail-api", "1.6.1");
+        versions.put("javax.mail:javax.mail-api", "1.6.2");
         versions.put("javax.servlet:javax.servlet-api", "3.1.0");
-        versions.put("org.apache.commons:commons-collections4", "4.1");
+        versions.put("org.antlr:antlr4-runtime", "4.7.2");
+        versions.put("org.apache.commons:commons-collections4", "4.2");
         versions.put("org.apache.commons:commons-email", "1.5");
-        versions.put("org.apache.commons:commons-lang3", "3.7");
+        versions.put("org.apache.commons:commons-lang3", "3.8.1");
         versions.put("org.apache.commons:commons-math", "2.2");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         versions.put("org.apache.felix:org.apache.felix.jaas", "1.0.2");
@@ -97,139 +99,147 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.geronimo.specs:geronimo-interceptor_1.1_spec", "1.0");
         versions.put("org.apache.geronimo.specs:geronimo-jcdi_1.0_spec", "1.0");
         versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec", "1.1.1");
-        versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.5");
-        versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.9");
-        versions.put("org.apache.jackrabbit:jackrabbit-api", "2.16.1");
-        versions.put("org.apache.jackrabbit:jackrabbit-data", "2.16.1");
-        versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.16.1");
-        versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.16.1");
-        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.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.44");
-        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");
+        versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.6");
+        versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.10");
+        versions.put("org.apache.jackrabbit:jackrabbit-api", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-data", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.18.0");
+        versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.18.0");
+        versions.put("org.apache.jackrabbit:oak-api", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-blob", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-blob-plugins", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-commons", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-core", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-core-spi", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-jcr", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-lucene", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-query-spi", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-security-spi", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-segment-tar", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-store-composite", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-store-document", "1.8.9");
+        versions.put("org.apache.jackrabbit:oak-store-spi", "1.8.9");
+        versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.2.6");
+        versions.put("org.apache.pdfbox:fontbox", "2.0.13");
+        versions.put("org.apache.pdfbox:jempbox", "1.8.16");
+        versions.put("org.apache.pdfbox:pdfbox", "2.0.13");
+        versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.1_1");
+        versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.10_1");
+        versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf", "3.0.11.RELEASE_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.10");
-        versions.put("org.apache.sling:org.apache.sling.api", "2.16.4");
+        versions.put("org.apache.sling:org.apache.sling.api", "2.20.0");
         versions.put("org.apache.sling:org.apache.sling.auth.core", "1.4.2");
-        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");
-        versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.3.0");
-        versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.2");
+        versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.12");
+        versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.3.2");
+        versions.put("org.apache.sling:org.apache.sling.caconfig.api", "1.1.2");
+        versions.put("org.apache.sling:org.apache.sling.caconfig.impl", "1.4.14");
+        versions.put("org.apache.sling:org.apache.sling.caconfig.spi", "1.3.4");
+        versions.put("org.apache.sling:org.apache.sling.clam", "1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.commons.clam", "1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.4");
         versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.6");
         versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.8");
-        versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
-        versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.0");
-        versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.4");
-        versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.1.10");
+        versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.2");
+        versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.6");
+        versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.2.0");
         versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
         versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.2");
-        versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.16");
+        versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.18");
         versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4");
         versions.put("org.apache.sling:org.apache.sling.discovery.base", "2.0.8");
         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.22");
+        versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.28");
         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.4");
         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.10");
-        versions.put("org.apache.sling:org.apache.sling.engine", "2.6.12");
-        versions.put("org.apache.sling:org.apache.sling.event", "4.2.10");
-        versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.2");
+        versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.4.0");
+        versions.put("org.apache.sling:org.apache.sling.engine", "2.6.16");
+        versions.put("org.apache.sling:org.apache.sling.event", "4.2.12");
+        versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.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.2");
-        versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.12");
+        versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.14");
         versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.2");
         versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.10");
         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.12");
+        versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.14");
         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.12");
-        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.core", "3.9.0");
+        versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.2.0");
+        versions.put("org.apache.sling:org.apache.sling.installer.hc", "2.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.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.4");
-        versions.put("org.apache.sling:org.apache.sling.jcr.classloader", "3.2.2");
+        versions.put("org.apache.sling:org.apache.sling.jcr.base", "3.0.6");
         versions.put("org.apache.sling:org.apache.sling.jcr.compiler", "2.1.0");
-        versions.put("org.apache.sling:org.apache.sling.jcr.contentloader", "2.2.4");
+        versions.put("org.apache.sling:org.apache.sling.jcr.contentloader", "2.3.0");
         versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.10");
-        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.2.0");
-        versions.put("org.apache.sling:org.apache.sling.jcr.registration", "1.0.4");
+        versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager", "3.0.4");
+        versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", "2.2.8");
+        versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.2.2");
         versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.8");
-        versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.8");
+        versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.16");
         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.models.api", "1.3.6");
-        versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.6");
+        versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.8");
+        versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.10");
         versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8");
         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", "2.0.2");
+        versions.put("org.apache.sling:org.apache.sling.pipes", "3.0.2");
         versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
-        versions.put("org.apache.sling:org.apache.sling.query", "4.0.0");
+        versions.put("org.apache.sling:org.apache.sling.query", "4.0.2");
         versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.2.2");
         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.8");
-        versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.36");
+        versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.6.8");
         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.54");
-        versions.put("org.apache.sling:org.apache.sling.scripting.groovy", "1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.56");
+        versions.put("org.apache.sling:org.apache.sling.scripting.freemarker", "1.0.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.groovy", "1.0.4");
         versions.put("org.apache.sling:org.apache.sling.scripting.java", "2.1.2");
         versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "3.0.4");
         versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.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.48-1.3.1");
-        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.20-1.3.1");
-        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.22-1.3.1");
-        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.26");
-        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.0");
-        versions.put("org.apache.sling:org.apache.sling.security", "1.1.10");
-        versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.4.0");
-        versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.30");
-        versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.24");
-        versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.22");
-        versions.put("org.apache.sling:org.apache.sling.settings", "1.3.8");
+        versions.put("org.apache.sling:org.apache.sling.scripting.jsp.taglib", "2.3.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.1.0-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.1.0-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.1.0-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.28");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.8");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.runtime", "1.0.0-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "2.0.0");
+        versions.put("org.apache.sling:org.apache.sling.security", "1.1.12");
+        versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.4.4");
+        versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.40");
+        versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.26");
+        versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.5.2");
+        versions.put("org.apache.sling:org.apache.sling.settings", "1.3.10");
+        versions.put("org.apache.sling:org.apache.sling.starter.content", "1.0.2");
         versions.put("org.apache.sling:org.apache.sling.urlrewriter", "0.0.2");
         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.4");
-        versions.put("org.apache.sling:org.apache.sling.xss", "2.0.4");
-        versions.put("org.apache.tika:tika-bundle", "1.17");
-        versions.put("org.apache.tika:tika-core", "1.17");
-        versions.put("org.attoparser:attoparser", "2.0.4.RELEASE");
-        versions.put("org.codehaus.groovy:groovy", "2.4.14");
-        versions.put("org.codehaus.groovy:groovy-json", "2.4.14");
-        versions.put("org.codehaus.groovy:groovy-templates", "2.4.14");
-        versions.put("org.javassist:javassist", "3.22.0-GA");
-        versions.put("org.mongodb:mongo-java-driver", "3.6.3");
-        versions.put("org.unbescape:unbescape", "1.1.5.RELEASE");
+        versions.put("org.apache.sling:org.apache.sling.xss", "2.0.12");
+        versions.put("org.apache.tika:tika-core", "1.19.1");
+        versions.put("org.apache.tika:tika-parsers", "1.19.1");
+        versions.put("org.attoparser:attoparser", "2.0.5.RELEASE");
+        versions.put("org.codehaus.groovy:groovy", "2.5.0");
+        versions.put("org.codehaus.groovy:groovy-json", "2.5.0");
+        versions.put("org.codehaus.groovy:groovy-templates", "2.5.0");
+        versions.put("org.freemarker:freemarker", "2.3.28");
+        versions.put("org.javassist:javassist", "3.24.1-GA");
+        versions.put("org.mongodb:mongo-java-driver", "3.9.1");
+        versions.put("org.unbescape:unbescape", "1.1.6.RELEASE");
     }
 
     private String key(final String groupId, final String artifactId) {
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java
deleted file mode 100644
index 2551176..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam.it.tests;
-
-import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthForm;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthFormIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingAuthForm()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java
deleted file mode 100644
index d18f3e1..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam.it.tests;
-
-import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthOpenid;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthOpenidIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingAuthOpenid()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java
deleted file mode 100644
index d492c34..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam.it.tests;
-
-import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthSelector;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthSelectorIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingAuthSelector()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java
deleted file mode 100644
index c016a80..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam.it.tests;
-
-import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingDiscoveryImpl;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingDiscoveryImplIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingDiscoveryImpl()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}


Mime
View raw message