This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 646945bb6e190350cfc3c7066a03f96a738969f2 Author: Dan Klco <[email protected]> AuthorDate: Fri Apr 2 09:05:00 2021 -0400 Minor - updating dependenies --- feature/pom.xml | 6 +++--- feature/src/main/features/base.json | 16 ++++++++-------- feature/src/main/features/boot.json | 8 ++++---- feature/src/main/features/cms/dependencies.json | 12 ++++++------ feature/src/main/features/cms/feature.json | 2 +- feature/src/main/features/oak/oak_base.json | 2 +- feature/src/main/features/scripting.json | 10 +++++----- feature/src/main/features/webconsole.json | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/feature/pom.xml b/feature/pom.xml index 7d64bb6..4294c21 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -157,7 +157,7 @@ <goal>attach-featurearchives</goal> </goals> <configuration> - <replacePropertyVariables>org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-version,groovy-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika-version,pdfbox-ver [...] + <replacePropertyVariables>org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika-vers [...] </configuration> </execution> </executions> @@ -311,13 +311,13 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.10</version> + <version>${httpclient-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.11.6</version> + <version>1.11.8</version> <scope>test</scope> </dependency> <dependency> diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json index 6eecf65..bef39cc 100644 --- a/feature/src/main/features/base.json +++ b/feature/src/main/features/base.json @@ -78,7 +78,7 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.i18n:2.5.14", + "id":"org.apache.sling:org.apache.sling.i18n:2.5.16", "start-order":"20" }, { @@ -102,7 +102,7 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.serviceusermapper:1.4.6", + "id":"org.apache.sling:org.apache.sling.serviceusermapper:1.5.2", "start-order":"15" }, { @@ -114,15 +114,15 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.10", + "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.12", "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.xss:2.2.8", + "id":"org.apache.sling:org.apache.sling.xss:2.2.12", "start-order":"20" }, { - "id":"org.apache.felix:org.apache.felix.metatype:1.2.2", + "id":"org.apache.felix:org.apache.felix.metatype:1.2.4", "start-order":"4" }, { @@ -150,7 +150,7 @@ "start-order":"5" }, { - "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.4", + "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.6", "start-order":"5" }, { @@ -218,11 +218,11 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2", + "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.6", "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.26", + "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.34", "start-order":"20" } ], diff --git a/feature/src/main/features/boot.json b/feature/src/main/features/boot.json index 7118384..85fb56a 100644 --- a/feature/src/main/features/boot.json +++ b/feature/src/main/features/boot.json @@ -1,7 +1,7 @@ { "bundles": [ { - "id": "org.apache.felix:org.apache.felix.cm.json:1.0.2", + "id": "org.apache.felix:org.apache.felix.cm.json:1.0.6", "start-order": "1" }, { @@ -13,7 +13,7 @@ "start-order": "1" }, { - "id": "org.apache.felix:org.apache.felix.configadmin:1.9.18", + "id": "org.apache.felix:org.apache.felix.configadmin:1.9.20", "start-order": "1" }, { @@ -21,7 +21,7 @@ "start-order": "1" }, { - "id": "org.apache.felix:org.apache.felix.eventadmin:1.5.0", + "id": "org.apache.felix:org.apache.felix.eventadmin:1.6.2", "start-order": "1" }, { @@ -129,7 +129,7 @@ "start-order": "1" }, { - "id": "org.apache.felix:org.apache.felix.scr:2.1.24", + "id": "org.apache.felix:org.apache.felix.scr:2.1.26", "start-order": "1" } ] diff --git a/feature/src/main/features/cms/dependencies.json b/feature/src/main/features/cms/dependencies.json index 8577edd..3d2fc35 100644 --- a/feature/src/main/features/cms/dependencies.json +++ b/feature/src/main/features/cms/dependencies.json @@ -53,7 +53,7 @@ "start-order": "20" }, { - "id": "org.apache.sling:org.apache.sling.resourcemerger:1.3.10", + "id": "org.apache.sling:org.apache.sling.resourcemerger:1.4.0", "start-order": "15" }, { @@ -97,23 +97,23 @@ "start-order": "15" }, { - "id": "org.ow2.asm:asm:9.0", + "id": "org.ow2.asm:asm:9.1", "start-order": "15" }, { - "id": "org.ow2.asm:asm-analysis:9.0", + "id": "org.ow2.asm:asm-analysis:9.1", "start-order": "15" }, { - "id": "org.ow2.asm:asm-commons:9.0", + "id": "org.ow2.asm:asm-commons:9.1", "start-order": "15" }, { - "id": "org.ow2.asm:asm-tree:9.0", + "id": "org.ow2.asm:asm-tree:9.1", "start-order": "15" }, { - "id": "org.ow2.asm:asm-util:9.0", + "id": "org.ow2.asm:asm-util:9.1", "start-order": "15" }, { diff --git a/feature/src/main/features/cms/feature.json b/feature/src/main/features/cms/feature.json index 3a2eae8..c8a8818 100644 --- a/feature/src/main/features/cms/feature.json +++ b/feature/src/main/features/cms/feature.json @@ -1,7 +1,7 @@ { "bundles": [ { - "id": "org.apache.sling:org.apache.sling.feature:1.2.18", + "id": "org.apache.sling:org.apache.sling.feature:1.2.20", "start-order": "20" }, { diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json index 90ccc73..b74aeb1 100644 --- a/feature/src/main/features/oak/oak_base.json +++ b/feature/src/main/features/oak/oak_base.json @@ -6,7 +6,7 @@ "start-order":"10" }, { - "id":"com.google.guava:guava:15.0", + "id":"com.google.guava:guava:${guava-version}", "start-order":"15" }, { diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json index 2cf71ea..d0381f4 100644 --- a/feature/src/main/features/scripting.json +++ b/feature/src/main/features/scripting.json @@ -2,7 +2,7 @@ { "bundles":[ { - "id":"org.antlr:antlr4-runtime:4.9", + "id":"org.antlr:antlr4-runtime:4.9.2", "start-order":"20" }, { @@ -58,7 +58,7 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.4-1.4.0", + "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.6-1.4.0", "start-order":"20" }, { @@ -66,7 +66,7 @@ "start-order":"20" }, { - "id": "org.freemarker:freemarker:2.3.30", + "id": "org.freemarker:freemarker:2.3.31", "start-order": "20" }, { @@ -74,7 +74,7 @@ "start-order":"20" }, { - "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.11.RELEASE_1", + "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.12.RELEASE_1", "start-order":"20" }, { @@ -86,7 +86,7 @@ "start-order":"20" }, { - "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.2.1_1", + "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.2.18_1", "start-order":"20" }, { diff --git a/feature/src/main/features/webconsole.json b/feature/src/main/features/webconsole.json index be17373..af4a9b8 100644 --- a/feature/src/main/features/webconsole.json +++ b/feature/src/main/features/webconsole.json @@ -41,7 +41,7 @@ "start-order":"15" }, { - "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.0.2", + "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.1.0", "start-order":"15" }, {
