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 47c9e2fac83ac59bee9f1626e9ed76f3bc70ca1f Author: Oliver Lietz <[email protected]> AuthorDate: Tue Aug 25 08:01:34 2020 +0200 SLING-9687 Update options and versions to latest features --- .../apache/sling/testing/paxexam/SlingOptions.java | 78 ++++-- .../testing/paxexam/SlingVersionResolver.java | 301 +++++++++++---------- src/main/resources/templates/SlingOptions.hbs | 10 +- .../resources/templates/SlingVersionResolver.hbs | 68 ++--- 4 files changed, 252 insertions(+), 205 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 eb5a261..5aed0a9 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -55,7 +55,7 @@ public class SlingOptions { mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.annotation-api-1.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver) ); } else if (version >= 9) { @@ -135,7 +135,11 @@ public class SlingOptions { 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) + mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").version(versionResolver) ); } @@ -208,7 +212,7 @@ public class SlingOptions { mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.tagsoup").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver), @@ -253,6 +257,7 @@ public class SlingOptions { mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").version(versionResolver), mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver), mavenBundle().groupId("org.apache.commons").artifactId("commons-math").version(versionResolver), + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version(versionResolver), factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"}) .asOption() @@ -262,8 +267,8 @@ public class SlingOptions { public static ModifiableCompositeOption slingAuthForm() { return composite( sling(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.form").version(versionResolver), - mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver) + jackrabbitOak(), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.form").version(versionResolver) ); } @@ -313,8 +318,8 @@ public class SlingOptions { public static ModifiableCompositeOption slingCommonsHtml() { return composite( scr(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver), - slingCommonsOsgi() + slingCommonsOsgi(), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver) ); } @@ -331,9 +336,10 @@ public class SlingOptions { slingCommonsMessaging(), slingCommonsThreads(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging.mail").version(versionResolver), - mavenBundle().groupId("com.sun.mail").artifactId("javax.mail").version(versionResolver), - mavenBundle().groupId("javax.mail").artifactId("javax.mail-api").version(versionResolver), - mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver) + mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").version(versionResolver), + mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver), + mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver) ); } @@ -366,6 +372,7 @@ public class SlingOptions { public static ModifiableCompositeOption slingCommonsThreads() { return composite( config(), + slingCommonsMetrics(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.threads").version(versionResolver) ); } @@ -436,6 +443,10 @@ public class SlingOptions { 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), + factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment") + .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons", "org.apache.sling.discovery.base", "org.apache.sling.discovery.oak"}) + .put("whitelist.name", "sling-discovery") + .asOption(), 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(), @@ -458,8 +469,8 @@ public class SlingOptions { slingJcr(), slingEvent(), slingHealthcheck(), - jackrabbitVault(), httpcomponentsClient(), + jackrabbitVault(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver) ); @@ -495,7 +506,7 @@ public class SlingOptions { 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("oak-jackrabbit-api").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver) ); } @@ -534,6 +545,7 @@ public class SlingOptions { public static ModifiableCompositeOption slingModels() { return composite( sling(), + slingAdapter(), slingScripting(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.api").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.impl").version(versionResolver) @@ -664,7 +676,7 @@ public class SlingOptions { sling(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.console").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.core").version(versionResolver), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.factory.configuration").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.cm.json").version(versionResolver) ); } @@ -728,11 +740,8 @@ public class SlingOptions { mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webconsole").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version(versionResolver), factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment") - .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons", "org.apache.sling.discovery.base", "org.apache.sling.discovery.oak", "org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader", "org.apache.sling.jcr.contentloader", "org.apache.sling.jcr.jackrabbit.usermanager", "org.apache.sling.jcr.oak.server", "org.apache.sling.jcr.repoinit", "org.apache.sling.jcr.webconsole"}) - .put("whitelist.name", "sling") - .asOption(), - factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer") - .put("scripts", new String[]{"create service user sling-mapping\n\n create service user sling-readall\n\n create path (sling:Folder) /apps\n\n create path (sling:Folder) /libs\n\n create path (sling:Folder) /var\n\n create path (sling:OrderedFolder) /content\n\n set ACL for everyone\n\n allow jcr:read on /content\n\n end\n\n set ACL for sling-mapping\n\n allow jcr:read on /\n\n end\n\n set ACL for sling-readall\n\n allow jcr:read on [...] + .put("whitelist.bundles", new String[]{"org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader", "org.apache.sling.jcr.contentloader", "org.apache.sling.jcr.jackrabbit.usermanager", "org.apache.sling.jcr.oak.server", "org.apache.sling.jcr.repoinit", "org.apache.sling.jcr.webconsole"}) + .put("whitelist.name", "sling-jcr") .asOption(), factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") .put("user.mapping", new String[]{"org.apache.sling.jcr.resource:observation=sling-readall", "org.apache.sling.jcr.resource:validation=sling-readall"}) @@ -774,7 +783,6 @@ public class SlingOptions { webconsole(), sling(), slingServlets(), - slingInstaller(), slingJcr(), slingJcrRepoinit(), slingAdapter(), @@ -818,6 +826,15 @@ public class SlingOptions { .put("enabledActions", new String[]{"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction"}) .put("groupPrivilegeNames", new String[]{"jcr:read"}) .put("userPrivilegeNames", new String[]{"jcr:all"}) + .asOption(), + factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer") + .put("scripts", new String[]{"create path (sling:Folder) /apps\n\n create path (sling:Folder) /libs\n\n create path (sling:Folder) /var\n\n create path (sling:OrderedFolder) /content\n\n set ACL for everyone\n\n allow jcr:read on /content\n\n end"}) + .asOption(), + factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer") + .put("scripts", new String[]{"create service user sling-mapping\n\n set ACL for sling-mapping\n\n allow jcr:read on /\n\n end"}) + .asOption(), + factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer") + .put("scripts", new String[]{"create service user sling-readall\n\n set ACL for sling-readall\n\n allow jcr:read on /\n\n end"}) .asOption() ); } @@ -861,6 +878,7 @@ public class SlingOptions { public static ModifiableCompositeOption slingScripting() { return composite( sling(), + slingCommonsCompiler(), webconsole(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.api").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version(versionResolver), @@ -980,6 +998,7 @@ public class SlingOptions { return composite( sling(), slingAuthForm(), + slingScriptingJavascript(), composumNodes(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.starter.content").version(versionResolver) ); @@ -987,6 +1006,7 @@ public class SlingOptions { public static ModifiableCompositeOption felixHealthcheck() { return composite( + eventadmin(), scr(), webconsole(), mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.healthcheck.api").version(versionResolver), @@ -997,10 +1017,18 @@ public class SlingOptions { ); } + public static ModifiableCompositeOption httpcomponentsClient() { + return composite( + config(), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver) + ); + } + public static ModifiableCompositeOption jackrabbit() { return composite( httpcomponentsClient(), - mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jackrabbit-api").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-data").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-rmi").version(versionResolver), @@ -1070,8 +1098,10 @@ public class SlingOptions { public static ModifiableCompositeOption composumNodes() { return composite( sling(), + slingI18n(), slingJcr(), slingScriptingJsp(), + slingServlets(), slingEvent(), jackrabbitVault(), mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-commons").version(versionResolver), @@ -1087,14 +1117,6 @@ public class SlingOptions { ); } - public static ModifiableCompositeOption httpcomponentsClient() { - return composite( - config(), - mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver), - mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver) - ); - } - public static ModifiableCompositeOption thymeleaf() { return composite( mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.thymeleaf").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 0987fe1..bb2ce49 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -34,21 +34,21 @@ public class SlingVersionResolver implements VersionResolver { public static final String SLING_GROUP_ID = "org.apache.sling"; public SlingVersionResolver() { - versions.put("org.apache.commons:commons-lang3", "3.9"); - versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.8"); - versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.11"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_1"); + versions.put("org.apache.commons:commons-lang3", "3.11"); + versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.12"); + versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.13"); + versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0"); + versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.3", "2.3_3"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_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.14"); + versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.2"); + versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.2"); + versions.put("org.apache.felix:org.apache.felix.configadmin", "1.9.18"); versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.5.0"); - versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.8"); + versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.20"); 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"); @@ -56,222 +56,239 @@ 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.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.3.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.16"); - versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12"); - versions.put("org.awaitility:awaitility", "4.0.0"); - 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-xml", "2.5.0"); - versions.put("org.hamcrest:hamcrest", "2.1"); - 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.apache.felix:org.apache.felix.scr", "2.1.20"); + versions.put("org.apache.felix:org.apache.felix.webconsole", "4.5.4"); + versions.put("org.awaitility:awaitility", "4.0.3"); + versions.put("org.codehaus.groovy:groovy", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-json", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-xml", "3.0.1"); + versions.put("org.hamcrest:hamcrest", "2.2"); + versions.put("org.ops4j.base:ops4j-base-lang", "1.5.1"); + versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3"); - 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.url:pax-url-wrap", "2.6.1"); + versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.2"); + versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.2"); + versions.put("org.ops4j.pax.url:pax-url-wrap", "2.6.2"); 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.osgi:org.osgi.util.promise", "1.1.1"); + versions.put("org.ow2.asm:asm", "8.0.1"); + versions.put("org.ow2.asm:asm-analysis", "8.0.1"); + versions.put("org.ow2.asm:asm-commons", "8.0.1"); + versions.put("org.ow2.asm:asm-util", "8.0.1"); + versions.put("org.ow2.asm:asm-tree", "8.0.1"); versions.put("org.rnorth.duct-tape:duct-tape", "1.0.8"); - versions.put("org.slf4j:slf4j-api", "1.7.26"); - versions.put("org.slf4j:slf4j-simple", "1.7.26"); - versions.put("org.slf4j:jcl-over-slf4j", "1.7.26"); - versions.put("org.testcontainers:testcontainers", "1.11.3"); + versions.put("org.slf4j:slf4j-api", "1.7.29"); + versions.put("org.slf4j:slf4j-simple", "1.7.29"); + versions.put("org.slf4j:jcl-over-slf4j", "1.7.29"); + versions.put("org.testcontainers:testcontainers", "1.14.3"); versions.put("ch.qos.logback:logback-core", "1.2.3"); versions.put("ch.qos.logback:logback-classic", "1.2.3"); versions.put("com.icegreen:greenmail", "1.5.14"); versions.put("com.sun.mail:jakarta.mail", "1.6.5"); versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0"); versions.put("biz.aQute.bnd:bndlib", "2.4.0"); - versions.put("io.rest-assured:json-path", "4.0.0"); - versions.put("io.rest-assured:rest-assured", "4.0.0"); - versions.put("io.rest-assured:rest-assured-common", "4.0.0"); - versions.put("io.rest-assured:xml-path", "4.0.0"); + versions.put("io.rest-assured:json-path", "4.3.1"); + versions.put("io.rest-assured:rest-assured", "4.3.1"); + versions.put("io.rest-assured:rest-assured-common", "4.3.1"); + versions.put("io.rest-assured:xml-path", "4.3.1"); versions.put("jakarta.mail:jakarta.mail-api", "1.6.5"); - 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.composum.sling.core:composum-sling-core-commons", "1.12.2"); + versions.put("com.composum.sling.core:composum-sling-core-config", "1.12.2"); + versions.put("com.composum.sling.core:composum-sling-core-console", "1.12.2"); + versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.12.2"); + versions.put("com.composum.sling.core:composum-sling-package-manager", "1.12.2"); + versions.put("com.composum.sling.core:composum-sling-user-management", "1.12.2"); + versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.11.2"); + versions.put("com.fasterxml.jackson.core:jackson-core", "2.11.2"); + versions.put("com.fasterxml.jackson.core:jackson-databind", "2.11.2"); 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.12"); + versions.put("com.h2database:h2-mvstore", "1.4.200"); + versions.put("com.sun.mail:jakarta.mail", "1.6.5"); + versions.put("commons-codec:commons-codec", "1.14"); versions.put("commons-collections:commons-collections", "3.2.2"); versions.put("commons-fileupload:commons-fileupload", "1.4"); - versions.put("commons-io:commons-io", "2.6"); + versions.put("commons-io:commons-io", "2.7"); versions.put("commons-lang:commons-lang", "2.6"); versions.put("io.dropwizard.metrics:metrics-core", "3.2.6"); + versions.put("jakarta.mail:jakarta.mail-api", "1.6.5"); versions.put("javax.jcr:jcr", "2.0"); - 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.3"); - versions.put("org.apache.commons:commons-email", "1.5"); - versions.put("org.apache.commons:commons-lang3", "3.9"); + versions.put("org.antlr:antlr4-runtime", "4.8-1"); + versions.put("org.apache.commons:commons-collections4", "4.4"); + versions.put("org.apache.commons:commons-compress", "1.20"); + versions.put("org.apache.commons:commons-lang3", "3.11"); 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.commons:commons-math3", "3.6.1"); + versions.put("org.apache.commons:commons-text", "1.9"); + versions.put("org.apache.felix:org.apache.felix.cm.json", "1.0.2"); + versions.put("org.apache.felix:org.apache.felix.converter", "1.0.14"); + versions.put("org.apache.felix:org.apache.felix.healthcheck.api", "2.0.4"); + versions.put("org.apache.felix:org.apache.felix.healthcheck.core", "2.0.8"); + versions.put("org.apache.felix:org.apache.felix.healthcheck.generalchecks", "2.0.6"); + versions.put("org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin", "2.0.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"); 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.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.1"); + versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.2"); 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.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.httpcomponents:httpclient-osgi", "4.5.12"); + versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.13"); + versions.put("org.apache.jackrabbit:jackrabbit-data", "2.20.1"); + versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.20.1"); + versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.20.1"); + versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.20.1"); + versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.20.1"); + versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.20.1"); + versions.put("org.apache.jackrabbit:oak-api", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-blob", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-blob-plugins", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-commons", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-core", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-core-spi", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-jackrabbit-api", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-jcr", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-lucene", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-query-spi", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-security-spi", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-segment-tar", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-store-composite", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-store-document", "1.32.0"); + versions.put("org.apache.jackrabbit:oak-store-spi", "1.32.0"); + versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.4.6"); + versions.put("org.apache.pdfbox:fontbox", "2.0.21"); versions.put("org.apache.pdfbox:jempbox", "1.8.16"); - versions.put("org.apache.pdfbox:pdfbox", "2.0.15"); + versions.put("org.apache.pdfbox:pdfbox", "2.0.21"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jasypt", "1.9.3_1"); 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.poi", "4.1.2_1"); + versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.12_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.servicemix.bundles:org.apache.servicemix.bundles.xmlbeans", "3.1.0_2"); + versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); 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.14"); + versions.put("org.apache.sling:org.apache.sling.api", "2.22.0"); + versions.put("org.apache.sling:org.apache.sling.auth.core", "1.4.4"); + versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.20"); 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.16"); + versions.put("org.apache.sling:org.apache.sling.caconfig.api", "1.2.0"); + versions.put("org.apache.sling:org.apache.sling.caconfig.impl", "1.5.0"); 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.clam", "1.1.0"); + versions.put("org.apache.sling:org.apache.sling.cms.api", "0.16.2"); + versions.put("org.apache.sling:org.apache.sling.cms.core", "0.16.2"); + versions.put("org.apache.sling:org.apache.sling.cms.transformer", "0.16.2"); + versions.put("org.apache.sling:org.apache.sling.cms.ui", "0.16.2"); + versions.put("org.apache.sling:org.apache.sling.commons.clam", "2.0.0"); 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.10"); + versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.4.0"); versions.put("org.apache.sling:org.apache.sling.commons.crypto", "1.0.0"); + versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.14"); 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"); + versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.2.4"); versions.put("org.apache.sling:org.apache.sling.commons.messaging", "1.0.0"); versions.put("org.apache.sling:org.apache.sling.commons.messaging.mail", "1.0.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.18"); + versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.8"); + versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.2.2"); + versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.2"); + versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.6"); + versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.20"); 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.oak", "1.2.28"); + versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.30"); 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.4.0"); - versions.put("org.apache.sling:org.apache.sling.engine", "2.6.18"); + versions.put("org.apache.sling:org.apache.sling.distribution.api", "0.4.0"); + versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.4.2"); + versions.put("org.apache.sling:org.apache.sling.engine", "2.6.20"); 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.featureflags", "1.2.2"); - versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.14"); + versions.put("org.apache.sling:org.apache.sling.fileoptim", "0.9.4"); + versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.16"); 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.console", "1.1.0"); + versions.put("org.apache.sling:org.apache.sling.installer.core", "3.11.4"); versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.3.2"); versions.put("org.apache.sling:org.apache.sling.installer.factory.packages", "1.0.4"); 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.installer.provider.file", "1.3.0"); + versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.3.0"); 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.6"); + versions.put("org.apache.sling:org.apache.sling.jcr.base", "3.1.4"); versions.put("org.apache.sling:org.apache.sling.jcr.compiler", "2.1.0"); 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.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.10"); - versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.18"); + versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager", "3.0.6"); + versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", "2.2.10"); + versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.2.4"); + versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.26"); + versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.22"); 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.8"); - versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.10"); + versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.12"); versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8"); 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.provisioning.model", "1.8.6"); versions.put("org.apache.sling:org.apache.sling.query", "4.0.2"); - versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.2.4"); + versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.6.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.10"); - versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.6.12"); + versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.6.16"); 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"); - 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.core", "2.2.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.freemarker", "1.0.2"); + versions.put("org.apache.sling:org.apache.sling.scripting.groovy", "1.2.0"); 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.javascript", "3.1.2"); + versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.4.2"); 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.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.scripting.sightly", "1.3.2-1.4.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.2.6-1.4.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.2.0-1.4.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.2.4"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.10"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.runtime", "1.2.2-1.4.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "2.0.2"); 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.serviceusermapper", "1.4.6"); 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.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.4"); + versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.36"); + versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.6.4"); + versions.put("org.apache.sling:org.apache.sling.settings", "1.4.0"); + versions.put("org.apache.sling:org.apache.sling.starter.content", "1.0.8"); 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.1.8"); - versions.put("org.apache.tika:tika-core", "1.21"); - versions.put("org.apache.tika:tika-parsers", "1.21"); + versions.put("org.apache.sling:org.apache.sling.xss", "2.2.6"); + versions.put("org.apache.tika:tika-core", "1.24.1"); + versions.put("org.apache.tika:tika-parsers", "1.24.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.10.1"); + versions.put("org.codehaus.groovy:groovy", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-json", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-templates", "3.0.1"); + versions.put("org.freemarker:freemarker", "2.3.30"); + versions.put("org.javassist:javassist", "3.27.0-GA"); + versions.put("org.jsoup:jsoup", "1.13.1"); + versions.put("org.mongodb:mongo-java-driver", "3.12.7"); versions.put("org.unbescape:unbescape", "1.1.6.RELEASE"); } diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs index e44c6af..1bbc8b9 100644 --- a/src/main/resources/templates/SlingOptions.hbs +++ b/src/main/resources/templates/SlingOptions.hbs @@ -55,7 +55,7 @@ public class SlingOptions { mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.annotation-api-1.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver) ); } else if (version >= 9) { @@ -135,7 +135,11 @@ public class SlingOptions { 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) + mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").version(versionResolver), + mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").version(versionResolver) ); } @@ -208,7 +212,7 @@ public class SlingOptions { mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.tagsoup").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver), diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs index 3130d1b..62b22a5 100644 --- a/src/main/resources/templates/SlingVersionResolver.hbs +++ b/src/main/resources/templates/SlingVersionResolver.hbs @@ -34,21 +34,21 @@ public class SlingVersionResolver implements VersionResolver { public static final String SLING_GROUP_ID = "org.apache.sling"; public SlingVersionResolver() { - versions.put("org.apache.commons:commons-lang3", "3.9"); - versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.8"); - versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.11"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_1"); + versions.put("org.apache.commons:commons-lang3", "3.11"); + versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.12"); + versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.13"); + versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0"); + versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.3", "2.3_3"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_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.14"); + versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.2"); + versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.2"); + versions.put("org.apache.felix:org.apache.felix.configadmin", "1.9.18"); versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.5.0"); - versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.8"); + versions.put("org.apache.felix:org.apache.felix.http.jetty", "4.0.20"); 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"); @@ -56,42 +56,46 @@ 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.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.3.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.16"); - versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12"); - versions.put("org.awaitility:awaitility", "4.0.0"); - 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-xml", "2.5.0"); - versions.put("org.hamcrest:hamcrest", "2.1"); - 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.apache.felix:org.apache.felix.scr", "2.1.20"); + versions.put("org.apache.felix:org.apache.felix.webconsole", "4.5.4"); + versions.put("org.awaitility:awaitility", "4.0.3"); + versions.put("org.codehaus.groovy:groovy", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-json", "3.0.1"); + versions.put("org.codehaus.groovy:groovy-xml", "3.0.1"); + versions.put("org.hamcrest:hamcrest", "2.2"); + versions.put("org.ops4j.base:ops4j-base-lang", "1.5.1"); + versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3"); - 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.url:pax-url-wrap", "2.6.1"); + versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.2"); + versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.2"); + versions.put("org.ops4j.pax.url:pax-url-wrap", "2.6.2"); 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.osgi:org.osgi.util.promise", "1.1.1"); + versions.put("org.ow2.asm:asm", "8.0.1"); + versions.put("org.ow2.asm:asm-analysis", "8.0.1"); + versions.put("org.ow2.asm:asm-commons", "8.0.1"); + versions.put("org.ow2.asm:asm-util", "8.0.1"); + versions.put("org.ow2.asm:asm-tree", "8.0.1"); versions.put("org.rnorth.duct-tape:duct-tape", "1.0.8"); - versions.put("org.slf4j:slf4j-api", "1.7.26"); - versions.put("org.slf4j:slf4j-simple", "1.7.26"); - versions.put("org.slf4j:jcl-over-slf4j", "1.7.26"); - versions.put("org.testcontainers:testcontainers", "1.11.3"); + versions.put("org.slf4j:slf4j-api", "1.7.29"); + versions.put("org.slf4j:slf4j-simple", "1.7.29"); + versions.put("org.slf4j:jcl-over-slf4j", "1.7.29"); + versions.put("org.testcontainers:testcontainers", "1.14.3"); versions.put("ch.qos.logback:logback-core", "1.2.3"); versions.put("ch.qos.logback:logback-classic", "1.2.3"); versions.put("com.icegreen:greenmail", "1.5.14"); versions.put("com.sun.mail:jakarta.mail", "1.6.5"); versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0"); versions.put("biz.aQute.bnd:bndlib", "2.4.0"); - versions.put("io.rest-assured:json-path", "4.0.0"); - versions.put("io.rest-assured:rest-assured", "4.0.0"); - versions.put("io.rest-assured:rest-assured-common", "4.0.0"); - versions.put("io.rest-assured:xml-path", "4.0.0"); + versions.put("io.rest-assured:json-path", "4.3.1"); + versions.put("io.rest-assured:rest-assured", "4.3.1"); + versions.put("io.rest-assured:rest-assured-common", "4.3.1"); + versions.put("io.rest-assured:xml-path", "4.3.1"); versions.put("jakarta.mail:jakarta.mail-api", "1.6.5");{{#each bundles}} versions.put("{{groupId}}:{{artifactId}}", "{{version}}");{{/each}} }
