You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/12/20 09:17:52 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6544] Use atomic CXF
features in examples
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 7ab3b82 [KARAF-6544] Use atomic CXF features in examples
7ab3b82 is described below
commit 7ab3b82c964bda60457178cd6e3e5660acd0d308
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Dec 18 08:22:38 2019 +0100
[KARAF-6544] Use atomic CXF features in examples
(cherry picked from commit 2757f9eaaa1d972cf7fa5704ab58492a94c544f3)
---
.../karaf-rest-example-features/src/main/feature/feature.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
index 1122bb3..46d5c8e 100644
--- a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
@@ -30,7 +30,7 @@
<feature dependency="true">http</feature>
<requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature dependency="true">aries-blueprint</feature>
- <feature version="${cxf.version}" dependency="true">cxf</feature>
+ <feature version="${cxf.version}" dependency="true">cxf-jaxrs</feature>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
@@ -62,7 +62,7 @@
<feature dependency="true">http</feature>
<requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature dependency="true">scr</feature>
- <feature version="${cxf.version}" dependency="true">cxf</feature>
+ <feature version="${cxf.version}" dependency="true">cxf-jaxrs</feature>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>