diff --git a/jaxb/pom.xml b/jaxb/pom.xml index 183f7f13cb..a7f0324bc0 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -25,6 +25,11 @@ commons-lang3 ${commons-lang3.version} + + org.glassfish.jaxb + jaxb-runtime + ${jaxb-runtime.version} + @@ -97,8 +102,9 @@ - 2.3 + 3.1.0 1.0.0 + 4.0.0 \ No newline at end of file diff --git a/jaxb/src/main/java/com/baeldung/jaxb/Book.java b/jaxb/src/main/java/com/baeldung/jaxb/Book.java index b7a5d39ce5..8c78e0f8b0 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/Book.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/Book.java @@ -2,11 +2,11 @@ package com.baeldung.jaxb; import java.util.Date; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java index 6631525619..418f88065f 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java @@ -4,7 +4,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class DateAdapter extends XmlAdapter { diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java index 0625c58344..c61220dd55 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java @@ -1,9 +1,11 @@ package com.baeldung.jaxb.dateunmarshalling; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.datatype.XMLGregorianCalendar; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + + @XmlRootElement(name = "book") public class Book { diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java index c882f37a04..4ecc041d35 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java @@ -1,8 +1,8 @@ package com.baeldung.jaxb.dateunmarshalling; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; @XmlRootElement(name = "book") diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java index 53a780a87a..3d3e988c98 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java @@ -1,8 +1,8 @@ package com.baeldung.jaxb.dateunmarshalling; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalDateTime; @XmlRootElement(name = "book") diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java index 3b0fd0bd26..27484976a4 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java @@ -1,6 +1,6 @@ package com.baeldung.jaxb.dateunmarshalling; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java index 205859b2bf..311156d265 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java @@ -1,8 +1,8 @@ package com.baeldung.jaxb.dateunmarshalling; -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 java.io.InputStream; public class JaxbDateUnmarshalling { diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java index 7fa224334c..5ace605593 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java @@ -1,6 +1,6 @@ package com.baeldung.jaxb.dateunmarshalling; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java index 0a3da677ce..132c41dbb3 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java @@ -1,7 +1,7 @@ package com.baeldung.jaxb.gen; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java index 1c1abc61a6..7ba9064e9e 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java @@ -2,11 +2,11 @@ package com.baeldung.jaxb.gen; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java index b80405e4a9..f35b001a68 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java @@ -3,13 +3,13 @@ package com.baeldung.jaxb.gen; import java.io.Serializable; import java.util.Calendar; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3._2001.xmlschema.Adapter1; diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java index 639d00179c..1818dc82fe 100644 --- a/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java +++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/jaxb/gen", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/jaxb/gen", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.baeldung.jaxb.gen; diff --git a/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java index 54b3c360dc..1607fa7dce 100644 --- a/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java +++ b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java @@ -2,7 +2,7 @@ package org.w3._2001.xmlschema; import java.util.Calendar; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class Adapter1 extends XmlAdapter @@ -10,14 +10,14 @@ public class Adapter1 public Calendar unmarshal(String value) { - return (javax.xml.bind.DatatypeConverter.parseDateTime(value)); + return (jakarta.xml.bind.DatatypeConverter.parseDateTime(value)); } public String marshal(Calendar value) { if (value == null) { return null; } - return (javax.xml.bind.DatatypeConverter.printDateTime(value)); + return (jakarta.xml.bind.DatatypeConverter.printDateTime(value)); } } diff --git a/jaxb/src/main/resources/global.xjb b/jaxb/src/main/resources/global.xjb index de9dcf1577..3cda00b31a 100644 --- a/jaxb/src/main/resources/global.xjb +++ b/jaxb/src/main/resources/global.xjb @@ -1,5 +1,5 @@ - @@ -7,7 +7,7 @@ + parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime" + printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime" /> \ No newline at end of file diff --git a/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java b/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java index 298034be3d..7862a8194f 100644 --- a/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java +++ b/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java @@ -2,7 +2,7 @@ package com.baeldung.jaxb.dateunmarshalling; import org.junit.Test; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java index 77b7f1a0b3..18960b1d9e 100644 --- a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java +++ b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java @@ -6,10 +6,10 @@ import java.io.IOException; import java.util.Date; import java.util.TimeZone; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.apache.commons.io.FileUtils; import org.junit.Assert; diff --git a/jersey/pom.xml b/jersey/pom.xml index 7c7330d84f..cb09247773 100644 --- a/jersey/pom.xml +++ b/jersey/pom.xml @@ -101,6 +101,7 @@ 2.38 + 3.3.2 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 712455351f..9b31ae9750 100644 --- a/pom.xml +++ b/pom.xml @@ -352,8 +352,6 @@ java-jdi java-websocket - jaxb - jersey jhipster-5 jmh @@ -441,8 +439,10 @@ spring-di spring-di-2 spring-ejb-modules + spring-exceptions + spring-integration + spring-jenkins-pipeline - spring-jersey spring-jinq spring-katharsis spring-mobile @@ -578,8 +578,6 @@ java-jdi java-websocket - jaxb - jersey jhipster-5 jmh @@ -658,8 +656,9 @@ spring-di spring-di-2 spring-ejb-modules - - spring-jersey + spring-exceptions + spring-integration + spring-jenkins-pipeline spring-jinq spring-katharsis spring-mobile @@ -797,9 +796,10 @@ - + spring-jersey + jersey + jaxb javafx - spring-batch spring-boot-rest spring-drools @@ -1054,9 +1054,10 @@ - + spring-jersey + jersey + jaxb javafx - spring-batch spring-boot-rest spring-drools diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml index 32f75aa676..17d527ca6a 100644 --- a/spring-jersey/pom.xml +++ b/spring-jersey/pom.xml @@ -221,6 +221,7 @@ 4.5.5 2.27.2 1.5.10.RELEASE + 3.3.2 \ No newline at end of file