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/10/30 05:02:43 UTC
[karaf] 01/02: [KARAF-6489] Upgrade to CXF 3.3.4 and Camel 2.24.2.
Use global properties for versions.
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
commit 7604d44ec74544acbb74de4d027bf6cf260624ca
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Oct 28 09:37:23 2019 +0100
[KARAF-6489] Upgrade to CXF 3.3.4 and Camel 2.24.2. Use global properties for versions.
(cherry picked from commit fbe2b0717fdf3f1ec461f625921053cab60a31e7)
---
examples/karaf-camel-example/pom.xml | 6 +-----
.../karaf-profile-example/karaf-profile-example-registry/pom.xml | 6 ------
examples/karaf-rest-example/pom.xml | 4 ----
examples/karaf-soap-example/pom.xml | 4 ----
pom.xml | 2 ++
5 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml
index 961f1d2..6ac93fb 100644
--- a/examples/karaf-camel-example/pom.xml
+++ b/examples/karaf-camel-example/pom.xml
@@ -32,14 +32,10 @@
<packaging>pom</packaging>
<name>Apache Karaf :: Examples :: Camel</name>
- <properties>
- <camel.version>2.23.0</camel.version>
- </properties>
-
<modules>
<module>karaf-camel-example-java</module>
<module>karaf-camel-example-blueprint</module>
<module>karaf-camel-example-features</module>
</modules>
-</project>
\ No newline at end of file
+</project>
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 3c10332..99b64b3 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
@@ -31,12 +31,6 @@
<artifactId>karaf-profile-example-registry</artifactId>
<name>Apache Karaf :: Examples :: Profile :: Registry</name>
- <properties>
- <activemq.version>5.15.9</activemq.version>
- <camel.version>2.24.1</camel.version>
- <cxf.version>3.3.2</cxf.version>
- </properties>
-
<build>
<resources>
<resource>
diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml
index 4bba8cf..5f184f9 100644
--- a/examples/karaf-rest-example/pom.xml
+++ b/examples/karaf-rest-example/pom.xml
@@ -40,8 +40,4 @@
<module>karaf-rest-example-whiteboard</module>
</modules>
- <properties>
- <cxf.version>3.3.2</cxf.version>
- </properties>
-
</project>
diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml
index 2b55790..63ab1c3 100644
--- a/examples/karaf-soap-example/pom.xml
+++ b/examples/karaf-soap-example/pom.xml
@@ -39,8 +39,4 @@
<module>karaf-soap-example-features</module>
</modules>
- <properties>
- <cxf.version>3.3.2</cxf.version>
- </properties>
-
</project>
diff --git a/pom.xml b/pom.xml
index 90f8f0c..146d51e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,9 @@
<asm.version>7.2</asm.version>
<javax.annotation.version>1.3.1</javax.annotation.version>
<awaitility.version>3.1.6</awaitility.version>
+ <camel.version>2.24.2</camel.version>
<cglib.bundle.version>3.2.9_1</cglib.bundle.version>
+ <cxf.version>3.3.4</cxf.version>
<jackson.version>2.10.0</jackson.version>
<jna.version>5.4.0</jna.version>
<jaxb.version>2.3.2</jaxb.version>