You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/08/25 14:42:55 UTC

[camel] branch master updated: CAMEL-15463: Upgrade Jakarta JAXB to 2.3.3

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 35dfd2d  CAMEL-15463: Upgrade Jakarta JAXB to 2.3.3
35dfd2d is described below

commit 35dfd2d5f960e6bc401fc007fee65d971424e4c4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 25 16:42:28 2020 +0200

    CAMEL-15463: Upgrade Jakarta JAXB to 2.3.3
---
 camel-dependencies/pom.xml   | 4 ++--
 components/camel-cxf/pom.xml | 8 ++++++++
 parent/pom.xml               | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index d5ebbad..ae2c45e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -221,7 +221,7 @@
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
     <glassfish-javax-json>1.0.4</glassfish-javax-json>
-    <glassfish-jaxb-runtime-version>2.3.2</glassfish-jaxb-runtime-version>
+    <glassfish-jaxb-runtime-version>2.3.3</glassfish-jaxb-runtime-version>
     <gmetric4j-version>1.0.10</gmetric4j-version>
     <google-api-client-version>1.22.0</google-api-client-version>
     <google-api-common-version>1.8.1</google-api-common-version>
@@ -296,7 +296,7 @@
     <jackson2-version>2.10.5</jackson2-version>
     <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
     <jakarta-api-version>2.1.5</jakarta-api-version>
-    <jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
+    <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
     <jakarta-mail-version>1.6.5</jakarta-mail-version>
     <jakarta.el-version>3.0.3</jakarta.el-version>
     <jandex-version>2.2.1.Final</jandex-version>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 35c5b97..819a1c4 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -305,6 +305,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- needed by jetty http server to load class: org.jvnet.staxex.util.XMLStreamReaderToXMLStreamWriter -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-osgi</artifactId>
+            <version>${jaxb-version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8924d96..e16efac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -299,9 +299,9 @@
         <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
         <jakarta-api-version>2.1.5</jakarta-api-version>
         <jakarta.el-version>3.0.3</jakarta.el-version>
-        <jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
+        <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
         <glassfish-javax-json>1.0.4</glassfish-javax-json>
-        <glassfish-jaxb-runtime-version>2.3.2</glassfish-jaxb-runtime-version>
+        <glassfish-jaxb-runtime-version>2.3.3</glassfish-jaxb-runtime-version>
         <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
         <jbpm-version>7.42.0.Final</jbpm-version>
         <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>