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 f088078248e5778af3a714e0de6005b765e54114
Author: Dan Klco <k...@adobe.com>
AuthorDate: Tue Jun 21 10:33:58 2022 -0400
SLING-11069 - Further dependency updates
---
feature/src/main/features/base.json | 6 +++---
feature/src/main/features/boot.json | 8 ++++++--
feature/src/main/features/cms/dependencies.json | 2 +-
feature/src/main/features/cms/feature.json | 2 +-
feature/src/main/features/distribution.json | 2 +-
feature/src/main/features/groovy.json | 2 +-
feature/src/main/features/healthcheck.json | 2 +-
.../src/main/features/models-jacksonexporter.json | 4 ++--
feature/src/main/features/oak/oak_base.json | 2 +-
feature/src/main/features/scripting.json | 10 ++++-----
pom.xml | 24 +++++++++++-----------
11 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/feature/src/main/features/base.json
b/feature/src/main/features/base.json
index 452ba00c..a64ef197 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -101,7 +101,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.8.4",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.9.0",
"start-order":"20"
},
{
@@ -117,11 +117,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.9.2",
+ "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.9.6",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.xss:2.2.18",
+ "id":"org.apache.sling:org.apache.sling.xss:2.2.20",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/boot.json
b/feature/src/main/features/boot.json
index c10fa047..cefcf7d2 100644
--- a/feature/src/main/features/boot.json
+++ b/feature/src/main/features/boot.json
@@ -13,7 +13,7 @@
"start-order":"1"
},
{
- "id":"org.apache.felix:org.apache.felix.configadmin:1.9.22",
+ "id":"org.apache.felix:org.apache.felix.configadmin:1.9.24",
"start-order":"1"
},
{
@@ -61,7 +61,7 @@
"start-order":"1"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.log:5.4.0",
+ "id":"org.apache.sling:org.apache.sling.commons.log:5.4.2",
"start-order":"1"
},
{
@@ -104,6 +104,10 @@
"id":"org.osgi:org.osgi.service.log:1.5.0",
"start-order":"1"
},
+ {
+ "id":"org.osgi:org.osgi.service.component:1.5.0",
+ "start-order":"1"
+ },
{
"id":"org.osgi:org.osgi.util.function:1.2.0",
"start-order":"1"
diff --git a/feature/src/main/features/cms/dependencies.json
b/feature/src/main/features/cms/dependencies.json
index 7339721c..be0fadfb 100644
--- a/feature/src/main/features/cms/dependencies.json
+++ b/feature/src/main/features/cms/dependencies.json
@@ -93,7 +93,7 @@
"start-order":"15"
},
{
-
"id":"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.4",
+
"id":"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.5",
"start-order":"15"
},
{
diff --git a/feature/src/main/features/cms/feature.json
b/feature/src/main/features/cms/feature.json
index 9c64e381..96cbd255 100644
--- a/feature/src/main/features/cms/feature.json
+++ b/feature/src/main/features/cms/feature.json
@@ -21,7 +21,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.installer.factory.feature:0.6.0",
+ "id":"org.apache.sling:org.apache.sling.installer.factory.feature:0.7.0",
"start-order":"20"
}
]
diff --git a/feature/src/main/features/distribution.json
b/feature/src/main/features/distribution.json
index d909b193..d1904da5 100644
--- a/feature/src/main/features/distribution.json
+++ b/feature/src/main/features/distribution.json
@@ -1,7 +1,7 @@
{
"bundles":[
{
- "id":"org.apache.sling:org.apache.sling.distribution.api:0.6.0",
+ "id":"org.apache.sling:org.apache.sling.distribution.api:0.7.0",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/groovy.json
b/feature/src/main/features/groovy.json
index 8813ca4e..217b9d28 100644
--- a/feature/src/main/features/groovy.json
+++ b/feature/src/main/features/groovy.json
@@ -21,7 +21,7 @@
"start-order":"15"
},
{
-
"id":"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.4",
+
"id":"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.5",
"start-order":"15"
},
{
diff --git a/feature/src/main/features/healthcheck.json
b/feature/src/main/features/healthcheck.json
index 48a460b5..9e300493 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -9,7 +9,7 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.generalchecks:3.0.0",
+ "id":"org.apache.felix:org.apache.felix.healthcheck.generalchecks:3.0.2",
"start-order":"5"
},
{
diff --git a/feature/src/main/features/models-jacksonexporter.json
b/feature/src/main/features/models-jacksonexporter.json
index 7228c257..2c0fab9d 100644
--- a/feature/src/main/features/models-jacksonexporter.json
+++ b/feature/src/main/features/models-jacksonexporter.json
@@ -1,11 +1,11 @@
{
"bundles":[
{
- "id":"com.fasterxml.jackson.core:jackson-annotations:${jackson-version}",
+ "id":"com.fasterxml.jackson.core:jackson-annotations:2.13.3",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-core:${jackson-version}",
+ "id":"com.fasterxml.jackson.core:jackson-core:2.13.3",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/oak/oak_base.json
b/feature/src/main/features/oak/oak_base.json
index 9e98e252..a6059224 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -145,7 +145,7 @@
"start-order":"20"
},
{
-
"id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.18",
+
"id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.22",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/scripting.json
b/feature/src/main/features/scripting.json
index ff3d75dd..7c6608fe 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -17,7 +17,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.4",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.8",
"start-order":"20"
},
{
@@ -37,7 +37,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.jsp:2.5.4",
+ "id":"org.apache.sling:org.apache.sling.scripting.jsp:2.6.0",
"start-order":"20"
},
{
@@ -61,7 +61,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.16-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.18-1.4.0",
"start-order":"20"
},
{
@@ -77,7 +77,7 @@
"start-order":"20"
},
{
-
"id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.14.RELEASE_1",
+
"id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.15.RELEASE_1",
"start-order":"20"
},
{
@@ -93,7 +93,7 @@
"start-order":"20"
},
{
- "id":"org.javassist:javassist:3.28.0-GA",
+ "id":"org.javassist:javassist:3.29.0-GA",
"start-order":"20"
}
],
diff --git a/pom.xml b/pom.xml
index 557fd85b..0b33ea23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,39 +30,39 @@
<project.build.outputTimestamp>10</project.build.outputTimestamp>
<!-- Common Versions -->
<cms-version>${project.parent.version}</cms-version>
- <asm-version>9.2</asm-version>
+ <asm-version>9.3</asm-version>
<cocoon-serializers-charsets-version>1.0.2</cocoon-serializers-charsets-version>
<commons-io-version>2.11.0</commons-io-version>
<commons-lang3-version>3.12.0</commons-lang3-version>
<commons-text-version>1.9</commons-text-version>
<composum-nodes-version>2.7.1</composum-nodes-version>
<geronimo-atinject_1-0_spec-version>1.2</geronimo-atinject_1-0_spec-version>
- <groovy-version>3.0.10</groovy-version>
+ <groovy-version>3.0.11</groovy-version>
<httpclient-version>4.5.13</httpclient-version>
<jackrabbit-version>2.21.10</jackrabbit-version>
- <jackson-version>2.13.2</jackson-version>
+ <jackson-version>2.13.2.1</jackson-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
- <jsoup-version>1.14.3</jsoup-version>
+ <jsoup-version>1.15.1</jsoup-version>
<jsp-api-version>2.0</jsp-api-version>
<jstl-version>1.2_1</jstl-version>
- <mockito-core-version>4.4.0</mockito-core-version>
+ <mockito-core-version>4.6.1</mockito-core-version>
<oak-version>1.42.0</oak-version>
- <org-apache-sling-api-version>2.24.0</org-apache-sling-api-version>
+ <org-apache-sling-api-version>2.25.4</org-apache-sling-api-version>
<org-apache-sling-caconfig-api-version>1.3.0</org-apache-sling-caconfig-api-version>
<org-apache-sling-commons-johnzon-version>1.2.14</org-apache-sling-commons-johnzon-version>
- <org-apache-sling-engine-version>2.8.0</org-apache-sling-engine-version>
+ <org-apache-sling-engine-version>2.9.0</org-apache-sling-engine-version>
<org-apache-sling-fileoptim-version>0.9.4</org-apache-sling-fileoptim-version>
-
<org-apache-sling-models-api-version>1.4.0</org-apache-sling-models-api-version>
+
<org-apache-sling-models-api-version>1.4.2</org-apache-sling-models-api-version>
<org-apache-sling-scripting-api-version>2.2.0</org-apache-sling-scripting-api-version>
<org-apache-sling-scripting-jsp-taglib-version>2.4.0</org-apache-sling-scripting-jsp-taglib-version>
-
<org-apache-sling-testing-sling-mock-junit4-version>3.2.2</org-apache-sling-testing-sling-mock-junit4-version>
-
<org.apache.felix.webconsole-version>4.7.2</org.apache.felix.webconsole-version>
+
<org-apache-sling-testing-sling-mock-junit4-version>3.3.0</org-apache-sling-testing-sling-mock-junit4-version>
+
<org.apache.felix.webconsole-version>4.8.2</org.apache.felix.webconsole-version>
<osgi-annotation-version>8.1.0</osgi-annotation-version>
<guava-version>15.0</guava-version>
- <pdfbox-version>2.0.25</pdfbox-version>
+ <pdfbox-version>2.0.26</pdfbox-version>
<servlet-api-version>2.5</servlet-api-version>
<slf4j-version>1.7.36</slf4j-version>
- <tika-version>1.28.1</tika-version>
+ <tika-version>1.28.4</tika-version>
</properties>
<modules>
<module>api</module>
