cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [cxf] branch master updated: [CXF-7907] Change jaxb-api to jakarta.xml.bind-api artifact dependency
Date Thu, 10 Jan 2019 09:37:23 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 3912e7b  [CXF-7907] Change jaxb-api to jakarta.xml.bind-api artifact dependency
3912e7b is described below

commit 3912e7beb77beb5782abc46488a1f648515c62bc
Author: Dennis Kieselhorst <mail@dekies.de>
AuthorDate: Thu Jan 10 10:37:06 2019 +0100

    [CXF-7907] Change jaxb-api to jakarta.xml.bind-api artifact dependency
---
 osgi/karaf/features/pom.xml       | 12 +++++++++---
 rt/rs/extensions/search/pom.xml   |  6 +++++-
 services/wsn/wsn-core/pom.xml     |  4 ++++
 services/xkms/xkms-itests/pom.xml |  6 +++---
 systests/jaxrs/pom.xml            |  4 ++++
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index e261612..4b313e1 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -36,6 +36,12 @@
             <version>${cxf.karaf.version}</version>
             <type>kar</type>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -142,9 +148,9 @@
                 <version>${cxf.karaf.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>2.3.0</version>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.2</version>
                     </dependency>
                     <dependency>
                         <groupId>javax.activation</groupId>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 708c844..945910b 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -104,7 +104,11 @@
                 <exclusion>
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml</artifactId>                
-                </exclusion>       
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 9a68c3e..2d2aca3 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -118,6 +118,10 @@
                     <artifactId>jaxws-api</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>com.sun.xml.messaging.saaj</groupId>
                     <artifactId>saaj-impl</artifactId>
                 </exclusion>
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 577c876..48a0447 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -81,9 +81,9 @@
             <version>1</version>
         </dependency>
         <dependency>
-             <groupId>javax.xml.bind</groupId>
-             <artifactId>jaxb-api</artifactId>
-             <version>2.2.12</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 5478adb..5cddb17 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -502,6 +502,10 @@
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>


Mime
View raw message