Revert "Update to Jakarta XML and use latest JAXB (3.0.0-M4)."

This reverts commit d4d2598.

Author: mattrpav

.gitignore

@@ -3,5 +3,3 @@
 target
 .project
 .settings
-*.iml
-.idea

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import jakarta.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBElement;
 
 import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb2_commons.codemodel.JCMType;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java

@@ -4,7 +4,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jakarta.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBElement;
 
 import org.apache.commons.lang3.Validate;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java

@@ -5,7 +5,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jakarta.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBElement;
 
 import org.jvnet.jaxb2_commons.codemodel.JConditionable;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java

@@ -1,7 +1,7 @@
 package org.jvnet.jaxb2_commons.plugin.inheritance;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
 import org.jvnet.jaxb2_commons.util.CustomizationUtils;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java

@@ -1,11 +1,11 @@
 package org.jvnet.jaxb2_commons.plugin.inheritance;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlValue;
-import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "extends")
 @XmlAccessorType(XmlAccessType.PROPERTY)

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java

@@ -1,11 +1,11 @@
 package org.jvnet.jaxb2_commons.plugin.inheritance;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlValue;
-import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "implements")
 @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb2_commons.plugin.inheritance;
 
-import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlRegistry;
 
 @XmlRegistry
 public class ObjectFactory {

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java

@@ -3,12 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-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.XmlType;
+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.XmlType;
 
 @XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "objectFactory")
 @XmlType(propOrder = { "extendsClass", "implementsInterface" })

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java

@@ -30,7 +30,7 @@
 import com.sun.tools.xjc.model.CTypeRef;
 import com.sun.tools.xjc.model.CValuePropertyInfo;
 import com.sun.tools.xjc.model.Model;
-import org.glassfish.jaxb.core.v2.model.core.ID;
+import com.sun.xml.bind.v2.model.core.ID;
 
 public class SimplifyPlugin extends AbstractParameterizablePlugin {