[sling-org-apache-sling-app-cms] branch master updated: Syncing latest changes from starter

[dk...@apache.org]

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 4b689c9  Syncing latest changes from starter
     new 3076e17  Merge branch 'master' of github.com:apache/sling-org-apache-sling-app-cms
4b689c9 is described below

commit 4b689c9c382827802509f04bb5117d1e6d497c8f
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Sep 19 14:25:47 2018 -0400

    Syncing latest changes from starter
---
 builder/src/main/provisioning/boot.txt            | 6 +++---
 builder/src/main/provisioning/sling-discovery.txt | 4 ++--
 builder/src/main/provisioning/sling.txt           | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index 31d1ffa..25607ec 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -33,7 +33,7 @@
     slf4j.version=1.7.25
 
 [artifacts]
-    org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1
+    org.apache.sling/org.apache.sling.javax.activation/0.1.0
     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
@@ -41,7 +41,7 @@
     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.log/5.1.10
     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}
@@ -50,7 +50,7 @@
     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.2.0
-    org.apache.felix/org.apache.felix.configadmin/1.9.4
+    org.apache.felix/org.apache.felix.configadmin/1.9.6
     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/sling-discovery.txt b/builder/src/main/provisioning/sling-discovery.txt
index 6ea7477..5dd0566 100644
--- a/builder/src/main/provisioning/sling-discovery.txt
+++ b/builder/src/main/provisioning/sling-discovery.txt
@@ -17,14 +17,14 @@
 #  under the License.
 #
 #
-[feature name=sling-event]
+[feature name=sling-discovery]
 
 [artifacts]
     org.apache.sling/org.apache.sling.discovery.api/1.0.4
     org.apache.sling/org.apache.sling.discovery.support/1.0.4
     org.apache.sling/org.apache.sling.discovery.commons/1.0.20
     org.apache.sling/org.apache.sling.discovery.base/2.0.8
-    org.apache.sling/org.apache.sling.discovery.oak/1.2.22
+    org.apache.sling/org.apache.sling.discovery.oak/1.2.28
 
 [:repoinit]
     create service user sling-discovery
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index 02d1364..f8df1b2 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -74,7 +74,7 @@
     org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
     org.apache.felix/org.apache.felix.inventory/1.0.6
     org.apache.felix/org.apache.felix.prefs/1.1.0
-    org.apache.felix/org.apache.felix.webconsole/4.3.4
+    org.apache.felix/org.apache.felix.webconsole/4.3.8
     org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.8
     org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.4
     org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4
@@ -114,8 +114,8 @@
     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.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.jackrabbit.usermanager/2.2.8
+    org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.2
     org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
     io.dropwizard.metrics/metrics-core/3.2.6
     org.apache.sling/org.apache.sling.commons.metrics/1.2.4