Support for JAXB 3 (#175)

* updated to jaxb 3.0 * Update dependencies * Avoid NPE when testing via IntelliJ IDE * Update to JAXB 3 package * Reinstate previously ignored test * Update to JAXB 3 package * Update for JAXB 3 Co-authored-by: rlfnb <rlfnb@rlfnb.de>
mojohaus · Jan 17, 2021 · 2f5dd20 · 2f5dd20
1 parent 9e8c072
commit 2f5dd20
Show file tree

Hide file tree

Showing 121 changed files with 391 additions and 364 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>jaxb2-maven-plugin</artifactId>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>JAXB-2 Maven Plugin</name>
@@ -79,6 +79,19 @@
         </developer>
     </developers>
 
+    <contributors>
+        <contributor>
+            <name>Adam Retter</name>
+            <email>adam@evolvedbinary.com</email>
+            <organization>Evolved Binary</organization>
+            <organizationUrl>https://www.evolvedbinary.com</organizationUrl>
+            <roles>
+                <role>Patch Contributor</role>
+            </roles>
+            <timezone>Europe/London</timezone>
+        </contributor>
+    </contributors>
+
     <prerequisites>
         <maven>${mavenVersion}</maven>
     </prerequisites>
@@ -101,23 +114,23 @@
     <properties>
         <!-- Define Maven and JDK versions-->
         <mavenVersion>3.0.5</mavenVersion>
-        <mojo.java.target>1.7</mojo.java.target>
+        <mojo.java.target>1.8</mojo.java.target>
 
         <!-- Plexus component versions -->
         <plexus-compiler-api.version>2.5</plexus-compiler-api.version>
         <plexus-utils.version>3.1.0</plexus-utils.version>
         <plexus-build-api.version>0.0.7</plexus-build-api.version>
 
         <!-- JAXB tooling versions -->
-        <jaxb.version>2.3.2</jaxb.version>
-        <stax-ex.version>1.8.1</stax-ex.version>
-        <qdox.version>2.0-M10</qdox.version>
-        <asm.version>7.1</asm.version>
+        <jaxb.version>3.0.0</jaxb.version>
+        <stax-ex.version>2.0.0</stax-ex.version>
+        <qdox.version>2.0.0</qdox.version>
+        <asm.version>9.0</asm.version>
 
         <!-- Test scope dependencies' versions -->
-        <xmlunit.version>2.6.3</xmlunit.version>
+        <xmlunit.version>2.8.1</xmlunit.version>
         <maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
-        <shared-algorithms.version>0.9.3</shared-algorithms.version>
+        <shared-algorithms.version>0.10.3</shared-algorithms.version>
     </properties>
 
     <dependencyManagement>
@@ -130,11 +143,14 @@
             </dependency>
 
             <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-bom</artifactId>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-jxc</artifactId>
                 <version>${jaxb.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
             </dependency>
 
             <dependency>
@@ -168,11 +184,11 @@
             within the JAXB RI artifacts.
         -->
         <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
+            <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
+            <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-jxc</artifactId>
         </dependency>
 
@@ -290,12 +306,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.7</version>
+            <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.istack</groupId>
             <artifactId>istack-commons-runtime</artifactId>
+            <version>4.0.0</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/src/it/mjaxb-14/pom.xml b/src/it/mjaxb-14/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-16/pom.xml b/src/it/mjaxb-16/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 
@@ -69,7 +69,7 @@
                 </executions>
                 <configuration>
                     <packageName>com.example.myschema</packageName>
-                    <target>2.0</target>
+                    <target>3.0</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/mjaxb-16/verify.groovy b/src/it/mjaxb-16/verify.groovy
@@ -43,7 +43,7 @@ File buildLog = new File(basedir, 'build.log')
 def logPattern = "\\| \\[\\p{Digit}+\\]: ";
 def sep = Pattern.quote(System.getProperty("file.separator"));
 Pattern expectedTargetPattern  = Pattern.compile(logPattern + "\\-target");
-Pattern expectedTargetVersionPattern = Pattern.compile(logPattern + "2.0");
+Pattern expectedTargetVersionPattern = Pattern.compile(logPattern + "3.0");
 Pattern expectedExtensionPattern = Pattern.compile(logPattern + "\\-extension");
 Pattern expectedEpisodePattern = Pattern.compile(logPattern + "\\-episode");
 Pattern expectedEpisodeFilePattern = Pattern.compile(logPattern +

diff --git a/src/it/mjaxb-17-warning/pom.xml b/src/it/mjaxb-17-warning/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-17/pom.xml b/src/it/mjaxb-17/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-37/pom.xml b/src/it/mjaxb-37/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-55-partialdefaults/pom.xml b/src/it/mjaxb-55-partialdefaults/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-55-partialdefaults/src/main/java/se/west/schema/FooBar.java b/src/it/mjaxb-55-partialdefaults/src/main/java/se/west/schema/FooBar.java
@@ -1,10 +1,10 @@
 package se.west.schema;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author <a href="mailto:lj@jguru.se">Lennart J&ouml;relid</a>

diff --git a/src/it/mjaxb-55-partialdefaults/src/main/java/se/west/schema/FooBaz.java b/src/it/mjaxb-55-partialdefaults/src/main/java/se/west/schema/FooBaz.java
@@ -1,10 +1,10 @@
 package se.west.schema;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author <a href="mailto:lj@jguru.se">Lennart J&ouml;relid</a>

diff --git a/src/it/mjaxb-55/pom.xml b/src/it/mjaxb-55/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-55/src/main/java/se/west/schema/FooBar.java b/src/it/mjaxb-55/src/main/java/se/west/schema/FooBar.java
@@ -1,10 +1,10 @@
 package se.west.schema;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author <a href="mailto:lj@jguru.se">Lennart J&ouml;relid</a>

diff --git a/src/it/mjaxb-55/src/main/java/se/west/schema/FooBaz.java b/src/it/mjaxb-55/src/main/java/se/west/schema/FooBaz.java
@@ -1,10 +1,10 @@
 package se.west.schema;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author <a href="mailto:lj@jguru.se">Lennart J&ouml;relid</a>

diff --git a/src/it/mjaxb-59/module1/pom.xml b/src/it/mjaxb-59/module1/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>2.3.2</version>
+      <version>3.0.0</version>
     </dependency>
   </dependencies>
 

diff --git a/src/it/mjaxb-59/module1/src/main/java/se/west/gnat/Foo.java b/src/it/mjaxb-59/module1/src/main/java/se/west/gnat/Foo.java
@@ -1,7 +1,7 @@
 package se.west.gnat;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Foo {

diff --git a/src/it/mjaxb-64/pom.xml b/src/it/mjaxb-64/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-64/src/main/java/se/west/shauqra/FooWithEmptyXmlTypeName.java b/src/it/mjaxb-64/src/main/java/se/west/shauqra/FooWithEmptyXmlTypeName.java
@@ -1,10 +1,10 @@
 package se.west.shauqra;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "customerForNamelessFoo", namespace = "http://acme.com/customer-api")
 @XmlType(name = "", namespace = "http://acme.com/customer-api")

diff --git a/src/it/mjaxb-64/src/main/java/se/west/shauqra/FooWithSuppliedXmlTypeName.java b/src/it/mjaxb-64/src/main/java/se/west/shauqra/FooWithSuppliedXmlTypeName.java
@@ -1,10 +1,10 @@
 package se.west.shauqra;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "customerForSomeFoo", namespace = "http://acme.com/customer-api")
 @XmlType(name = "someFoo", namespace = "http://acme.com/customer-api")

diff --git a/src/it/mjaxb-71/pom.xml b/src/it/mjaxb-71/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-71/src/main/fooBarSource/se/west/shauqra/FooWithEmptyXmlTypeName.java b/src/it/mjaxb-71/src/main/fooBarSource/se/west/shauqra/FooWithEmptyXmlTypeName.java
@@ -1,10 +1,10 @@
 package se.west.shauqra;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "customerForNamelessFoo", namespace = "http://acme.com/customer-api")
 @XmlType(name = "", namespace = "http://acme.com/customer-api")

diff --git a/src/it/mjaxb-71/src/main/fooBarSource/se/west/shauqra/FooWithSuppliedXmlTypeName.java b/src/it/mjaxb-71/src/main/fooBarSource/se/west/shauqra/FooWithSuppliedXmlTypeName.java
@@ -1,10 +1,10 @@
 package se.west.shauqra;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "customerForSomeFoo", namespace = "http://acme.com/customer-api")
 @XmlType(name = "someFoo", namespace = "http://acme.com/customer-api")

diff --git a/src/it/mjaxb-80/pom.xml b/src/it/mjaxb-80/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/it/mjaxb-80/src/main/java/org/domain/ImportItemDTO.java b/src/it/mjaxb-80/src/main/java/org/domain/ImportItemDTO.java
@@ -1,10 +1,10 @@
 package org.domain;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(namespace = "http://schema.domain.org/integration/1.0",

diff --git a/src/it/mjaxb-80/src/main/java/org/domain/ImportItemsDTO.java b/src/it/mjaxb-80/src/main/java/org/domain/ImportItemsDTO.java
@@ -1,8 +1,8 @@
 package org.domain;
 
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;