sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [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.
Date Tue, 21 Nov 2017 22:19:56 GMT
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 <karlpauls@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" <commits@sling.apache.org>.

Mime
View raw message