Author: veithen
Date: Tue Oct 23 15:54:09 2018
New Revision: 1844666
URL: http://svn.apache.org/viewvc?rev=1844666&view=rev
Log:
Upgrade JAXB and JAX-WS.
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1844666&r1=1844665&r2=1844666&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Tue Oct 23 15:54:09 2018
@@ -188,7 +188,6 @@
<exclude>com.sun.xml.fastinfoset:FastInfoset:jar</exclude>
<exclude>rhino:js:jar</exclude>
<exclude>javax.servlet:servlet-api</exclude>
- <exclude>javax.xml.ws:jaxws-api:jar</exclude>
<exclude>com.sun.xml.messaging.saaj:saaj-impl:jar</exclude>
<exclude>com.sun.xml.stream:sjsxp:jar</exclude>
<exclude>com.sun.org.apache.xml.internal:resolver:jar</exclude>
Modified: axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml?rev=1844666&r1=1844665&r2=1844666&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml Tue Oct 23
15:54:09 2018
@@ -48,8 +48,8 @@
<scope>test</scope>
</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>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1844666&r1=1844665&r2=1844666&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Tue Oct 23 15:54:09 2018
@@ -62,14 +62,8 @@
<artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=1844666&r1=1844665&r2=1844666&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Tue Oct 23 15:54:09 2018
@@ -56,14 +56,8 @@
<artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1844666&r1=1844665&r2=1844666&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Oct 23 15:54:09 2018
@@ -529,8 +529,8 @@
<httpcore.version>4.4.6</httpcore.version>
<httpclient.version>4.5.3</httpclient.version>
<intellij.version>5.0</intellij.version>
- <jaxb.api.version>2.2.6</jaxb.api.version>
- <jaxbri.version>2.2.6</jaxbri.version>
+ <jaxb.api.version>2.3.1</jaxb.api.version>
+ <jaxbri.version>2.3.1</jaxbri.version>
<jettison.version>1.3.8</jettison.version>
<jibx.version>1.3.1</jibx.version>
<log4j.version>1.2.15</log4j.version>
@@ -554,8 +554,8 @@
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
<geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
- <jaxws.tools.version>2.2.6</jaxws.tools.version>
- <jaxws.rt.version>2.2.6</jaxws.rt.version>
+ <jaxws.tools.version>2.3.1</jaxws.tools.version>
+ <jaxws.rt.version>2.3.1</jaxws.rt.version>
<jsr311.api.version>1.1.1</jsr311.api.version>
<!-- This variable is used in some Xdocs and is substituted using
Velocity. Note that
@@ -606,8 +606,8 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<version>${jaxbri.version}</version>
</dependency>
<dependency>
@@ -619,16 +619,6 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -644,24 +634,6 @@
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>${jaxws.rt.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
