You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/05/12 03:01:44 UTC
[sling-org-apache-sling-app-cms] branch master updated: Minor -
updating versions to match starter
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
The following commit(s) were added to refs/heads/master by this push:
new 346a057 Minor - updating versions to match starter
346a057 is described below
commit 346a057da691df6af9f4fcca2397a694de417da1
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Tue May 11 23:01:08 2021 -0400
Minor - updating versions to match starter
---
core/bnd.bnd | 11 +++
feature/pom.xml | 2 +-
feature/src/main/features/base.json | 41 ++++++---
feature/src/main/features/boot.json | 2 +-
feature/src/main/features/cms/dependencies.json | 110 +---------------------
feature/src/main/features/event.json | 2 +-
feature/src/main/features/groovy.json | 116 ++++++++++++++++++++++++
feature/src/main/features/scripting.json | 3 +-
pom.xml | 1 +
9 files changed, 160 insertions(+), 128 deletions(-)
diff --git a/core/bnd.bnd b/core/bnd.bnd
index 8512c3d..3b306a4 100644
--- a/core/bnd.bnd
+++ b/core/bnd.bnd
@@ -1 +1,12 @@
+# a lot of bundle header are generated from pom elements by default: https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin#default-bundle-headers
+Bundle-Category: sling
+# export all versioned packages except for conditional ones (https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
+-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
+# see https://issues.apache.org/jira/browse/SLING-8980
+-snapshot: SNAPSHOT
+# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
+-noextraheaders: true
+# we cannot let bnd-maven-plugin generate it automatically, as Maven applies some inheritance logic which is incorrect for Sling (https://issues.apache.org/jira/browse/SLING-8537)
+Bundle-DocURL: https://sling.apache.org
+
Sling-Model-Packages: org.apache.sling.cms.core.models,org.apache.sling.cms.core.internal.models
diff --git a/feature/pom.xml b/feature/pom.xml
index 26d79e7..529281e 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,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 [...]
+ <replacePropertyVariables>asm-version,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-versi [...]
</configuration>
</execution>
</executions>
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index bef39cc..4783468 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -42,7 +42,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.bundleresource.impl:2.3.2",
+ "id":"org.apache.sling:org.apache.sling.bundleresource.impl:2.3.4",
"start-order":"20"
},
{
@@ -98,11 +98,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.2",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.4",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.serviceusermapper:1.5.2",
+ "id":"org.apache.sling:org.apache.sling.serviceusermapper:1.5.4",
"start-order":"15"
},
{
@@ -150,7 +150,7 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.6",
+ "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.8",
"start-order":"5"
},
{
@@ -174,7 +174,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.auth.core:1.5.0",
+ "id":"org.apache.sling:org.apache.sling.auth.core:1.5.2",
"start-order":"5"
},
{
@@ -182,6 +182,14 @@
"start-order":"5"
},
{
+ "id":"io.dropwizard.metrics:metrics-core:3.2.6",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
+ "start-order":"5"
+ },
+ {
"id":"org.apache.felix:org.apache.felix.http.sslfilter:1.2.6",
"start-order":"10"
},
@@ -202,14 +210,6 @@
"start-order":"10"
},
{
- "id":"io.dropwizard.metrics:metrics-core:3.2.6",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
- "start-order":"15"
- },
- {
"id":"org.apache.sling:org.apache.sling.resource.filter:1.0.0",
"start-order":"15"
},
@@ -218,7 +218,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.6",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.8",
"start-order":"20"
},
{
@@ -265,6 +265,17 @@
"org.apache.sling.commons.log.level":"info",
"org.apache.sling.commons.log.file":"logs/request.log"
},
+ "org.apache.jackrabbit.vault.packaging.impl.PackagingImpl":{
+ "authIdsForRootInstallation":[
+ "sling-package-install"
+ ],
+ "packageRoots":[
+ "/etc/packages"
+ ],
+ "authIdsForHookExecution":[
+ "sling-package-install"
+ ]
+ },
"org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling":{
"whitelist.bundles":[
"org.apache.sling.discovery.commons",
@@ -287,7 +298,7 @@
"org.apache.sling.i18n=[sling-readall]"
]
},
- "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~installer-factories":{
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~installer-packages":{
"user.mapping":[
"org.apache.sling.installer.factory.packages=[sling-package-install]"
]
diff --git a/feature/src/main/features/boot.json b/feature/src/main/features/boot.json
index 85fb56a..ce4d451 100644
--- a/feature/src/main/features/boot.json
+++ b/feature/src/main/features/boot.json
@@ -101,7 +101,7 @@
"start-order": "1"
},
{
- "id": "org.osgi:org.osgi.service.log:1.4.0",
+ "id": "org.osgi:org.osgi.service.log:1.5.0",
"start-order": "1"
},
{
diff --git a/feature/src/main/features/cms/dependencies.json b/feature/src/main/features/cms/dependencies.json
index 3d2fc35..a4ee50a 100644
--- a/feature/src/main/features/cms/dependencies.json
+++ b/feature/src/main/features/cms/dependencies.json
@@ -97,26 +97,6 @@
"start-order": "15"
},
{
- "id": "org.ow2.asm:asm:9.1",
- "start-order": "15"
- },
- {
- "id": "org.ow2.asm:asm-analysis:9.1",
- "start-order": "15"
- },
- {
- "id": "org.ow2.asm:asm-commons:9.1",
- "start-order": "15"
- },
- {
- "id": "org.ow2.asm:asm-tree:9.1",
- "start-order": "15"
- },
- {
- "id": "org.ow2.asm:asm-util:9.1",
- "start-order": "15"
- },
- {
"id": "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.2",
"start-order": "15"
},
@@ -125,94 +105,6 @@
"start-order": "15"
},
{
- "id": "org.codehaus.groovy:groovy:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-ant:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-astbuilder:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-cli-picocli:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-console:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-datetime:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-docgenerator:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-groovydoc:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-groovysh:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-jmx:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-json:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-jsr223:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-macro:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-nio:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-servlet:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-sql:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-swing:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-templates:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-test:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-test-junit5:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-testng:${groovy-version}",
- "start-order": "20"
- },
- {
- "id": "org.codehaus.groovy:groovy-xml:${groovy-version}",
- "start-order": "20"
- },
- {
"id": "org.apache.sling:org.apache.sling.security:1.1.20",
"start-order": "20"
}
@@ -246,4 +138,4 @@
"whitelist.name": "org.apache.sling.serviceuser.webconsole"
}
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/event.json b/feature/src/main/features/event.json
index c0f55b1..da8d8f4 100644
--- a/feature/src/main/features/event.json
+++ b/feature/src/main/features/event.json
@@ -6,7 +6,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.event:4.2.12",
+ "id":"org.apache.sling:org.apache.sling.event:4.2.18",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/groovy.json b/feature/src/main/features/groovy.json
new file mode 100644
index 0000000..cfe515a
--- /dev/null
+++ b/feature/src/main/features/groovy.json
@@ -0,0 +1,116 @@
+{
+ "bundles": [
+ {
+ "id": "org.ow2.asm:asm:${asm-version}",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-analysis:${asm-version}",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-commons:${asm-version}",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-tree:${asm-version}",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-util:${asm-version}",
+ "start-order": "15"
+ },
+ {
+ "id": "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.2",
+ "start-order": "15"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-ant:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-astbuilder:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-cli-picocli:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-console:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-datetime:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-docgenerator:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-groovydoc:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-groovysh:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-jmx:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-json:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-jsr223:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-macro:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-nio:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-servlet:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-sql:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-swing:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-templates:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-test:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-test-junit5:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-testng:${groovy-version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-xml:${groovy-version}",
+ "start-order": "20"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index d0381f4..c08c48c 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -103,7 +103,8 @@
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~scripting":{
"user.mapping":[
"org.apache.sling.scripting.core=[sling-search-path-reader]",
- "org.apache.sling.scripting.sightly.js.provider=[sling-search-path-reader]"
+ "org.apache.sling.scripting.sightly.js.provider=[sling-search-path-reader]",
+ "org.apache.sling.scripting.thymeleaf=[sling-search-path-reader]"
]
}
}
diff --git a/pom.xml b/pom.xml
index 5fec5dc..fc4a5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
<!-- Common Versions -->
<cms-version>${project.parent.version}</cms-version>
+ <asm-version>9.1</asm-version>
<cocoon-serializers-charsets-version>1.0.2</cocoon-serializers-charsets-version>
<commons-io-version>2.8.0</commons-io-version>
<commons-lang3-version>3.12.0</commons-lang3-version>