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 fe5ed2d Updating to latest dependencies
fe5ed2d is described below
commit fe5ed2d1966701e32f3d845f3632e2abdb0f8996
Author: Dan Klco <[email protected]>
AuthorDate: Thu Aug 23 01:47:05 2018 -0400
Updating to latest dependencies
---
builder/src/main/provisioning/boot.txt | 2 +-
builder/src/main/provisioning/cms.txt | 28 +++++++++++++++++++++++-----
builder/src/main/provisioning/launchpad.txt | 7 ++++++-
builder/src/main/provisioning/repoinit.txt | 20 --------------------
builder/src/main/provisioning/scripting.txt | 2 +-
builder/src/main/provisioning/sling.txt | 10 +++++-----
builder/src/main/provisioning/standalone.txt | 2 +-
builder/src/main/provisioning/webapp.txt | 2 +-
8 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/builder/src/main/provisioning/boot.txt
b/builder/src/main/provisioning/boot.txt
index cd206e2..23742f2 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -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.2
+ org.apache.felix/org.apache.felix.configadmin/1.9.4
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 a04d0e7..f5ea599 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -28,28 +28,46 @@
org.apache.sling/org.apache.sling.cms.reference/${cms.version}
[:repoinit]
+
+ # Service users
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
+ # UGC Support
create path (sling:OrderedFolder) /etc/usergenerated
set ACL for everyone
allow jcr:read on /etc/usergenerated
end
-
- # sling-ugc
create service user sling-ugc
-
set ACL for sling-ugc
allow jcr:all on /etc/usergenerated
end
+ # CMS root paths
+ create path (sling:OrderedFolder) /etc/i18n
+ set ACL for everyone
+ allow jcr:read on /etc/i18n
+ end
+ create path (sling:OrderedFolder) /etc/taxonomy
+ set ACL for everyone
+ allow jcr:read on /etc/taxonomy
+ end
+ create path (sling:OrderedFolder) /static
+ set ACL for everyone
+ allow jcr:read on /static
+ end
+ create path (sling:OrderedFolder) /conf
+ set ACL for everyone
+ allow jcr:read on /conf
+ end
+
+
[configurations]
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling.rewriter
user.mapping=[
@@ -58,4 +76,4 @@
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling.ugc
user.mapping=[
"org.apache.sling.cms.core:sling-ugc\=sling-ugc"
- ]
\ No newline at end of file
+ ]
diff --git a/builder/src/main/provisioning/launchpad.txt
b/builder/src/main/provisioning/launchpad.txt
index da37efd..43f7592 100644
--- a/builder/src/main/provisioning/launchpad.txt
+++ b/builder/src/main/provisioning/launchpad.txt
@@ -20,4 +20,9 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/5.6.10-2.6.26
+ org.apache.sling/org.apache.sling.launchpad.base/6.0.0-2.6.28
+
+[settings]
+
org.osgi.framework.system.packages=org.osgi.framework;version="1.9",org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",org.osgi.framework.launch;version="1.2";uses:="org.osg
[...]
+
sling.jre-1.8=,javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_008_JavaSE",javax.activity;version="0.0.0.1_008_JavaSE",javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_008_JavaSE",javax.annotation;version="0.0.0.1_008_JavaSE",javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_008_JavaSE",javax.crypto.spec;uses:="javax.crypto";version="0.0.0.1_008_JavaSE",javax.cryp
[...]
+
sling.jre-jpms={dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.base}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.compiler}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.desktop}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.management}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.management.rmi}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.naming}}{dollar}{felix.jpms.{dollar}{felix.detect.jpms.java.rmi}}{dollar}{felix.jpms.{dollar}{felix.detect.jpm
[...]
diff --git a/builder/src/main/provisioning/repoinit.txt
b/builder/src/main/provisioning/repoinit.txt
index eee3ee1..b254a62 100644
--- a/builder/src/main/provisioning/repoinit.txt
+++ b/builder/src/main/provisioning/repoinit.txt
@@ -25,30 +25,10 @@
[:repoinit]
# general
- create path (sling:OrderedFolder) /conf
- set ACL for everyone
- allow jcr:read on /conf
- end
-
create path (sling:OrderedFolder) /content
set ACL for everyone
allow jcr:read on /content
end
-
- create path (sling:OrderedFolder) /etc/i18n
- set ACL for everyone
- allow jcr:read on /etc/i18n
- end
-
- create path (sling:OrderedFolder) /etc/taxonomy
- set ACL for everyone
- allow jcr:read on /etc/taxonomy
- end
-
- create path (sling:OrderedFolder) /static
- set ACL for everyone
- allow jcr:read on /static
- end
# sling-mapping
create service user sling-mapping
diff --git a/builder/src/main/provisioning/scripting.txt
b/builder/src/main/provisioning/scripting.txt
index b2b7298..34317f9 100644
--- a/builder/src/main/provisioning/scripting.txt
+++ b/builder/src/main/provisioning/scripting.txt
@@ -29,7 +29,7 @@
org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.3.0
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.compiler.java/1.0.26-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.6
diff --git a/builder/src/main/provisioning/sling.txt
b/builder/src/main/provisioning/sling.txt
index 8ebb453..5c13015 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -44,7 +44,7 @@
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.18
- org.apache.sling/org.apache.sling.engine/2.6.12
+ org.apache.sling/org.apache.sling.engine/2.6.14
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
@@ -54,7 +54,7 @@
org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
org.apache.sling/org.apache.sling.installer.hc/2.0.0
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.jcr.resource/3.0.16
org.apache.sling/org.apache.sling.models.api/1.3.6
org.apache.sling/org.apache.sling.models.impl/1.4.8
org.apache.sling/org.apache.sling.resourceresolver/1.6.0
@@ -63,7 +63,7 @@
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.10
+ org.apache.sling/org.apache.sling.xss/2.0.12
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
@@ -92,7 +92,7 @@
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.4
- org.apache.felix/org.apache.felix.scr/2.1.0
+ org.apache.felix/org.apache.felix.scr/2.1.2
org.apache.felix/org.apache.felix.metatype/1.2.0
org.apache.pdfbox/pdfbox/2.0.9
org.apache.pdfbox/fontbox/2.0.9
@@ -104,7 +104,7 @@
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
org.apache.sling/org.apache.sling.jcr.api/2.4.0
org.apache.sling/org.apache.sling.jcr.base/3.0.4
- org.apache.sling/org.apache.sling.jcr.registration/1.0.4
+ org.apache.sling/org.apache.sling.jcr.registration/1.0.6
org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
org.apache.jackrabbit/jackrabbit-spi/${jackrabbit.version}
diff --git a/builder/src/main/provisioning/standalone.txt
b/builder/src/main/provisioning/standalone.txt
index 90459a2..a028ccd 100644
--- a/builder/src/main/provisioning/standalone.txt
+++ b/builder/src/main/provisioning/standalone.txt
@@ -23,4 +23,4 @@
# Add a servlet implementation for the standalone case
[artifacts startLevel=5 runModes=:standalone]
org.apache.felix/org.apache.felix.http.servlet-api/1.1.2
- org.apache.felix/org.apache.felix.http.jetty/4.0.0
+ org.apache.felix/org.apache.felix.http.jetty/4.0.4
diff --git a/builder/src/main/provisioning/webapp.txt
b/builder/src/main/provisioning/webapp.txt
index 9df3edd..5d653b7 100644
--- a/builder/src/main/provisioning/webapp.txt
+++ b/builder/src/main/provisioning/webapp.txt
@@ -22,4 +22,4 @@
# Add the felix servlet bridge for the webapp case
[artifacts runModes=:webapp]
- org.apache.felix/org.apache.felix.http.bridge/4.0.0
+ org.apache.felix/org.apache.felix.http.bridge/4.0.2
