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 2020/11/16 05:18:01 UTC
[karaf] branch master updated: [KARAF-6901] Upgrade to CXF 3.4.0
and Camel 3.6.0
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 612b6bd [KARAF-6901] Upgrade to CXF 3.4.0 and Camel 3.6.0
new c325470 Merge pull request #1249 from jbonofre/KARAF-6901
612b6bd is described below
commit 612b6bdd287dc6530e68ff0e74898c275e0eb2a3
Author: jbonofre <jb...@apache.org>
AuthorDate: Sun Nov 8 07:54:14 2020 +0100
[KARAF-6901] Upgrade to CXF 3.4.0 and Camel 3.6.0
---
examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml | 1 +
.../karaf-soap-example-features/src/main/feature/feature.xml | 5 -----
examples/karaf-soap-example/karaf-soap-example-scr/pom.xml | 5 ++++-
pom.xml | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
index 4e2f2b7..3a0cbc5 100644
--- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
@@ -54,6 +54,7 @@
<instructions>
<Export-Package>org.apache.karaf.examples.soap.blueprint</Export-Package>
<Import-Package>
+ javax.jws;version="[1,3)",
*
</Import-Package>
</instructions>
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 d331a49..3d8305a 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
@@ -22,11 +22,6 @@
<feature name="karaf-soap-example-common" version="${project.version}">
<bundle>mvn:org.apache.karaf.examples/karaf-soap-example-api/${project.version}</bundle>
- <bundle dependency="true">mvn:org.ow2.asm/asm/6.2.1</bundle>
- <bundle dependency="true">mvn:org.ow2.asm/asm-util/6.2.1</bundle>
- <bundle dependency="true">mvn:org.ow2.asm/asm-tree/6.2.1</bundle>
- <bundle dependency="true">mvn:org.ow2.asm/asm-analysis/6.2.1</bundle>
- <bundle dependency="true">mvn:org.ow2.asm/asm-commons/6.2.1</bundle>
</feature>
<feature name="karaf-soap-example-blueprint" version="${project.version}">
diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
index 7d42626..25c2d3c 100644
--- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
@@ -75,7 +75,10 @@
<configuration>
<instructions>
<Export-Package>!*</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ javax.jws;version="[1,3)",
+ *
+ </Import-Package>
<Private-Package>
org.apache.karaf.examples.soap.scr
</Private-Package>
diff --git a/pom.xml b/pom.xml
index adf7b17..abc69d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,9 +144,9 @@
<javax.annotation.version>1.3.1</javax.annotation.version>
<awaitility.version>3.1.6</awaitility.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <camel.version>3.5.0</camel.version>
+ <camel.version>3.6.0</camel.version>
<cglib.bundle.version>3.2.9_1</cglib.bundle.version>
- <cxf.version>3.3.7</cxf.version>
+ <cxf.version>3.4.0</cxf.version>
<jackson.version>2.11.3</jackson.version>
<jna.version>5.6.0</jna.version>
<jaxb.version>2.3.3</jaxb.version>