You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/11/21 22:19:55 UTC

[sling-org-apache-sling-starter] branch master updated (61b5323 -> 71197a9)

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.


    from 61b5323  SLING-7258 - org.apache.sling.starter.startup.impl.StartupFilter should return 503 when Sling is starting
     new d1d8412  SLING-7240: Update to launchpad base 5.6.10-2.6.26 and add http.bridge to the webapp.
     new 71197a9  Update to jcr.davex 1.3.10, jcr.resource 3.0.8, fsclassloader 1.0.8, hc.api 1.0.2, and hc.core 1.2.10. Furthermore, remove davex and jcr.resource from the whitelist and add a serviceuser mapping for jcr.resource:validation to the sling-readall.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/provisioning/launchpad.txt                  |  2 +-
 src/main/provisioning/sling.txt                      | 17 ++++++++++-------
 src/main/provisioning/{standalone.txt => webapp.txt} |  9 ++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)
 copy src/main/provisioning/{standalone.txt => webapp.txt} (78%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-starter] 01/02: SLING-7240: Update to launchpad base 5.6.10-2.6.26 and add http.bridge to the webapp.

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git

commit d1d8412ae5896ad20b65bd1454e3a39b6c8823ea
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Nov 21 23:01:42 2017 +0100

    SLING-7240: Update to launchpad base 5.6.10-2.6.26 and add http.bridge to the webapp.
---
 src/main/provisioning/launchpad.txt                 |  2 +-
 src/main/provisioning/{launchpad.txt => webapp.txt} | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/provisioning/launchpad.txt b/src/main/provisioning/launchpad.txt
index 18a3615..da37efd 100644
--- a/src/main/provisioning/launchpad.txt
+++ b/src/main/provisioning/launchpad.txt
@@ -20,4 +20,4 @@
 # Only a single artifact is allowed within this feature.
 #
 [feature name=:launchpad]
-    org.apache.sling/org.apache.sling.launchpad.base/5.6.8-2.6.24
+    org.apache.sling/org.apache.sling.launchpad.base/5.6.10-2.6.26
diff --git a/src/main/provisioning/launchpad.txt b/src/main/provisioning/webapp.txt
similarity index 77%
copy from src/main/provisioning/launchpad.txt
copy to src/main/provisioning/webapp.txt
index 18a3615..3c31b4e 100644
--- a/src/main/provisioning/launchpad.txt
+++ b/src/main/provisioning/webapp.txt
@@ -16,8 +16,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-# The :launchpad feature defines Sling's launchpad version
-# Only a single artifact is allowed within this feature.
+# The :standalone feature contains artifacts for the standalone jar
 #
-[feature name=:launchpad]
-    org.apache.sling/org.apache.sling.launchpad.base/5.6.8-2.6.24
+[feature name=webapp]
+
+# Add the felix servlet bridge for the webapp case
+[artifacts runModes=:webapp]
+    org.apache.felix/org.apache.felix.http.bridge/3.0.18

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-starter] 02/02: Update to jcr.davex 1.3.10, jcr.resource 3.0.8, fsclassloader 1.0.8, hc.api 1.0.2, and hc.core 1.2.10. Furthermore, remove davex and jcr.resource from the whitelist and add a serviceuser mapping for jcr.resource:validation to the sling-readall.

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git

commit 71197a9b874b3d2cf010dac1a780cde99a52de87
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Nov 21 23:05:12 2017 +0100

    Update to jcr.davex 1.3.10, jcr.resource 3.0.8, fsclassloader 1.0.8, hc.api 1.0.2, and hc.core 1.2.10. Furthermore, remove davex and jcr.resource from the whitelist and add a serviceuser mapping for jcr.resource:validation to the sling-readall.
---
 src/main/provisioning/sling.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 5f070f6..d619aa0 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -41,21 +41,21 @@
     org.apache.sling/org.apache.sling.bundleresource.impl/2.3.0
     org.apache.sling/org.apache.sling.commons.classloader/1.4.0
     org.apache.sling/org.apache.sling.commons.compiler/2.3.4
-    org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.6
+    org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.8
     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.10
     org.apache.sling/org.apache.sling.engine/2.6.8
     org.apache.sling/org.apache.sling.fsresource/2.1.8
-    org.apache.sling/org.apache.sling.hc.api/1.0.0
-    org.apache.sling/org.apache.sling.hc.core/1.2.8
+    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
     org.apache.sling/org.apache.sling.i18n/2.5.8
     org.apache.sling/org.apache.sling.installer.console/1.0.2
     org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
     org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4
-    org.apache.sling/org.apache.sling.jcr.resource/3.0.6
+    org.apache.sling/org.apache.sling.jcr.resource/3.0.8
     org.apache.sling/org.apache.sling.launchpad.content/2.0.12
     org.apache.sling/org.apache.sling.models.api/1.3.6
     org.apache.sling/org.apache.sling.models.impl/1.4.4
@@ -114,7 +114,7 @@
     org.apache.jackrabbit/jackrabbit-jcr-rmi/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
     org.apache.sling/org.apache.sling.jcr.webdav/2.3.8
-    org.apache.sling/org.apache.sling.jcr.davex/1.3.8
+    org.apache.sling/org.apache.sling.jcr.davex/1.3.10
     org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.6
     org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.0
     org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
@@ -163,11 +163,9 @@
       "org.apache.sling.i18n",\
       "org.apache.sling.jcr.base",\
       "org.apache.sling.jcr.contentloader",\
-      "org.apache.sling.jcr.davex",\
       "org.apache.sling.jcr.jackrabbit.usermanager",\
       "org.apache.sling.jcr.oak.server",\
       "org.apache.sling.jcr.repoinit",\
-      "org.apache.sling.jcr.resource",\
       "org.apache.sling.jcr.webconsole",\
       "org.apache.sling.servlets.post"
     ]
@@ -214,3 +212,8 @@
     user.mapping=[
       "org.apache.sling.installer.provider.jcr\=sling-jcr-install"
     ]
+
+  org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr-resource
+    user.mapping=[
+      "org.apache.sling.jcr.resource:validation\=sling-readall"
+    ]

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.