Skip to content

Commit

Permalink
adopt jaxb 3.0.0-M5 in maven plugin
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Sep 4, 2020
1 parent 3e871fa commit 14f25ab
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 22 deletions.
1 change: 1 addition & 0 deletions jaxws-ri/bundles/jaxws-ri/src/main/assembly/assembly.xml
View file
Expand Up @@ -66,6 +66,7 @@
<include>jakarta.jws:jakarta.jws-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
<include>com.sun.activation:jakarta.activation</include>
<include>${project.groupId}:jaxws-rt</include>
<include>${project.groupId}:jaxws-tools</include>
</includes>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/jaxws-maven-plugin/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven JAXWS 2.x Plugin</name>
<name>Maven JAXWS 3.x Plugin</name>
<description>Maven plugin for JAX-WS RI</description>
<version>3.0.0-SNAPSHOT</version>

Expand Down
5 changes: 3 additions & 2 deletions ...s-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/jaxws/bindings-default.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='HelloPortType']">
<jaxws:class name="GreetersPortT"/>
</jaxws:bindings>
Expand Down
5 changes: 3 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/remote-xjc/bindings.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:service[@name='HelloService']">
<jaxws:class name="MyGreeter">
<jaxws:javadoc>Greets someone</jaxws:javadoc>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/a.xml
View file
Expand Up @@ -19,7 +19,7 @@
-->

<bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.1" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings xmlns="https://jakarta.ee/xml/ns/jaxb" version="3.0" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings scd="/type::tns:add">
<class name="SumType"/>
</bindings>
Expand Down
4 changes: 2 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/b.xml
View file
Expand Up @@ -19,9 +19,9 @@
-->

<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions" >
<jaxws:package name="wsimport.test"/>
</jaxws:bindings>
Expand Down
5 changes: 3 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/jaxws/bindings-default.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='HelloPortType']">
<jaxws:class name="GreetersPortT"/>
</jaxws:bindings>
Expand Down
5 changes: 3 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/remote-xjc/bindings.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:service[@name='HelloService']">
<jaxws:class name="MyGreeter">
<jaxws:javadoc>Greets someone</jaxws:javadoc>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/a.xml
View file
Expand Up @@ -19,7 +19,7 @@
-->

<bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.1" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings xmlns="https://jakarta.ee/xml/ns/jaxb" version="3.0" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings scd="/type::tns:add">
<class name="SumType"/>
</bindings>
Expand Down
4 changes: 2 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/b.xml
View file
Expand Up @@ -19,9 +19,9 @@
-->

<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions" >
<jaxws:package name="wsimport.test"/>
</jaxws:bindings>
Expand Down
5 changes: 3 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/jaxws/bindings-default.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='HelloPortType']">
<jaxws:class name="GreetersPortT"/>
</jaxws:bindings>
Expand Down
5 changes: 3 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/remote-xjc/bindings.xjc
View file
Expand Up @@ -19,9 +19,10 @@
-->

<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="https://raw.githubusercontent.com/eclipse-ee4j/metro-jax-ws/master/jaxws-ri/tests/unit/testcases/fromwsdl/additional_header/doclit/server/sample.wsdl"
version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions/wsdl:service[@name='HelloService']">
<jaxws:class name="MyGreeter">
<jaxws:javadoc>Greets someone</jaxws:javadoc>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/a.xml
View file
Expand Up @@ -19,7 +19,7 @@
-->

<bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.1" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings xmlns="https://jakarta.ee/xml/ns/jaxb" version="3.0" xmlns:tns="http://jax_ws_commons.jvnet.org/wsimport/test">
<bindings scd="/type::tns:add">
<class name="SumType"/>
</bindings>
Expand Down
4 changes: 2 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/b.xml
View file
Expand Up @@ -19,9 +19,9 @@
-->

<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="2.0"
<jaxws:bindings wsdlLocation="../AddService.wsdl" version="2.0" jaxb:version="3.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings node="wsdl:definitions" >
<jaxws:package name="wsimport.test"/>
</jaxws:bindings>
Expand Down

0 comments on commit 14f25ab

Please sign in to comment.