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 06ae722 CXFXJC-40: Support Jakarta EE 9.0+. Fixing test case
06ae722 is described below
commit 06ae72260d2650eae3976b497e06729def54d393
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jan 6 20:54:27 2022 -0500
CXFXJC-40: Support Jakarta EE 9.0+. Fixing test case
---
dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java | 4 ++--
pom.xml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
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 2d5150d..ca65066 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
@@ -231,14 +231,14 @@ public class DefaultValuePlugin {
} else {
JType type = f.getRawType();
String typeName = type.fullName();
- if ("jakarta.xml.datatype.Duration".equals(typeName)) {
+ if ("javax.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 ("jakarta.xml.datatype.Duration".equals(typeName)) {
+ if ("javax.xml.datatype.Duration".equals(typeName)) {
updateDurationGetter(co, f, co.implClass,
xmlDefaultValue, outline);
}
} else {
diff --git a/pom.xml b/pom.xml
index 4fa6c67..047ce7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<cxf-buildtools-version>3.4.5-SNAPSHOT</cxf-buildtools-version>
<jdk.version>1.8</jdk.version>
<jaxb-version>3.0.1</jaxb-version>
- <jaxb-runtime-version>3.0.1</jaxb-runtime-version>
+ <jaxb-runtime-version>3.0.2</jaxb-runtime-version>
<eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
<downloadSources>true</downloadSources>
@@ -558,17 +558,17 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
+ <version>2.1.0-B1</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>1.2.2</version>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</profile>
