Skip to content

Commit

Permalink
SLING-11069 - Sync Latest Change from Starter
Browse files Browse the repository at this point in the history
  • Loading branch information
@klcodanr
klcodanr authored Dec 31, 2023
1 parent 6eb6abb commit 863ce07
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 45 deletions.
18 changes: 9 additions & 9 deletions feature/src/main/features/base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -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"
},
{
Expand Down Expand Up @@ -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"
},
{
Expand All @@ -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"
},
{
Expand All @@ -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"
},
{
Expand All @@ -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"
},
{
Expand Down Expand Up @@ -203,15 +203,15 @@
"start-order":"10"
},
{
"id":"org.apache.pdfbox:fontbox:2.0.29",
"id":"org.apache.pdfbox:fontbox:2.0.30",
"start-order":"10"
},
{
"id":"org.apache.pdfbox:jempbox:1.8.17",
"start-order":"10"
},
{
"id":"org.apache.pdfbox:pdfbox:2.0.29",
"id":"org.apache.pdfbox:pdfbox:2.0.30",
"start-order":"10"
},
{
Expand All @@ -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"
}
],
Expand Down
32 changes: 2 additions & 30 deletions feature/src/main/features/boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -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"
},
{
Expand Down
24 changes: 24 additions & 0 deletions feature/src/main/features/groovy.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
{
"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"
Expand Down
4 changes: 2 additions & 2 deletions feature/src/main/features/oak/oak_base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -142,7 +142,7 @@
"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"
}
],
Expand Down
2 changes: 1 addition & 1 deletion feature/src/main/features/scripting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
],
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.13</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>

Expand Down

0 comments on commit 863ce07

Please sign in to comment.