You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/04/17 06:16:07 UTC

[sling-org-apache-sling-starter] branch master updated: Update http.jetty to 4.0.18 and http.bridge to 4.0.12

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 55c5aca  Update http.jetty to 4.0.18 and http.bridge to 4.0.12
55c5aca is described below

commit 55c5acae670b69b0dc7a4e3229b801fee0d26e3d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Apr 17 08:14:56 2020 +0200

    Update http.jetty to 4.0.18 and http.bridge to 4.0.12
---
 src/main/provisioning/boot.txt       | 2 +-
 src/main/provisioning/standalone.txt | 2 +-
 src/main/provisioning/webapp.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index 4bb284f..0577d0a 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -37,7 +37,7 @@
     org.osgi/org.osgi.util.promise/1.1.1
     org.osgi/org.osgi.util.pushstream/1.0.1
     org.osgi/org.osgi.service.log/1.4.0
-    org.osgi/org.osgi.util.converter/1.0.1
+    org.apache.felix/org.apache.felix.converter/1.0.12
     org.apache.sling/org.apache.sling.javax.activation/0.1.0
     org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.1
     org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0
diff --git a/src/main/provisioning/standalone.txt b/src/main/provisioning/standalone.txt
index de82de5..2bac8c2 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.14
+    org.apache.felix/org.apache.felix.http.jetty/4.0.18
diff --git a/src/main/provisioning/webapp.txt b/src/main/provisioning/webapp.txt
index bd35a39..0a1c7b6 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.10
+    org.apache.felix/org.apache.felix.http.bridge/4.0.12