Skip to content

Commit d4d2598

Browse files
committed
Update to Jakarta XML and use latest JAXB (3.0.0-M4).
1 parent 571cca0 commit d4d2598

File tree

112 files changed

+211
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+211
-210
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
target
44
.project
55
.settings
6+
*.iml
7+
.idea

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.Map;
77
import java.util.Map.Entry;
88

9-
import javax.xml.bind.JAXBElement;
9+
import jakarta.xml.bind.JAXBElement;
1010

1111
import org.apache.commons.lang3.Validate;
1212
import org.jvnet.jaxb2_commons.codemodel.JCMType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.HashSet;
55
import java.util.Set;
66

7-
import javax.xml.bind.JAXBElement;
7+
import jakarta.xml.bind.JAXBElement;
88

99
import org.apache.commons.lang3.Validate;
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.HashSet;
66
import java.util.Set;
77

8-
import javax.xml.bind.JAXBElement;
8+
import jakarta.xml.bind.JAXBElement;
99

1010
import org.jvnet.jaxb2_commons.codemodel.JConditionable;
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jvnet.jaxb2_commons.plugin.inheritance;
22

3-
import javax.xml.bind.JAXBContext;
4-
import javax.xml.bind.JAXBException;
3+
import jakarta.xml.bind.JAXBContext;
4+
import jakarta.xml.bind.JAXBException;
55
import javax.xml.namespace.QName;
66

77
import org.jvnet.jaxb2_commons.util.CustomizationUtils;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.jvnet.jaxb2_commons.plugin.inheritance;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlRootElement;
6-
import javax.xml.bind.annotation.XmlValue;
7-
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
8-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlRootElement;
6+
import jakarta.xml.bind.annotation.XmlValue;
7+
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
8+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
99

1010
@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "extends")
1111
@XmlAccessorType(XmlAccessType.PROPERTY)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.jvnet.jaxb2_commons.plugin.inheritance;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlRootElement;
6-
import javax.xml.bind.annotation.XmlValue;
7-
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
8-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlRootElement;
6+
import jakarta.xml.bind.annotation.XmlValue;
7+
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
8+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
99

1010
@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "implements")
1111
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jvnet.jaxb2_commons.plugin.inheritance;
22

3-
import javax.xml.bind.annotation.XmlRegistry;
3+
import jakarta.xml.bind.annotation.XmlRegistry;
44

55
@XmlRegistry
66
public class ObjectFactory {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import javax.xml.bind.annotation.XmlAccessType;
7-
import javax.xml.bind.annotation.XmlAccessorType;
8-
import javax.xml.bind.annotation.XmlAttribute;
9-
import javax.xml.bind.annotation.XmlElement;
10-
import javax.xml.bind.annotation.XmlRootElement;
11-
import javax.xml.bind.annotation.XmlType;
6+
import jakarta.xml.bind.annotation.XmlAccessType;
7+
import jakarta.xml.bind.annotation.XmlAccessorType;
8+
import jakarta.xml.bind.annotation.XmlAttribute;
9+
import jakarta.xml.bind.annotation.XmlElement;
10+
import jakarta.xml.bind.annotation.XmlRootElement;
11+
import jakarta.xml.bind.annotation.XmlType;
1212

1313
@XmlRootElement(namespace = "http://jaxb2-commons.dev.java.net/basic/inheritance", name = "objectFactory")
1414
@XmlType(propOrder = { "extendsClass", "implementsInterface" })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.sun.tools.xjc.model.CTypeRef;
3131
import com.sun.tools.xjc.model.CValuePropertyInfo;
3232
import com.sun.tools.xjc.model.Model;
33-
import com.sun.xml.bind.v2.model.core.ID;
33+
import org.glassfish.jaxb.core.v2.model.core.ID;
3434

3535
public class SimplifyPlugin extends AbstractParameterizablePlugin {
3636

0 commit comments

Comments
 (0)