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 1b689f1aa9fec6be7b1fa199536634d9868df119 Author: Dan Klco <[email protected]> AuthorDate: Mon Aug 6 10:39:32 2018 -0400 Updating versions based on latest released code --- builder/src/main/provisioning/boot.txt | 4 ++-- builder/src/main/provisioning/cms.txt | 13 +++++++++---- builder/src/main/provisioning/composum.txt | 4 ++-- builder/src/main/provisioning/repoinit.txt | 4 ++-- builder/src/main/provisioning/scripting.txt | 10 +++++----- builder/src/main/provisioning/sling-caconfig.txt | 4 ++-- .../src/main/provisioning/sling-models-jacksonexporter.txt | 8 +++++--- builder/src/main/provisioning/sling.txt | 12 ++++++------ 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt index b132164..cd206e2 100644 --- a/builder/src/main/provisioning/boot.txt +++ b/builder/src/main/provisioning/boot.txt @@ -34,7 +34,7 @@ [artifacts] org.slf4j/slf4j-api/${slf4j.version} - org.apache.sling/org.apache.sling.commons.log/5.1.6 + org.apache.sling/org.apache.sling.commons.log/5.1.8 org.apache.sling/org.apache.sling.commons.logservice/1.0.6 org.slf4j/jcl-over-slf4j/${slf4j.version} org.slf4j/log4j-over-slf4j/${slf4j.version} @@ -47,7 +47,7 @@ org.apache.sling/org.apache.sling.installer.core/3.8.12 org.apache.sling/org.apache.sling.installer.provider.file/1.1.0 org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2 - org.apache.felix/org.apache.felix.configadmin/1.9.0 + org.apache.felix/org.apache.felix.configadmin/1.9.2 org.apache.felix/org.apache.felix.eventadmin/1.5.0 org.apache.aries/org.apache.aries.util/1.1.3 # dependency with javax.inject - required for Sling Models (SLING-4710) diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt index 757b336..a04d0e7 100644 --- a/builder/src/main/provisioning/cms.txt +++ b/builder/src/main/provisioning/cms.txt @@ -21,18 +21,23 @@ [artifacts startLevel=20] org.apache.cocoon/cocoon-serializers-charsets/1.0.0 + org.apache.sling/org.apache.sling.fileoptim/0.9.0 org.apache.sling/org.apache.sling.resourcemerger/1.3.6 - org.apache.sling/org.apache.sling.cms.core/1.0.0-SNAPSHOT - org.apache.sling/org.apache.sling.cms.ui/1.0.0-SNAPSHOT - org.apache.sling/org.apache.sling.cms.reference/1.0.0-SNAPSHOT + org.apache.sling/org.apache.sling.cms.core/${cms.version} + org.apache.sling/org.apache.sling.cms.ui/${cms.version} + org.apache.sling/org.apache.sling.cms.reference/${cms.version} [:repoinit] create service user sling-rewriter - set ACL for sling-rewriter allow jcr:read on / end + create service user sling-cms-error + set ACL for sling-cms-error + allow jcr:read on /content + end + create path (sling:OrderedFolder) /etc/usergenerated set ACL for everyone allow jcr:read on /etc/usergenerated diff --git a/builder/src/main/provisioning/composum.txt b/builder/src/main/provisioning/composum.txt index 334eb68..e98c818 100644 --- a/builder/src/main/provisioning/composum.txt +++ b/builder/src/main/provisioning/composum.txt @@ -17,7 +17,7 @@ # under the License. [feature name=composum-console] [variables] - composum.version=1.8.3 + composum.version=1.8.4 [artifacts startLevel=20] @@ -27,4 +27,4 @@ com.composum.sling.core/composum-sling-core-jslibs/${composum.version} com.composum.sling.core/composum-sling-user-management/${composum.version} com.composum.sling.core/composum-sling-package-manager/${composum.version} - org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42 + org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.44 diff --git a/builder/src/main/provisioning/repoinit.txt b/builder/src/main/provisioning/repoinit.txt index 0308aae..eee3ee1 100644 --- a/builder/src/main/provisioning/repoinit.txt +++ b/builder/src/main/provisioning/repoinit.txt @@ -19,8 +19,8 @@ [feature name=repoinit] [artifacts] - org.apache.sling/org.apache.sling.repoinit.parser/1.2.0 - org.apache.sling/org.apache.sling.jcr.repoinit/1.1.6 + org.apache.sling/org.apache.sling.repoinit.parser/1.2.2 + org.apache.sling/org.apache.sling.jcr.repoinit/1.1.8 org.apache.sling/org.apache.sling.provisioning.model/1.8.4 [:repoinit] diff --git a/builder/src/main/provisioning/scripting.txt b/builder/src/main/provisioning/scripting.txt index 1945358..b2b7298 100644 --- a/builder/src/main/provisioning/scripting.txt +++ b/builder/src/main/provisioning/scripting.txt @@ -27,13 +27,13 @@ org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.0 org.apache.sling/org.apache.sling.scripting.el-api/1.0.0 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.3.0 - org.apache.sling/org.apache.sling.scripting.sightly/1.0.46 - org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.16 - org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.18 + org.apache.sling/org.apache.sling.scripting.sightly/1.0.54-1.4.0 + org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.22-1.4.0 + org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.24-1.4.0 org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.26 org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6 - org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.4 - org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.2_1 + org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.6 + org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.9_1 [:repoinit] #<<< SLING-5848 - Define service user and ACLs for Scripting diff --git a/builder/src/main/provisioning/sling-caconfig.txt b/builder/src/main/provisioning/sling-caconfig.txt index 95ed2ca..494b208 100644 --- a/builder/src/main/provisioning/sling-caconfig.txt +++ b/builder/src/main/provisioning/sling-caconfig.txt @@ -17,12 +17,12 @@ # under the License. # # -[feature name=sling-validation] +[feature name=sling-caconfig] [artifacts] org.apache.sling/org.apache.sling.caconfig.api/1.1.0 org.apache.sling/org.apache.sling.caconfig.spi/1.3.2 - org.apache.sling/org.apache.sling.caconfig.impl/1.4.10 + org.apache.sling/org.apache.sling.caconfig.impl/1.4.12 [:repoinit] create path (sling:Folder) /conf diff --git a/builder/src/main/provisioning/sling-models-jacksonexporter.txt b/builder/src/main/provisioning/sling-models-jacksonexporter.txt index d544940..56a2355 100644 --- a/builder/src/main/provisioning/sling-models-jacksonexporter.txt +++ b/builder/src/main/provisioning/sling-models-jacksonexporter.txt @@ -17,9 +17,11 @@ # under the License. # [feature name=models-jacksonexporter] +[variables] + jackson.version=2.9.5 [artifacts] org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.8 - com.fasterxml.jackson.core/jackson-annotations/2.9.3 - com.fasterxml.jackson.core/jackson-core/2.9.3 - com.fasterxml.jackson.core/jackson-databind/2.9.3 + com.fasterxml.jackson.core/jackson-annotations/${jackson.version} + com.fasterxml.jackson.core/jackson-core/${jackson.version} + com.fasterxml.jackson.core/jackson-databind/${jackson.version} diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt index cd8c9a9..8ebb453 100644 --- a/builder/src/main/provisioning/sling.txt +++ b/builder/src/main/provisioning/sling.txt @@ -31,7 +31,7 @@ org.apache.commons/commons-math/2.2 org.apache.geronimo.bundles/commons-httpclient/3.1_2 org.apache.httpcomponents/httpcore-osgi/4.4.9 - org.apache.httpcomponents/httpclient-osgi/4.5.4 + org.apache.httpcomponents/httpclient-osgi/4.5.5 org.apache.sling/org.apache.sling.adapter/2.1.10 org.apache.sling/org.apache.sling.api/2.18.0 org.apache.sling/org.apache.sling.auth.core/1.4.2 @@ -43,9 +43,9 @@ org.apache.sling/org.apache.sling.commons.mime/2.1.10 org.apache.sling/org.apache.sling.commons.osgi/2.4.0 org.apache.sling/org.apache.sling.commons.scheduler/2.7.2 - org.apache.sling/org.apache.sling.commons.threads/3.2.16 + org.apache.sling/org.apache.sling.commons.threads/3.2.18 org.apache.sling/org.apache.sling.engine/2.6.12 - org.apache.sling/org.apache.sling.fsresource/2.1.10 + org.apache.sling/org.apache.sling.fsresource/2.1.12 org.apache.sling/org.apache.sling.hc.api/1.0.2 org.apache.sling/org.apache.sling.hc.core/1.2.10 org.apache.sling/org.apache.sling.hc.webconsole/1.1.2 @@ -56,14 +56,14 @@ org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4 org.apache.sling/org.apache.sling.jcr.resource/3.0.10 org.apache.sling/org.apache.sling.models.api/1.3.6 - org.apache.sling/org.apache.sling.models.impl/1.4.6 + org.apache.sling/org.apache.sling.models.impl/1.4.8 org.apache.sling/org.apache.sling.resourceresolver/1.6.0 org.apache.sling/org.apache.sling.serviceusermapper/1.4.0 org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0 org.apache.sling/org.apache.sling.servlets.get/2.1.30 org.apache.sling/org.apache.sling.servlets.post/2.3.26 org.apache.sling/org.apache.sling.servlets.resolver/2.4.22 - org.apache.sling/org.apache.sling.xss/2.0.4 + org.apache.sling/org.apache.sling.xss/2.0.10 javax.mail/mail/1.5.0-b01 org.apache.geronimo.bundles/jstl/1.2_1 org.apache.felix/org.apache.felix.http.whiteboard/4.0.0 @@ -79,7 +79,7 @@ org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.4 org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4 org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.8 - org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6 + org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.8 org.apache.sling/org.apache.sling.commons.johnzon/1.1.0 org.apache.felix/org.apache.felix.bundlerepository/2.0.10 org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
