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/08/05 05:04:38 UTC

[karaf] branch master updated: [KARAF-6373] Upgrade to CXF 3.3.2 to build example on JDK 11 (#906)

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 1eb9f9c  [KARAF-6373] Upgrade to CXF 3.3.2 to build example on JDK 11 (#906)
1eb9f9c is described below

commit 1eb9f9c179bfdf6d5577ba4e7fdc620adc2c5d2d
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Aug 5 07:04:30 2019 +0200

    [KARAF-6373] Upgrade to CXF 3.3.2 to build example on JDK 11 (#906)
    
    [KARAF-6373] Upgrade to CXF 3.3.2 to build example on JDK 11 and use fine grained CXF features instead of the global one
---
 .../karaf-profile-example/karaf-profile-example-registry/pom.xml  | 6 +++---
 examples/karaf-rest-example/pom.xml                               | 2 +-
 .../karaf-soap-example-features/src/main/feature/feature.xml      | 8 ++++++--
 examples/karaf-soap-example/pom.xml                               | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml b/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
index f2bdffe..f4d47cc 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
@@ -32,9 +32,9 @@
     <name>Apache Karaf :: Examples :: Profile :: Registry</name>
 
     <properties>
-        <activemq.version>5.14.3</activemq.version>
-        <camel.version>2.18.1</camel.version>
-        <cxf.version>3.2.6</cxf.version>
+        <activemq.version>5.15.9</activemq.version>
+        <camel.version>2.24.1</camel.version>
+        <cxf.version>3.3.2</cxf.version>
     </properties>
 
     <build>
diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml
index 3c9c7d5..b12477b 100644
--- a/examples/karaf-rest-example/pom.xml
+++ b/examples/karaf-rest-example/pom.xml
@@ -41,7 +41,7 @@
     </modules>
     
     <properties>
-        <cxf.version>3.2.6</cxf.version>
+        <cxf.version>3.3.2</cxf.version>
         <jackson.version>2.9.4</jackson.version>
     </properties>
 
diff --git a/examples/karaf-soap-example/karaf-soap-example-features/src/main/feature/feature.xml b/examples/karaf-soap-example/karaf-soap-example-features/src/main/feature/feature.xml
index faf406b..53af507 100644
--- a/examples/karaf-soap-example/karaf-soap-example-features/src/main/feature/feature.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-features/src/main/feature/feature.xml
@@ -32,12 +32,16 @@
     <feature name="karaf-soap-example-provider" version="${project.version}">
         <feature>karaf-soap-example-common</feature>
         <feature>aries-blueprint</feature>
-        <feature version="${cxf.version}">cxf</feature>
+        <feature version="${cxf.version}">cxf-core</feature>
+        <feature version="${cxf.version}">cxf-jaxws</feature>
+        <feature version="${cxf.version}">cxf-databinding-jaxb</feature>
         <bundle>mvn:org.apache.karaf.examples/karaf-soap-example-provider/${project.version}</bundle>
     </feature>
 
     <feature name="karaf-soap-example-client" version="${project.version}">
-        <feature version="${cxf.version}">cxf</feature>
+        <feature version="${cxf.version}">cxf-core</feature>
+        <feature version="${cxf.version}">cxf-jaxws</feature>
+        <feature version="${cxf.version}">cxf-databinding-jaxb</feature>
         <bundle>mvn:org.apache.karaf.examples/karaf-soap-example-client/${project.version}</bundle>
     </feature>
 
diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml
index 075b991..3b10ade 100644
--- a/examples/karaf-soap-example/pom.xml
+++ b/examples/karaf-soap-example/pom.xml
@@ -40,7 +40,7 @@
     </modules>
     
     <properties>
-        <cxf.version>3.2.6</cxf.version>
+        <cxf.version>3.3.2</cxf.version>
     </properties>
 
 </project>