Move to Jakarta XML Binding 3wq

jbossws · Nov 2, 2021 · 594ff22 · 594ff22
1 parent f703d2b
commit 594ff22
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 115 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,8 +45,8 @@
     <commons.beanutils.version>1.8.0</commons.beanutils.version>
     <commons.logging.version>1.1.1</commons.logging.version>
     <junit.version>3.8.2</junit.version>
-    <jaxb.api.version>2.1</jaxb.api.version>
-    <jaxb.impl.version>2.1.9</jaxb.impl.version>
+    <jaxb.api.version>3.0.1</jaxb.api.version>
+    <jaxb.impl.version>3.0.0</jaxb.impl.version>
   </properties>
 
   <!-- Dependencies -->
@@ -63,8 +63,8 @@
       <version>${commons.logging.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <version>${jaxb.api.version}</version>
     </dependency>
     <dependency>

diff --git a/src/main/java/org/jboss/jaxb/intros/BindingCustomizationFactory.java b/src/main/java/org/jboss/jaxb/intros/BindingCustomizationFactory.java
@@ -27,7 +27,7 @@
 
 import org.jboss.jaxb.intros.configmodel.JaxbIntros;
 
-import com.sun.xml.bind.api.JAXBRIContext;
+import org.glassfish.jaxb.runtime.api.JAXBRIContext;
 
 /**
  * A factory class that creates BindingCustomization instances using JAXBIntros.

diff --git a/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java b/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java
@@ -35,16 +35,16 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlIDREF;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -56,11 +56,11 @@
 import org.jboss.jaxb.intros.handlers.ClassValue;
 import org.jboss.jaxb.intros.handlers.Handler;
 
-import com.sun.xml.bind.v2.model.annotation.AbstractInlineAnnotationReaderImpl;
-import com.sun.xml.bind.v2.model.annotation.Locatable;
-import com.sun.xml.bind.v2.model.annotation.LocatableAnnotation;
-import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader;
-import com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader;
+import org.glassfish.jaxb.runtime.v2.model.annotation.AbstractInlineAnnotationReaderImpl;
+import org.glassfish.jaxb.core.v2.model.annotation.Locatable;
+import org.glassfish.jaxb.runtime.v2.model.annotation.LocatableAnnotation;
+import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeAnnotationReader;
+import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeInlineAnnotationReader;
 
 /**
  * JAXB Annotation Reader for the JAXB RI context interface.

diff --git a/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java b/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java
@@ -21,9 +21,9 @@
 
 import java.io.InputStream;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.jboss.jaxb.intros.configmodel.JaxbIntros;
 

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java b/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java
@@ -10,12 +10,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-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.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java b/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java
@@ -8,13 +8,13 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-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.XmlSchemaType;
-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.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java b/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java b/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java
@@ -10,13 +10,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java b/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java b/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java
@@ -8,12 +8,12 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java
@@ -8,9 +8,9 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java b/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java
@@ -8,11 +8,11 @@
 
 package org.jboss.jaxb.intros.configmodel;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-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.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java b/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java
@@ -1,9 +1,2 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.09.04 at 10:24:07 AM CEST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jboss.jaxb.intros.configmodel;
diff --git a/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java b/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java
@@ -27,21 +27,21 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.transform.stream.StreamSource;
 
 import junit.framework.TestCase;
 
 import org.jboss.jaxb.intros.configmodel.JaxbIntros;
 import org.jboss.jaxb.intros.testbeans.CustomerOrder;
 
-import com.sun.xml.bind.api.JAXBRIContext;
+import org.glassfish.jaxb.runtime.api.JAXBRIContext;
 
 /**
  * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a>

diff --git a/src/test/java/org/jboss/jaxb/intros/TestBean2.java b/src/test/java/org/jboss/jaxb/intros/TestBean2.java
@@ -19,8 +19,8 @@
  */
 package org.jboss.jaxb.intros;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
 
 /**
  * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a>