You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/15 02:26:46 UTC
[cxf-xjc-utils] branch master updated: [CXFXJC-31]upgrade to jaxb
2.3.2
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/master by this push:
new c3737fb [CXFXJC-31]upgrade to jaxb 2.3.2
c3737fb is described below
commit c3737fbde645b5b86a9c418472d4d4d557778934
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Jan 15 10:26:25 2019 +0800
[CXFXJC-31]upgrade to jaxb 2.3.2
---
boolean-test/pom.xml | 10 +++-------
boolean/pom.xml | 7 +++----
bug671/pom.xml | 11 +++--------
bug986/pom.xml | 11 +++--------
cxf-xjc-plugin/pom.xml | 10 +++-------
dv-test/pom.xml | 10 +++-------
dv/pom.xml | 11 +++--------
javadoc/pom.xml | 10 +++-------
pom.xml | 23 +++++------------------
property-listener/pom.xml | 6 +++---
ts-test/pom.xml | 10 +++-------
ts/pom.xml | 6 +++---
wsdlextension-test/pom.xml | 10 +++-------
wsdlextension/pom.xml | 6 +++---
14 files changed, 44 insertions(+), 97 deletions(-)
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index f52b5c7..d486742 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -36,17 +36,13 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
<dependency>
<groupId>jaxme</groupId>
diff --git a/boolean/pom.xml b/boolean/pom.xml
index a3aae14..9190e4c 100644
--- a/boolean/pom.xml
+++ b/boolean/pom.xml
@@ -37,16 +37,15 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
diff --git a/bug671/pom.xml b/bug671/pom.xml
index 285834c..2e7367e 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -37,18 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/bug986/pom.xml b/bug986/pom.xml
index c4e8e9e..57112c0 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -37,18 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index e4162b5..25d6898 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -86,16 +86,12 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index bdc69ab..57100bc 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -39,15 +39,11 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
diff --git a/dv/pom.xml b/dv/pom.xml
index 1f67724..ac2dfa9 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -37,18 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index b918d37..e9c9fa2 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -33,16 +33,12 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 789071f..a149688 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<properties>
<cxf-buildtools-version>3.4.1</cxf-buildtools-version>
<jdk.version>1.8</jdk.version>
- <jaxb-version>2.2.11</jaxb-version>
+ <jaxb-version>2.3.2</jaxb-version>
<eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
<downloadSources>true</downloadSources>
@@ -90,21 +90,16 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-xjc</artifactId>
<version>${jaxb-version}</version>
</dependency>
<dependency>
@@ -590,16 +585,8 @@
<activation>
<jdk>[9,)</jdk>
</activation>
- <properties>
- <jaxb-version>2.3.2</jaxb-version>
- </properties>
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index af1edf3..a360b44 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -37,13 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/ts-test/pom.xml b/ts-test/pom.xml
index 70916c9..0367b44 100644
--- a/ts-test/pom.xml
+++ b/ts-test/pom.xml
@@ -37,17 +37,13 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/ts/pom.xml b/ts/pom.xml
index 879d9da..cef9ae2 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -37,13 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index bc86e9f..93c9660 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -37,17 +37,13 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/wsdlextension/pom.xml b/wsdlextension/pom.xml
index df5a7cb..9b4f25c 100644
--- a/wsdlextension/pom.xml
+++ b/wsdlextension/pom.xml
@@ -37,13 +37,13 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>