You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/01/07 01:31:26 UTC
[cxf-xjc-utils] branch master updated: CXFXJC-40: Support Jakarta EE 9.0+
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/master by this push:
new a512786 CXFXJC-40: Support Jakarta EE 9.0+
new 9aa7fe1 Merge pull request #10 from reta/CXFXJC-40
a512786 is described below
commit a5127863211ede70660f14bb6be0d1e407cc6006
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 3 10:52:39 2022 -0500
CXFXJC-40: Support Jakarta EE 9.0+
---
boolean-test/pom.xml | 2 +-
boolean/pom.xml | 2 +-
bug671/pom.xml | 2 +-
.../main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java | 4 ++--
bug986/pom.xml | 2 +-
.../main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java | 3 ++-
cxf-xjc-plugin/pom.xml | 2 +-
.../java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java | 4 ++--
dv-test/pom.xml | 2 +-
.../test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java | 12 ++++++------
dv/pom.xml | 2 +-
.../java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java | 15 ++++++++-------
javadoc/pom.xml | 2 +-
.../src/test/resources/anonymousEnum-javadoc-bindings.xjb | 8 ++++----
...mplexTypeWithDocumentedProperties-javadoc-bindings.xjb | 8 ++++----
.../test/resources/enumDocumented-javadoc-bindings.xjb | 8 ++++----
pom.xml | 13 +++++++------
property-listener/pom.xml | 2 +-
.../cxf/xjc/property_listener/PropertyListenerPlugin.java | 3 ++-
runtime/pom.xml | 4 ++--
.../java/org/apache/cxf/xjc/runtime/DataTypeAdapter.java | 2 +-
.../org/apache/cxf/xjc/runtime/JAXBToStringStyle.java | 4 ++--
.../cxf/xjc/runtime/JAXBElementToStringStyleTest.java | 2 +-
ts-test/pom.xml | 2 +-
ts/pom.xml | 2 +-
wsdlextension-test/pom.xml | 2 +-
wsdlextension/pom.xml | 2 +-
.../org/apache/cxf/xjc/wsdlextension/WSDLExtension.java | 5 +++--
28 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index 572d587..718e85f 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/boolean/pom.xml b/boolean/pom.xml
index 9426bea..1c2fa47 100644
--- a/boolean/pom.xml
+++ b/boolean/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
diff --git a/bug671/pom.xml b/bug671/pom.xml
index 0be202a..3770bf0 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java b/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
index ce96d93..92603a2 100644
--- a/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
+++ b/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
@@ -19,12 +19,12 @@
package org.apache.cxf.xjc.bug671;
-
import com.sun.codemodel.JJavaName;
import com.sun.tools.xjc.BadCommandLineException;
import com.sun.tools.xjc.Options;
import com.sun.tools.xjc.Plugin;
-import com.sun.xml.bind.api.impl.NameConverter;
+
+import org.glassfish.jaxb.core.api.impl.NameConverter;
/**
* Modifies the JAXB code model to handle package naming that run into:
diff --git a/bug986/pom.xml b/bug986/pom.xml
index 1dba701..56b139c 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index fd46cdf..1954e7c 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import javax.xml.bind.annotation.XmlSchemaType;
import org.xml.sax.ErrorHandler;
@@ -44,6 +43,8 @@ import com.sun.tools.xjc.Plugin;
import com.sun.tools.xjc.outline.ClassOutline;
import com.sun.tools.xjc.outline.Outline;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
/**
* Modifies the JAXB code model to handle package naming that run into:
* https://jaxb.dev.java.net/issues/show_bug.cgi?id=671
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index cb8d2bd..bd14138 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<prerequisites>
diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
index 776d018..dcf94d6 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
@@ -29,7 +29,6 @@ import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlElementRef;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -51,6 +50,7 @@ import com.sun.tools.xjc.reader.internalizer.AbstractReferenceFinderImpl;
import com.sun.tools.xjc.reader.internalizer.DOMForest;
import com.sun.tools.xjc.reader.xmlschema.parser.XMLSchemaInternalizationLogic;
+import jakarta.xml.bind.annotation.XmlElementRef;
import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtMethod;
@@ -159,7 +159,7 @@ public class XSDToJavaRunner {
opt.classpaths.add(url);
}
if (checkXmlElementRef()) {
- opt.target = SpecVersion.V2_1;
+ opt.target = SpecVersion.V2_3;
}
opt.setSchemaLanguage(Language.XMLSCHEMA);
// set up the context class loader so that the user-specified plugin
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index 7a2023d..07bb027 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
diff --git a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
index 1e5d0b2..7846f96 100644
--- a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
+++ b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
@@ -25,16 +25,16 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import javax.xml.XMLConstants;
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import jakarta.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
import org.apache.cxf.configuration.foo.Foo;
import org.junit.Assert;
diff --git a/dv/pom.xml b/dv/pom.xml
index a7f46f1..4667fde 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
index fcc59df..2d5150d 100644
--- a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
+++ b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.namespace.NamespaceContext;
@@ -64,6 +62,9 @@ import com.sun.xml.xsom.XSTerm;
import com.sun.xml.xsom.XSType;
import com.sun.xml.xsom.XmlString;
+import jakarta.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
+
/**
* Modifies the JAXB code model to initialize fields mapped from schema elements
* with their default value.
@@ -202,7 +203,7 @@ public class DefaultValuePlugin {
String varName = f.getPropertyInfo().getName(false);
JFieldVar var = co.implClass.fields().get(varName);
if (var != null
- && !"javax.xml.ws.wsaddressing.W3CEndpointReference".equals(f.getRawType().fullName())) {
+ && !"jakarta.xml.ws.wsaddressing.W3CEndpointReference".equals(f.getRawType().fullName())) {
var.init(JExpr._new(f.getRawType()));
}
}
@@ -230,14 +231,14 @@ public class DefaultValuePlugin {
} else {
JType type = f.getRawType();
String typeName = type.fullName();
- if ("javax.xml.datatype.Duration".equals(typeName)) {
+ if ("jakarta.xml.datatype.Duration".equals(typeName)) {
updateDurationGetter(co, f, co.implClass, xmlDefaultValue, outline);
}
}
} else if (null == dvExpr) {
JType type = f.getRawType();
String typeName = type.fullName();
- if ("javax.xml.datatype.Duration".equals(typeName)) {
+ if ("jakarta.xml.datatype.Duration".equals(typeName)) {
updateDurationGetter(co, f, co.implClass, xmlDefaultValue, outline);
}
} else {
@@ -251,8 +252,8 @@ public class DefaultValuePlugin {
JDefinedClass cls = po.objectFactoryGenerator().getObjectFactory();
for (JMethod m : cls.methods()) {
String tn = m.type().fullName();
- if (tn.startsWith("javax.xml.bind.JAXBElement<java.util.List<")
- || tn.startsWith("javax.xml.bind.JAXBElement<byte[]>")) {
+ if (tn.startsWith("jakarta.xml.bind.JAXBElement<java.util.List<")
+ || tn.startsWith("jakarta.xml.bind.JAXBElement<byte[]>")) {
JBlock b = m.body();
for (Object o : b.getContents()) {
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index a26ed3c..30429e4 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
diff --git a/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb b/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb
index c78147f..64908dc 100644
--- a/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb
+++ b/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb
@@ -17,10 +17,10 @@
under the License.
-->
<jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
- jaxb:version="2.1" schemaLocation="anonymousEnum.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+ jaxb:version="3.0" schemaLocation="anonymousEnum.xsd"
node="/xs:schema">
<jaxb:bindings node="./xs:element[@name='someElement']/xs:simpleType">
diff --git a/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb b/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb
index f4437bd..7fec413 100644
--- a/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb
+++ b/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb
@@ -17,10 +17,10 @@
under the License.
-->
<jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
- jaxb:version="2.1" schemaLocation="complexTypeWithDocumentedProperties.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+ jaxb:version="3.0" schemaLocation="complexTypeWithDocumentedProperties.xsd"
node="//xs:complexType[@name='ComplexTypeWithDocumentedProperties']/xs:sequence/xs:element[@name='documentedElement']">
<jaxb:property>
diff --git a/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb b/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb
index 45c1758..1dc563c 100644
--- a/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb
+++ b/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb
@@ -17,10 +17,10 @@
under the License.
-->
<jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
- jaxb:version="2.1" schemaLocation="enumDocumented.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+ jaxb:version="3.0" schemaLocation="enumDocumented.xsd"
node="//xs:simpleType[@name='enumDocumented']">
<jaxb:typesafeEnumClass>
diff --git a/pom.xml b/pom.xml
index d1b00cf..4fa6c67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
<packaging>pom</packaging>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Apache CXF XJC Utils</name>
<url>https://cxf.apache.org</url>
@@ -46,7 +46,8 @@
<properties>
<cxf-buildtools-version>3.4.5-SNAPSHOT</cxf-buildtools-version>
<jdk.version>1.8</jdk.version>
- <jaxb-version>2.3.3</jaxb-version>
+ <jaxb-version>3.0.1</jaxb-version>
+ <jaxb-runtime-version>3.0.1</jaxb-runtime-version>
<eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
<downloadSources>true</downloadSources>
@@ -95,17 +96,17 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -305,7 +306,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.6.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index 44a381d..752982c 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java b/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
index e496287..d3e27bf 100644
--- a/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
+++ b/property-listener/src/main/java/org/apache/cxf/xjc/property_listener/PropertyListenerPlugin.java
@@ -26,7 +26,6 @@ import java.lang.reflect.Modifier;
import java.util.List;
import java.util.logging.Logger;
-import javax.xml.bind.annotation.XmlTransient;
import org.xml.sax.ErrorHandler;
@@ -42,6 +41,8 @@ import com.sun.tools.xjc.Options;
import com.sun.tools.xjc.outline.ClassOutline;
import com.sun.tools.xjc.outline.Outline;
+import jakarta.xml.bind.annotation.XmlTransient;
+
/**
* Modifies the JAXB code model to add a PropertyChangeListener to the
* setter methods
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 82cf0eb..0a2fa90 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
@@ -30,7 +30,7 @@
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.decription}</Bundle-Description>
<Import-Package>
- javax.xml.bind*;version="[2,3)",
+ jakarta.xml.bind*;version="[3,4)",
*
</Import-Package>
</instructions>
diff --git a/runtime/src/main/java/org/apache/cxf/xjc/runtime/DataTypeAdapter.java b/runtime/src/main/java/org/apache/cxf/xjc/runtime/DataTypeAdapter.java
index 94ebd62..9cc214a 100644
--- a/runtime/src/main/java/org/apache/cxf/xjc/runtime/DataTypeAdapter.java
+++ b/runtime/src/main/java/org/apache/cxf/xjc/runtime/DataTypeAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cxf.xjc.runtime;
import java.util.Calendar;
import java.util.Date;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
public final class DataTypeAdapter {
diff --git a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
index 94bf373..4c00721 100644
--- a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
+++ b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
@@ -19,11 +19,11 @@
package org.apache.cxf.xjc.runtime;
-import javax.xml.bind.JAXBElement;
-
+import jakarta.xml.bind.JAXBElement;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+
/*
* Override default styles to recognise JAXBElement as needing introspection
*/
diff --git a/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java b/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java
index 71fda21..cf3c707 100644
--- a/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java
+++ b/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java
@@ -20,9 +20,9 @@
package org.apache.cxf.xjc.runtime;
-import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.junit.Assert;
diff --git a/ts-test/pom.xml b/ts-test/pom.xml
index 678351b..9856c12 100644
--- a/ts-test/pom.xml
+++ b/ts-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
diff --git a/ts/pom.xml b/ts/pom.xml
index faff7ae..8fc3915 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index ea21e93..c8ac23c 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/wsdlextension/pom.xml b/wsdlextension/pom.xml
index 3fbae1e..2a57ba2 100644
--- a/wsdlextension/pom.xml
+++ b/wsdlextension/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
index cd2f8a1..7b8bcfc 100644
--- a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
+++ b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.util.logging.Logger;
import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.namespace.QName;
import org.xml.sax.ErrorHandler;
@@ -41,6 +39,9 @@ import com.sun.tools.xjc.Options;
import com.sun.tools.xjc.outline.ClassOutline;
import com.sun.tools.xjc.outline.Outline;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlTransient;
+
public class WSDLExtension {
private static final Logger LOG = Logger.getLogger(WSDLExtension.class.getName()); //NOPMD