Skip to content

SLING-11069 - Sync Latest Change from Starter #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klcodanr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SLING-11069 - Sync Latest Change from Starter #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions feature/src/main/features/base.json
View file
Open in desktop
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
36 changes: 3 additions & 33 deletions feature/src/main/features/boot.json
View file
Open in desktop
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 Expand Up @@ -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"
}
}
24 changes: 24 additions & 0 deletions feature/src/main/features/groovy.json
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions feature/src/main/features/oak/oak_base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,19 @@
"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"
},
{
"id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.6.0",
"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"
}
],
Expand Down
2 changes: 1 addition & 1 deletion feature/src/main/features/scripting.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion feature/src/main/features/webconsole.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
},
{
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
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.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>

Expand Down