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 <[email protected]> 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() { + } + +}
