SLING-11069 - Sync Latest Change from Starter
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 53ae6a7..ce98366 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -71,7 +71,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.mime:2.2.4",
+ "id":"org.apache.sling:org.apache.sling.commons.mime:2.3.0",
"start-order":"15"
},
{
@@ -83,7 +83,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.engine:2.15.6",
+ "id":"org.apache.sling:org.apache.sling.engine:2.15.10",
"start-order":"20"
},
{
@@ -111,7 +111,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.11.0",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.11.4",
"start-order":"20"
},
{
@@ -131,7 +131,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.xss:2.3.8",
+ "id":"org.apache.sling:org.apache.sling.xss:2.4.0",
"start-order":"20"
},
{
@@ -143,7 +143,7 @@
"start-order":"5"
},
{
- "id":"commons-io:commons-io:2.15.0",
+ "id":"commons-io:commons-io:2.15.1",
"start-order":"5"
},
{
@@ -163,7 +163,7 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.jetty:5.1.2",
+ "id":"org.apache.felix:org.apache.felix.http.jetty:5.1.6",
"start-order":"5"
},
{
@@ -203,7 +203,7 @@
"start-order":"10"
},
{
- "id":"org.apache.pdfbox:fontbox:2.0.29",
+ "id":"org.apache.pdfbox:fontbox:2.0.30",
"start-order":"10"
},
{
@@ -211,7 +211,7 @@
"start-order":"10"
},
{
- "id":"org.apache.pdfbox:pdfbox:2.0.29",
+ "id":"org.apache.pdfbox:pdfbox:2.0.30",
"start-order":"10"
},
{
@@ -235,7 +235,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.44",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.46",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/boot.json b/feature/src/main/features/boot.json
index 975a015..c3757b2 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.commons:commons-lang3:3.13.0",
+ "id":"org.apache.commons:commons-lang3:3.14.0",
"start-order":"1"
},
{
@@ -85,35 +85,7 @@
"start-order":"1"
},
{
- "id": "org.ow2.asm:asm:${asm.version}",
- "start-order": "1"
- },
- {
- "id": "org.ow2.asm:asm-analysis:${asm.version}",
- "start-order": "1"
- },
- {
- "id": "org.ow2.asm:asm-commons:${asm.version}",
- "start-order": "1"
- },
- {
- "id": "org.ow2.asm:asm-tree:${asm.version}",
- "start-order": "1"
- },
- {
- "id": "org.ow2.asm:asm-util:${asm.version}",
- "start-order": "1"
- },
- {
- "id": "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6",
- "start-order": "1"
- },
- {
- "id":"jakarta.json:jakarta.json-api:2.1.3",
- "start-order":"1"
- },
- {
- "id":"org.eclipse.parsson:parsson:1.1.5",
+ "id":"org.apache.sling:org.apache.sling.commons.johnzon:2.0.0",
"start-order":"1"
},
{
@@ -202,8 +174,6 @@
"felix.systempackages.substitution":"true",
"sling.fileinstall.dir":"${sling.home}/install",
"sling.fileinstall.dir.autocreate":"true",
- "felix.cm.config.plugins": "org.apache.felix.configadmin.plugin.interpolation",
- "org.apache.aries.spifly.auto.consumers":"jakarta.json-api",
- "org.apache.aries.spifly.auto.providers": "org.eclipse.parsson"
+ "felix.cm.config.plugins": "org.apache.felix.configadmin.plugin.interpolation"
}
}
diff --git a/feature/src/main/features/groovy.json b/feature/src/main/features/groovy.json
index 559cb0b..546cbb5 100644
--- a/feature/src/main/features/groovy.json
+++ b/feature/src/main/features/groovy.json
@@ -1,6 +1,30 @@
{
"bundles": [
{
+ "id": "org.ow2.asm:asm:${asm.version}",
+ "start-order": "1"
+ },
+ {
+ "id": "org.ow2.asm:asm-analysis:${asm.version}",
+ "start-order": "1"
+ },
+ {
+ "id": "org.ow2.asm:asm-commons:${asm.version}",
+ "start-order": "1"
+ },
+ {
+ "id": "org.ow2.asm:asm-tree:${asm.version}",
+ "start-order": "1"
+ },
+ {
+ "id": "org.ow2.asm:asm-util:${asm.version}",
+ "start-order": "1"
+ },
+ {
+ "id": "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.7",
+ "start-order": "1"
+ },
+ {
"id": "org.apache.groovy:groovy:${groovy.version}",
"start-order": "20"
},
diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index d64eb5c..ac438b8 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -130,7 +130,7 @@
"start-order":"20"
},
{
- "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.7.0",
+ "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.7.2",
"start-order":"20"
},
{
@@ -138,11 +138,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:4.0.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:4.0.2",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.28",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.30",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index f7e7d61..b8d1c47 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -90,7 +90,7 @@
"start-order":"20"
},
{
- "id":"org.javassist:javassist:3.29.2-GA",
+ "id":"org.javassist:javassist:3.30.2-GA",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/webconsole.json b/feature/src/main/features/webconsole.json
index 179362d..02c6665 100644
--- a/feature/src/main/features/webconsole.json
+++ b/feature/src/main/features/webconsole.json
@@ -1,7 +1,7 @@
{
"bundles": [
{
- "id":"org.apache.felix:org.apache.felix.webconsole:4.9.6",
+ "id":"org.apache.felix:org.apache.felix.webconsole:5.0.0",
"start-order":"5"
},
{
diff --git a/pom.xml b/pom.xml
index f03c93d..28ea3dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,15 +35,15 @@
<!-- renovate: depName=org.ow2.asm:asm -->
<asm.version>9.6</asm.version>
<!-- renovate: depName=org.apache.jackrabbit:jackrabbit-jcr-commons -->
- <jackrabbit.version>2.20.12</jackrabbit.version>
+ <jackrabbit.version>2.20.14</jackrabbit.version>
<!-- renovate: depName=org.apache.jackrabbit:oak-api -->
- <oak.version>1.58.0</oak.version>
+ <oak.version>1.60.0</oak.version>
<!-- renovate: depName=org.slf4j:slf4j-api -->
<slf4j.version>1.7.36</slf4j.version>
<!-- renovate: depName=com.composum.nodes:composum-nodes-commons -->
<composum.nodes.version>4.2.2</composum.nodes.version>
<!-- renovate: depName=com.fasterxml.jackson.core:jackson-core -->
- <jackson.version>2.15.3</jackson.version>
+ <jackson.version>2.16.1</jackson.version>
<!-- renovate: depName=org.codehaus.groovy:groovy -->
<groovy.version>4.0.10</groovy.version>
