This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
The following commit(s) were added to refs/heads/master by this push:
new dfe0f25 SLING-7812 : Update to Apache Felix Http Jetty 4.0.4,
Configadmin 1.9.4 and SCR 2.1.2
dfe0f25 is described below
commit dfe0f2543f4134f33aa9ac1be053a3cfff88c4de
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Aug 7 08:12:53 2018 +0200
SLING-7812 : Update to Apache Felix Http Jetty 4.0.4, Configadmin 1.9.4 and
SCR 2.1.2
---
src/main/provisioning/boot.txt | 2 +-
src/main/provisioning/sling.txt | 2 +-
src/main/provisioning/standalone.txt | 2 +-
src/main/provisioning/webapp.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index cd206e2..23742f2 100644
--- a/src/main/provisioning/boot.txt
+++ b/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/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index e72e122..ec9f13b 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -95,7 +95,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
diff --git a/src/main/provisioning/standalone.txt
b/src/main/provisioning/standalone.txt
index 90459a2..a028ccd 100644
--- a/src/main/provisioning/standalone.txt
+++ b/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/src/main/provisioning/webapp.txt b/src/main/provisioning/webapp.txt
index 9df3edd..5d653b7 100644
--- a/src/main/provisioning/webapp.txt
+++ b/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
