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 2019/05/28 21:00:13 UTC

[sling-org-apache-sling-testing-paxexam] branch master updated (9072fdb -> 1f508a8)

This is an automated email from the ASF dual-hosted git repository.

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


    from 9072fdb  SLING-8440 Use Sling Bundle Parent 35
     new c13b5bc  SLING-8146 Update options and versions to latest features
     new c7665e2  SLING-8444 Update Felix Framework to 6.0.3
     new e8dd5a2  SLING-8445 Provide SPI Fly Option
     new 1f508a8  SLING-8146 Update options and versions to latest features

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |   2 +-
 .../apache/sling/testing/paxexam/SlingOptions.java |  27 +++-
 .../testing/paxexam/SlingVersionResolver.java      | 164 +++++++++++----------
 .../apache/sling/testing/paxexam/TestSupport.java  |   4 +-
 src/main/resources/templates/SlingOptions.hbs      |   8 +
 .../resources/templates/SlingVersionResolver.hbs   |  20 ++-
 .../paxexam/it/SlingOptionsTestSupport.java        |   4 +-
 ...IT.java => SlingOptionsFelixHealthcheckIT.java} |   6 +-
 ...ionsPaxUrlIT.java => SlingOptionsSpyflyIT.java} |  11 +-
 9 files changed, 146 insertions(+), 100 deletions(-)
 copy src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingCommonsClamIT.java => SlingOptionsFelixHealthcheckIT.java} (89%)
 copy src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsPaxUrlIT.java => SlingOptionsSpyflyIT.java} (82%)


[sling-org-apache-sling-testing-paxexam] 03/04: SLING-8445 Provide SPI Fly Option

Posted by ol...@apache.org.
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 e8dd5a2e6591b07facddd7e42d7c10aa343ea2dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 28 22:58:05 2019 +0200

    SLING-8445 Provide SPI Fly Option
    
    Use in TestSupport and SlingOptionsTestSupport (required by upcoming bundle updates)
---
 .../apache/sling/testing/paxexam/SlingOptions.java |  8 ++++
 .../testing/paxexam/SlingVersionResolver.java      |  2 +
 .../apache/sling/testing/paxexam/TestSupport.java  |  4 +-
 src/main/resources/templates/SlingOptions.hbs      |  8 ++++
 .../resources/templates/SlingVersionResolver.hbs   |  2 +
 .../paxexam/it/SlingOptionsTestSupport.java        |  4 +-
 .../paxexam/it/tests/SlingOptionsSpyflyIT.java     | 51 ++++++++++++++++++++++
 7 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index bcb0bf3..d452275 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -101,6 +101,14 @@ public class SlingOptions {
         );
     }
 
+    public static ModifiableCompositeOption spyfly() {
+        return composite(
+            mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
+            mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
+            mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver)
+        );
+    }
+
     public static ModifiableCompositeOption webconsole() {
         return composite(
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").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 fcc0d24..5b95b75 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -51,6 +51,7 @@ public class SlingVersionResolver implements VersionResolver {
         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.8");
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
+        versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.2.1");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
         versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
@@ -61,6 +62,7 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
         versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+        versions.put("org.ow2.asm:asm", "7.1");
         versions.put("org.slf4j:slf4j-api", "1.7.26");
         versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
         versions.put("ch.qos.logback:logback-core", "1.2.3");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index c51a760..d848939 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -35,6 +35,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
 
 import static org.apache.sling.testing.paxexam.SlingOptions.backing;
 import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles;
+import static org.apache.sling.testing.paxexam.SlingOptions.spyfly;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -81,7 +82,8 @@ public abstract class TestSupport {
             CoreOptions.workingDirectory(workingDirectory()),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
             paxTinybundles(),
-            backing()
+            backing(),
+            spyfly()
         );
     }
 
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index f56eb7a..d60534c 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -101,6 +101,14 @@ public class SlingOptions {
         );
     }
 
+    public static ModifiableCompositeOption spyfly() {
+        return composite(
+            mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
+            mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
+            mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver)
+        );
+    }
+
     public static ModifiableCompositeOption webconsole() {
         return composite(
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver),
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index e61cb43..d830dc8 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -51,6 +51,7 @@ public class SlingVersionResolver implements VersionResolver {
         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.8");
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
+        versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.2.1");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
         versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
@@ -61,6 +62,7 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
         versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+        versions.put("org.ow2.asm:asm", "7.1");
         versions.put("org.slf4j:slf4j-api", "1.7.26");
         versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
         versions.put("ch.qos.logback:logback-core", "1.2.3");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
index 87c1ef5..64df997 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
@@ -26,6 +26,7 @@ import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.util.PathUtils;
 
 import static org.apache.sling.testing.paxexam.SlingOptions.backing;
+import static org.apache.sling.testing.paxexam.SlingOptions.spyfly;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -47,7 +48,8 @@ public abstract class SlingOptionsTestSupport {
             localMavenRepo(),
             CoreOptions.workingDirectory(workingDirectory()),
             testBundle("bundle.filename"),
-            backing()
+            backing(),
+            spyfly()
         );
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
new file mode 100644
index 0000000..0827835
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
@@ -0,0 +1,51 @@
+/*
+ * 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.spyfly;
+import static org.ops4j.pax.exam.CoreOptions.keepCaches;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSpyflyIT extends SlingOptionsTestSupport {
+
+    @Configuration
+    public Option[] configuration() {
+        return new Option[]{
+            failOnUnresolvedBundles(),
+            keepCaches(),
+            localMavenRepo(),
+            spyfly()
+        };
+    }
+
+    @Test
+    public void test() {
+    }
+
+}


[sling-org-apache-sling-testing-paxexam] 02/04: SLING-8444 Update Felix Framework to 6.0.3

Posted by ol...@apache.org.
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 c7665e2b4adaf1a2c9f7ba6f01eb07981dee3f1e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 28 22:35:31 2019 +0200

    SLING-8444 Update Felix Framework to 6.0.3
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 75efa0a..e78f928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>5.6.10</version>
+      <version>6.0.3</version>
       <scope>test</scope>
     </dependency>
     <!-- OPS4J Pax -->


[sling-org-apache-sling-testing-paxexam] 04/04: SLING-8146 Update options and versions to latest features

Posted by ol...@apache.org.
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 1f508a82145ba4300c2940a8919f7dd743a0a446
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 28 22:59:55 2019 +0200

    SLING-8146 Update options and versions to latest features
---
 .../apache/sling/testing/paxexam/SlingOptions.java |  19 ++-
 .../testing/paxexam/SlingVersionResolver.java      | 146 +++++++++++----------
 .../resources/templates/SlingVersionResolver.hbs   |   2 +
 .../it/tests/SlingOptionsFelixHealthcheckIT.java   |  48 +++++++
 4 files changed, 141 insertions(+), 74 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 d452275..e91ca8d 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -97,6 +97,8 @@ public class SlingOptions {
         return composite(
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.metatype").version(versionResolver),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver),
+            mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.function").version(versionResolver),
+            mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.promise").version(versionResolver),
             config()
         );
     }
@@ -399,13 +401,12 @@ public class SlingOptions {
 
     public static ModifiableCompositeOption slingHealthcheck() {
         return composite(
+            felixHealthcheck(),
             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)
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver)
         );
     }
 
@@ -929,6 +930,18 @@ public class SlingOptions {
         );
     }
 
+    public static ModifiableCompositeOption felixHealthcheck() {
+        return composite(
+            scr(),
+            webconsole(),
+            mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.healthcheck.api").version(versionResolver),
+            mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.healthcheck.core").version(versionResolver),
+            mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.healthcheck.generalchecks").version(versionResolver),
+            mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.healthcheck.webconsoleplugin").version(versionResolver),
+            mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver)
+        );
+    }
+
     public static ModifiableCompositeOption jackrabbit() {
         return composite(
             mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").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 5b95b75..dbb3a0b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -62,27 +62,29 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
         versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+        versions.put("org.osgi:org.osgi.util.function", "1.1.0");
+        versions.put("org.osgi:org.osgi.util.promise", "1.1.0");
         versions.put("org.ow2.asm:asm", "7.1");
         versions.put("org.slf4j:slf4j-api", "1.7.26");
         versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
         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.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.composum.sling.core:composum-sling-core-commons", "1.9.4");
+        versions.put("com.composum.sling.core:composum-sling-core-config", "1.9.4");
+        versions.put("com.composum.sling.core:composum-sling-core-console", "1.9.4");
+        versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.9.4");
+        versions.put("com.composum.sling.core:composum-sling-package-manager", "1.9.4");
+        versions.put("com.composum.sling.core:composum-sling-user-management", "1.9.4");
+        versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.9");
+        versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.9");
+        versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.9");
         versions.put("com.google.guava:guava", "15.0");
         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-codec:commons-codec", "1.12");
         versions.put("commons-collections:commons-collections", "3.2.2");
-        versions.put("commons-fileupload:commons-fileupload", "1.3.3");
+        versions.put("commons-fileupload:commons-fileupload", "1.4");
         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");
@@ -91,48 +93,52 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("javax.mail:javax.mail-api", "1.6.2");
         versions.put("javax.servlet:javax.servlet-api", "3.1.0");
         versions.put("org.antlr:antlr4-runtime", "4.7.2");
-        versions.put("org.apache.commons:commons-collections4", "4.2");
+        versions.put("org.apache.commons:commons-collections4", "4.3");
         versions.put("org.apache.commons:commons-email", "1.5");
-        versions.put("org.apache.commons:commons-lang3", "3.8.1");
+        versions.put("org.apache.commons:commons-lang3", "3.9");
         versions.put("org.apache.commons:commons-math", "2.2");
+        versions.put("org.apache.felix:org.apache.felix.healthcheck.api", "2.0.2");
+        versions.put("org.apache.felix:org.apache.felix.healthcheck.core", "2.0.6");
+        versions.put("org.apache.felix:org.apache.felix.healthcheck.generalchecks", "2.0.4");
+        versions.put("org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin", "2.0.0");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         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.8");
+        versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage", "1.0.10");
         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.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-atinject_1.0_spec", "1.1");
+        versions.put("org.apache.geronimo.specs:geronimo-el_2.2_spec", "1.1");
         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.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.httpcomponents:httpclient-osgi", "4.5.8");
+        versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.11");
+        versions.put("org.apache.jackrabbit:jackrabbit-api", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-data", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.18.1");
+        versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.18.1");
+        versions.put("org.apache.jackrabbit:oak-api", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-blob", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-blob-plugins", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-commons", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-core", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-core-spi", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-jcr", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-lucene", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-query-spi", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-security-spi", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-segment-tar", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-store-composite", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-store-document", "1.12.0");
+        versions.put("org.apache.jackrabbit:oak-store-spi", "1.12.0");
+        versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.2.8");
+        versions.put("org.apache.pdfbox:fontbox", "2.0.15");
         versions.put("org.apache.pdfbox:jempbox", "1.8.16");
-        versions.put("org.apache.pdfbox:pdfbox", "2.0.13");
+        versions.put("org.apache.pdfbox:pdfbox", "2.0.15");
         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");
@@ -140,17 +146,17 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.10");
         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.12");
+        versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.14");
         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.impl", "1.4.16");
         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.2");
+        versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.10");
+        versions.put("org.apache.sling:org.apache.sling.commons.html", "1.1.0");
         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");
@@ -165,21 +171,19 @@ public class SlingVersionResolver implements VersionResolver {
         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.4.0");
-        versions.put("org.apache.sling:org.apache.sling.engine", "2.6.16");
+        versions.put("org.apache.sling:org.apache.sling.engine", "2.6.18");
         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.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.hc.api", "1.0.4");
+        versions.put("org.apache.sling:org.apache.sling.hc.support", "1.0.6");
         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.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.factory.configuration", "1.2.2");
+        versions.put("org.apache.sling:org.apache.sling.installer.hc", "2.0.2");
         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");
@@ -190,8 +194,8 @@ public class SlingVersionResolver implements VersionResolver {
         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.16");
+        versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.10");
+        versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.18");
         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");
@@ -202,14 +206,14 @@ public class SlingVersionResolver implements VersionResolver {
         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", "3.0.2");
+        versions.put("org.apache.sling:org.apache.sling.pipes", "3.1.0");
         versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
         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.repoinit.parser", "1.2.4");
         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.6.8");
+        versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.10");
+        versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.6.12");
         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.56");
@@ -218,34 +222,34 @@ public class SlingVersionResolver implements VersionResolver {
         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.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.jsp.taglib", "2.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.1.2-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.1.2-1.4.0");
+        versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.1.2-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.sightly.runtime", "1.1.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.servlets.post", "2.3.30");
+        versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.5.4");
         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.starter.content", "1.0.4");
         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.12");
-        versions.put("org.apache.tika:tika-core", "1.19.1");
-        versions.put("org.apache.tika:tika-parsers", "1.19.1");
+        versions.put("org.apache.sling:org.apache.sling.xss", "2.1.8");
+        versions.put("org.apache.tika:tika-core", "1.21");
+        versions.put("org.apache.tika:tika-parsers", "1.21");
         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.mongodb:mongo-java-driver", "3.10.1");
         versions.put("org.unbescape:unbescape", "1.1.6.RELEASE");
     }
 
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index d830dc8..527d221 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -62,6 +62,8 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
         versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+        versions.put("org.osgi:org.osgi.util.function", "1.1.0");
+        versions.put("org.osgi:org.osgi.util.promise", "1.1.0");
         versions.put("org.ow2.asm:asm", "7.1");
         versions.put("org.slf4j:slf4j-api", "1.7.26");
         versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsFelixHealthcheckIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsFelixHealthcheckIT.java
new file mode 100644
index 0000000..0e02e25
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsFelixHealthcheckIT.java
@@ -0,0 +1,48 @@
+/*
+ * 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.felixHealthcheck;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsFelixHealthcheckIT extends SlingOptionsTestSupport {
+
+    @Configuration
+    public Option[] configuration() {
+        return new Option[]{
+            baseConfiguration(),
+            felixHealthcheck()
+        };
+    }
+
+    @Test
+    public void test() {
+    }
+
+}


[sling-org-apache-sling-testing-paxexam] 01/04: SLING-8146 Update options and versions to latest features

Posted by ol...@apache.org.
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 c13b5bcb7184bb2701001dd00e6a6f0cc1e6d3b8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 28 21:48:37 2019 +0200

    SLING-8146 Update options and versions to latest features
    
    update static versions
---
 .../sling/testing/paxexam/SlingVersionResolver.java      | 16 ++++++++--------
 src/main/resources/templates/SlingVersionResolver.hbs    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

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 12e4a1d..fcc0d24 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -41,9 +41,9 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
         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.9.10");
+        versions.put("org.apache.felix:org.apache.felix.configadmin", "1.9.14");
         versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.5.0");
-        versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.6");
+        versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.8");
         versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
         versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "4.0.0");
         versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.1.0");
@@ -53,16 +53,16 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
-        versions.put("org.apache.felix:org.apache.felix.scr", "2.1.14");
-        versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.8");
+        versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
+        versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
         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.3");
-        versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.4");
-        versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.4");
+        versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
+        versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
-        versions.put("org.slf4j:slf4j-api", "1.7.25");
-        versions.put("org.slf4j:jcl-over-slf4j", "1.7.25");
+        versions.put("org.slf4j:slf4j-api", "1.7.26");
+        versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
         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");
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 5d2f1dd..e61cb43 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -41,9 +41,9 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
         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.9.10");
+        versions.put("org.apache.felix:org.apache.felix.configadmin", "1.9.14");
         versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.5.0");
-        versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.6");
+        versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.8");
         versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
         versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "4.0.0");
         versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.1.0");
@@ -53,16 +53,16 @@ public class SlingVersionResolver implements VersionResolver {
         versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
         versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
         versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
-        versions.put("org.apache.felix:org.apache.felix.scr", "2.1.14");
-        versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.8");
+        versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
+        versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
         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.3");
-        versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.4");
-        versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.4");
+        versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
+        versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
         versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
-        versions.put("org.slf4j:slf4j-api", "1.7.25");
-        versions.put("org.slf4j:jcl-over-slf4j", "1.7.25");
+        versions.put("org.slf4j:slf4j-api", "1.7.26");
+        versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
         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");{{#each bundles}}