You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/10/17 14:05:51 UTC
[sling-org-apache-sling-karaf-features] 02/04: SLING-9837 Use OSGi
R7 HTTP Service
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit d981410f6d58a9c9937e73f22e0a12c20e4428b0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 17 08:40:03 2020 +0200
SLING-9837 Use OSGi R7 HTTP Service
---
src/main/feature/feature.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 4727968..734bc6e 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -36,8 +36,7 @@
<feature>eventadmin</feature>
<feature>scr</feature>
<feature>management</feature>
- <feature>http</feature>
- <feature>http-whiteboard</feature>
+ <feature>felix-http</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
<feature version="${project.version}">sling-commons-osgi</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
@@ -51,8 +50,6 @@
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.11</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
- <!-- FIX PAXWEB-1250 -->
- <!-- <bundle dependency="true">mvn:org.osgi/org.osgi.service.http.whiteboard/1.1.0</bundle> -->
<capability>
osgi.service;objectClass=org.apache.sling.engine.SlingRequestProcessor <!-- provided by engine -->
</capability>
@@ -534,6 +531,8 @@
<feature name="sling-scripting-jsp" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.4.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.4.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.el-api/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-commons-compiler</feature>