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 9b4f363 Updating with latest released sling code and fixing an issue
on init where /content was missing.
9b4f363 is described below
commit 9b4f363517619f8e53995f7552c18a63f4cdc99d
Author: Dan Klco <[email protected]>
AuthorDate: Wed Sep 5 17:08:26 2018 -0400
Updating with latest released sling code and fixing an issue on init
where /content was missing.
---
builder/src/main/provisioning/boot.txt | 15 ++++++-----
builder/src/main/provisioning/cms.txt | 37 ++++++++++++++-------------
builder/src/main/provisioning/launchpad.txt | 8 +++---
builder/src/main/provisioning/sling-event.txt | 4 +--
builder/src/main/provisioning/sling.txt | 6 ++---
5 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/builder/src/main/provisioning/boot.txt
b/builder/src/main/provisioning/boot.txt
index 23742f2..31d1ffa 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -33,20 +33,23 @@
slf4j.version=1.7.25
[artifacts]
+ org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1
+ org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.0
+ org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0
+ org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1
+ org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3
+ org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0
+
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.2.11_1
org.slf4j/slf4j-api/${slf4j.version}
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}
org.apache.sling/org.apache.sling.settings/1.3.8
- org.apache.sling/org.apache.sling.fragment.xml/1.0.2
- org.apache.sling/org.apache.sling.fragment.transaction/1.0.0
- org.apache.sling/org.apache.sling.javax.activation/0.1.0
- org.apache.sling/org.apache.sling.fragment.ws/1.0.2
org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
- org.apache.sling/org.apache.sling.installer.core/3.8.12
+ org.apache.sling/org.apache.sling.installer.core/3.9.0
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.sling/org.apache.sling.installer.factory.configuration/1.2.0
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
diff --git a/builder/src/main/provisioning/cms.txt
b/builder/src/main/provisioning/cms.txt
index f5ea599..2059785 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -29,6 +29,25 @@
[:repoinit]
+ # 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
+ create path (sling:OrderedFolder) /content
+
# Service users
create service user sling-rewriter
set ACL for sling-rewriter
@@ -49,24 +68,6 @@
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
diff --git a/builder/src/main/provisioning/launchpad.txt
b/builder/src/main/provisioning/launchpad.txt
index 43f7592..012e575 100644
--- a/builder/src/main/provisioning/launchpad.txt
+++ b/builder/src/main/provisioning/launchpad.txt
@@ -20,9 +20,11 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/6.0.0-2.6.28
+ org.apache.sling/org.apache.sling.launchpad.base/6.0.1-2.6.30
[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
[...]
+
sling.jre-1.8=,java.applet;version="{dollar}{felix.detect.java.version}",java.awt;version="{dollar}{felix.detect.java.version}",java.awt.color;version="{dollar}{felix.detect.java.version}",java.awt.datatransfer;version="{dollar}{felix.detect.java.version}",java.awt.dnd;version="{dollar}{felix.detect.java.version}",java.awt.event;version="{dollar}{felix.detect.java.version}",java.awt.font;version="{dollar}{felix.detect.java.version}",java.awt.geom;version="{dollar}{felix.detect.java.ver
[...]
+
sling.jre-jpms={dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java.se}{dolla
[...]
+
sling.jre.java.xml=,javax.xml;version="2.1.0",javax.xml.datatype;uses:="javax.xml.namespace";version="2.1.0",javax.xml.namespace;version="2.1.0",javax.xml.parsers;uses:="javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers";version="2.1.0",javax.xml.stream;uses:="javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform";version="1.0.0",javax.xml.stream.events;uses:="javax.xml.namespace,javax.xml.stream";version="1.0.0",javax.xml.stream.util;uses
[...]
+
sling.jpms.java.xml={dollar}{sling.jre.java.xml},javax.xml.catalog;uses:="javax.xml.namespace";version="1.0.0"
diff --git a/builder/src/main/provisioning/sling-event.txt
b/builder/src/main/provisioning/sling-event.txt
index 5e69955..f54d952 100644
--- a/builder/src/main/provisioning/sling-event.txt
+++ b/builder/src/main/provisioning/sling-event.txt
@@ -20,7 +20,7 @@
[feature name=sling-event]
[artifacts]
- org.apache.sling/org.apache.sling.event/4.2.10
+ org.apache.sling/org.apache.sling.event/4.2.12
org.apache.sling/org.apache.sling.event.dea/1.1.2
[:repoinit]
@@ -39,4 +39,4 @@
user.mapping=[
"org.apache.sling.event\=sling-event",
"org.apache.sling.event.dea\=sling-event"
- ]
\ No newline at end of file
+ ]
diff --git a/builder/src/main/provisioning/sling.txt
b/builder/src/main/provisioning/sling.txt
index 5c13015..02d1364 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -33,10 +33,10 @@
org.apache.httpcomponents/httpcore-osgi/4.4.9
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.api/2.18.4
org.apache.sling/org.apache.sling.auth.core/1.4.2
org.apache.sling/org.apache.sling.auth.form/1.0.10
- org.apache.sling/org.apache.sling.bundleresource.impl/2.3.0
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
org.apache.sling/org.apache.sling.commons.classloader/1.4.2
org.apache.sling/org.apache.sling.commons.compiler/2.3.6
org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.8
@@ -57,7 +57,7 @@
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
+ org.apache.sling/org.apache.sling.resourceresolver/1.6.6
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
