diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ace4ecc..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/resteasy-2.3.2.Final.tgz -/3.0.1.Final.tar.gz -/3.0.6.Final.tar.gz -/3.0.17.Final.tar.gz -/resteasy-3.0.19.Final.tar.gz -/resteasy-3.0.26.Final.tar.gz -Resteasy-3.0.26.Final diff --git a/0001-RESTEASY-2559-Improper-validation-of-response-header.patch b/0001-RESTEASY-2559-Improper-validation-of-response-header.patch deleted file mode 100644 index 9048abd..0000000 --- a/0001-RESTEASY-2559-Improper-validation-of-response-header.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f58a22382e31c0c4b92e519fa84f701a606981ac Mon Sep 17 00:00:00 2001 -From: Bartosz Spyrko-Smietanko -Date: Thu, 16 Apr 2020 14:01:17 +0100 -Subject: [PATCH] [RESTEASY-2559] Improper validation of response header in - MediaTypeHeaderDelegate.java class - ---- - .../plugins/delegates/MediaTypeHeaderDelegate.java | 1 + - .../test/mediatype/MediaTypeHeaderTest.java | 14 ++++++++++++++ - 2 files changed, 15 insertions(+) - create mode 100644 testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java - -diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java -index db0b4d588..b31d4376e 100755 ---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java -+++ b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java -@@ -89,6 +89,7 @@ public class MediaTypeHeaderDelegate implements RuntimeDelegate.HeaderDelegate - case '[': - case ']': - case '=': -+ case '\n': - return false; - default: - break; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java -new file mode 100644 -index 000000000..e46f018f7 ---- /dev/null -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java -@@ -0,0 +1,14 @@ -+package org.jboss.resteasy.test.mediatype; -+ -+import org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate; -+import org.junit.Test; -+ -+public class MediaTypeHeaderTest { -+ -+ @Test(expected = IllegalArgumentException.class) -+ public void testNewLineInHeaderValueIsRejected() { -+ MediaTypeHeaderDelegate delegate = new MediaTypeHeaderDelegate(); -+ -+ delegate.fromString("foo/bar\n"); -+ } -+} --- -2.26.2 - diff --git a/0001-Remove-Log4jLogger.patch b/0001-Remove-Log4jLogger.patch deleted file mode 100644 index f5335db..0000000 --- a/0001-Remove-Log4jLogger.patch +++ /dev/null @@ -1,163 +0,0 @@ -From d9ad1ff80c45333922fb51e454ee6036b389faa4 Mon Sep 17 00:00:00 2001 -From: "Endi S. Dewata" -Date: Wed, 2 Jun 2021 19:34:16 -0500 -Subject: [PATCH] Remove Log4jLogger - ---- - .../resteasy/logging/impl/Log4jLogger.java | 144 ------------------ - 1 file changed, 144 deletions(-) - delete mode 100644 resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java - -diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java -deleted file mode 100644 -index 6cf43d251..000000000 ---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java -+++ /dev/null -@@ -1,144 +0,0 @@ --package org.jboss.resteasy.logging.impl; -- --import org.apache.log4j.Logger; -- --import java.text.MessageFormat; -- --/** -- * @author Bill Burke -- * @version $Revision: 1 $ -- */ --public class Log4jLogger extends org.jboss.resteasy.logging.Logger --{ -- private transient Logger delegate; -- private String classname; -- -- public Log4jLogger(String classname) -- { -- this.classname = classname; -- delegate = Logger.getLogger(classname); -- } -- -- @Override -- public boolean isTraceEnabled() -- { -- return delegate.isTraceEnabled(); -- } -- -- @Override -- public void trace(String message) -- { -- if (!delegate.isTraceEnabled()) return; -- delegate.trace(message); -- } -- -- @Override -- public void trace(String message, Object... params) -- { -- if (!delegate.isTraceEnabled()) return; -- String msg = MessageFormat.format(message, params); -- delegate.trace(msg); -- } -- -- @Override -- public void trace(String message, Throwable error) -- { -- if (!delegate.isTraceEnabled()) return; -- delegate.trace(message, error); -- } -- -- @Override -- public boolean isDebugEnabled() -- { -- return delegate.isDebugEnabled(); -- } -- -- @Override -- public void debug(String message) -- { -- if (!delegate.isDebugEnabled()) return; -- delegate.debug(message); -- } -- -- @Override -- public void debug(String message, Object... params) -- { -- if (!delegate.isDebugEnabled()) return; -- String msg = MessageFormat.format(message, params); -- delegate.debug(msg); -- } -- -- @Override -- public void debug(String message, Throwable error) -- { -- if (!isDebugEnabled()) return; -- delegate.debug(message, error); -- } -- -- @Override -- public void info(String message) -- { -- if (!(delegate.isInfoEnabled())) return; -- delegate.info(message); -- } -- -- @Override -- public void info(String message, Object... params) -- { -- if (!delegate.isInfoEnabled()) return; -- String msg = MessageFormat.format(message, params); -- delegate.info(msg); -- } -- -- @Override -- public void info(String message, Throwable error) -- { -- if (!delegate.isInfoEnabled()) return; -- delegate.info(message, error); -- } -- -- @Override -- public void warn(String message) -- { -- delegate.warn(message); -- } -- -- @Override -- public void warn(String message, Object... params) -- { -- String msg = MessageFormat.format(message, params); -- delegate.warn(msg); -- } -- -- @Override -- public void warn(String message, Throwable error) -- { -- delegate.warn(message, error); -- } -- -- @Override -- public void error(String message) -- { -- delegate.warn(message); -- } -- -- @Override -- public void error(String message, Object... params) -- { -- String msg = MessageFormat.format(message, params); -- delegate.error(msg); -- } -- -- @Override -- public void error(String message, Throwable error) -- { -- delegate.warn(message, error); -- } -- -- @Override -- public boolean isWarnEnabled() -- { -- return true; -- } -- --} --- -2.31.1 - diff --git a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch deleted file mode 100644 index a8ee88c..0000000 --- a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch +++ /dev/null @@ -1,194 +0,0 @@ -From fdb522bdf915566fc01fc4502404da5a4d73d247 Mon Sep 17 00:00:00 2001 -From: Chris Kelley -Date: Fri, 3 Feb 2023 11:37:13 +0000 -Subject: [PATCH] Replace javax.activation imports with jakarta.activation - ---- - .../plugins/providers/multipart/MimeMultipartProvider.java | 2 +- - .../multipart/XopWithMultipartRelatedJAXBProvider.java | 4 ++-- - .../jboss/resteasy/plugins/providers/DataSourceProvider.java | 2 +- - .../test/client/resource/EntityBufferingInFileResource.java | 2 +- - .../datasource/DataSourceProviderInputStreamTest.java | 2 +- - .../datasource/resource/BigSmallDataSourceResource.java | 2 +- - .../resource/CleanFilesDataSourceProviderResource.java | 2 +- - .../providers/datasource/resource/ReadDataSourceResource.java | 2 +- - .../resource/ReadDataSourceTwiceCountTempFileResource.java | 2 +- - .../test/providers/multipart/MimeMultipartProviderTest.java | 2 +- - .../multipart/resource/MimeMultipartProviderResource.java | 2 +- - .../resource/basic/resource/DefaultMediaTypeResource.java | 2 +- - .../resteasy/test/client/NoContentStreamingCloseTest.java | 2 +- - 13 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java -index adc0d7c21..6c6425fbd 100644 ---- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java -+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java -@@ -5,7 +5,7 @@ import org.jboss.resteasy.spi.ReaderException; - import org.jboss.resteasy.spi.WriterException; - import org.jboss.resteasy.resteasy_jaxrs.i18n.*; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.mail.MessagingException; - import javax.mail.internet.MimeMultipart; - import javax.mail.util.ByteArrayDataSource; -diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -index 52486bcc2..919f6f0a9 100755 ---- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -@@ -3,8 +3,8 @@ package org.jboss.resteasy.plugins.providers.multipart; - import org.jboss.resteasy.plugins.providers.jaxb.AbstractJAXBProvider; - import org.jboss.resteasy.plugins.providers.multipart.i18n.*; - --import javax.activation.DataHandler; --import javax.activation.DataSource; -+import jakarta.activation.DataHandler; -+import jakarta.activation.DataSource; - import javax.ws.rs.WebApplicationException; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; -diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java -index c57bf4587..dc9040a55 100644 ---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java -+++ b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java -@@ -20,7 +20,7 @@ import java.io.SequenceInputStream; - import java.lang.annotation.Annotation; - import java.lang.reflect.Type; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.Consumes; - import javax.ws.rs.Produces; - import javax.ws.rs.WebApplicationException; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java -index 2cc429db1..ad5597f22 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.client.resource; - - import org.jboss.logging.Logger; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java -index 01f3a0926..c4a352890 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java -@@ -22,7 +22,7 @@ import org.junit.Assert; - import org.junit.Test; - import org.junit.runner.RunWith; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.client.Client; - import javax.ws.rs.client.WebTarget; - import javax.ws.rs.core.MediaType; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java -index 58ead73bd..59678be32 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.datasource.resource; - - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.Consumes; - import javax.ws.rs.GET; - import javax.ws.rs.POST; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java -index 9dafd8707..7beb84596 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.datasource.resource; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.GET; - import javax.ws.rs.POST; - import javax.ws.rs.Path; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java -index 84cda755a..8cb767347 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java -@@ -4,7 +4,7 @@ import java.io.BufferedReader; - import java.io.IOException; - import java.io.InputStreamReader; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java -index ce7ea7b4c..bb7f49570 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.datasource.resource; - - import org.jboss.logging.Logger; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -index b8c402833..b06dc04e6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -@@ -22,7 +22,7 @@ import org.junit.AfterClass; - import org.junit.Test; - import org.junit.runner.RunWith; - --import javax.activation.DataHandler; -+import jakarta.activation.DataHandler; - import javax.mail.internet.MimeMultipart; - import javax.mail.util.ByteArrayDataSource; - import javax.servlet.http.HttpServletResponse; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -index 38757425d..435812a84 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -@@ -11,7 +11,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; - import org.jboss.resteasy.plugins.providers.multipart.MultipartRelatedInput; - import org.junit.Assert; - --import javax.activation.DataHandler; -+import jakarta.activation.DataHandler; - import javax.mail.MessagingException; - import javax.mail.internet.MimeBodyPart; - import javax.mail.internet.MimeMultipart; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java -index ba7ce813c..841fdf4cc 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.resource.basic.resource; - - import org.jboss.logging.Logger; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java -index be60dee77..459223c2b 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java -@@ -9,7 +9,7 @@ import org.jboss.resteasy.test.client.resource.NoContentStreamingCloseTestRespon - import org.junit.Assert; - import org.junit.Test; - --import javax.activation.DataSource; -+import jakarta.activation.DataSource; - import javax.xml.transform.Source; - import javax.xml.transform.stream.StreamSource; - import java.io.InputStream; --- -2.39.0 - diff --git a/0001-Update-to-new-jakarta-xml-bind-namespace.patch b/0001-Update-to-new-jakarta-xml-bind-namespace.patch deleted file mode 100644 index a7957e8..0000000 --- a/0001-Update-to-new-jakarta-xml-bind-namespace.patch +++ /dev/null @@ -1,6107 +0,0 @@ -From fffc8129d8144f282007d96d9859cea3162845d4 Mon Sep 17 00:00:00 2001 -From: Chris Kelley -Date: Mon, 6 Feb 2023 10:12:50 +0000 -Subject: [PATCH] Update to new jakarta-xml-bind namespace - ---- - docbook/reference/en/en-US/modules/Jaxb.xml | 2 +- - .../test/providers/atom/AbderaTest.java | 2 +- - .../test/providers/atom/Customer.java | 4 +- - .../jaxb/fastinfoset/FastinfoSetContext.java | 12 +++--- - .../FastinfoSetJAXBContextFinder.java | 4 +- - .../fastinfoset/FastinfoSetMarshaller.java | 16 ++++---- - .../fastinfoset/FastinfoSetUnmarshaller.java | 20 +++++----- - .../providers/jackson/JacksonTest.java | 2 +- - .../annotations/providers/jaxb/Formatted.java | 2 +- - .../providers/jaxb/JAXBConfig.java | 2 +- - .../providers/jaxb/Stylesheet.java | 2 +- - .../annotations/providers/jaxb/XmlHeader.java | 2 +- - .../jaxb/AbstractJAXBContextFinder.java | 8 ++-- - .../providers/jaxb/AbstractJAXBProvider.java | 10 ++--- - .../providers/jaxb/BaseMarshaller.java | 6 +-- - .../providers/jaxb/CollectionProvider.java | 20 +++++----- - .../providers/jaxb/JAXBContextFinder.java | 4 +- - .../providers/jaxb/JAXBContextWrapper.java | 40 +++++++++---------- - .../providers/jaxb/JAXBElementProvider.java | 12 +++--- - .../jaxb/JAXBXmlRootElementProvider.java | 2 +- - .../jaxb/JAXBXmlSeeAlsoProvider.java | 10 ++--- - .../providers/jaxb/JAXBXmlTypeProvider.java | 18 ++++----- - .../providers/jaxb/JaxbCollection.java | 2 +- - .../plugins/providers/jaxb/JaxbMap.java | 12 +++--- - .../plugins/providers/jaxb/MapProvider.java | 22 +++++----- - .../providers/jaxb/PrettyProcessor.java | 2 +- - .../providers/jaxb/SecureUnmarshaller.java | 36 ++++++++--------- - .../providers/jaxb/StylesheetProcessor.java | 6 +-- - .../providers/jaxb/XmlAdapterWrapper.java | 4 +- - .../providers/jaxb/XmlHeaderProcessor.java | 4 +- - .../providers/jaxb/XmlJAXBContextFinder.java | 4 +- - .../jaxb/XmlNamespacePrefixMapper.java | 2 +- - .../plugins/stats/DeleteResourceMethod.java | 2 +- - .../plugins/stats/GetResourceMethod.java | 2 +- - .../plugins/stats/HeadResourceMethod.java | 2 +- - .../plugins/stats/OptionsResourceMethod.java | 2 +- - .../plugins/stats/PostResourceMethod.java | 2 +- - .../plugins/stats/PutResourceMethod.java | 2 +- - .../resteasy/plugins/stats/RegistryData.java | 8 ++-- - .../resteasy/plugins/stats/RegistryEntry.java | 10 ++--- - .../plugins/stats/RegistryStatsResource.java | 2 +- - .../plugins/stats/ResourceMethodEntry.java | 12 +++--- - .../plugins/stats/SubresourceLocator.java | 8 ++-- - .../plugins/stats/TraceResourceMethod.java | 2 +- - .../providers/jaxb/json/BadgerContext.java | 10 ++--- - .../providers/jaxb/json/BadgerMarshaller.java | 12 +++--- - .../jaxb/json/BadgerUnmarshaller.java | 18 ++++----- - .../jaxb/json/JettisonMappedContext.java | 12 +++--- - .../jaxb/json/JettisonMappedMarshaller.java | 14 +++---- - .../jaxb/json/JettisonMappedUnmarshaller.java | 20 +++++----- - .../jaxb/json/JsonCollectionProvider.java | 6 +-- - .../jaxb/json/JsonJAXBContextFinder.java | 4 +- - .../multipart/XopWithMultipartRelated.java | 2 +- - .../XopWithMultipartRelatedJAXBProvider.java | 14 +++---- - .../providers/atom/AtomEntryProvider.java | 6 +-- - .../providers/atom/AtomFeedProvider.java | 6 +-- - .../plugins/providers/atom/BaseLink.java | 6 +-- - .../plugins/providers/atom/Category.java | 8 ++-- - .../providers/atom/CommonAttributes.java | 8 ++-- - .../plugins/providers/atom/Content.java | 22 +++++----- - .../plugins/providers/atom/Entry.java | 24 +++++------ - .../resteasy/plugins/providers/atom/Feed.java | 8 ++-- - .../plugins/providers/atom/Generator.java | 10 ++--- - .../resteasy/plugins/providers/atom/Link.java | 8 ++-- - .../providers/atom/MediaTypeAdapter.java | 2 +- - .../plugins/providers/atom/Person.java | 6 +-- - .../plugins/providers/atom/RelativeLink.java | 6 +-- - .../plugins/providers/atom/Source.java | 10 ++--- - .../resteasy/plugins/providers/atom/Text.java | 22 +++++----- - .../plugins/providers/atom/UriAdapter.java | 2 +- - .../plugins/providers/atom/app/AppAccept.java | 10 ++--- - .../providers/atom/app/AppCategories.java | 18 ++++----- - .../providers/atom/app/AppCollection.java | 14 +++---- - .../atom/app/AppCommonAttributes.java | 22 +++++----- - .../providers/atom/app/AppService.java | 6 +-- - .../providers/atom/app/AppWorkspace.java | 8 ++-- - .../providers/atom/app/BooleanAdapter.java | 2 +- - .../providers/atom/app/package-info.java | 8 ++-- - .../plugins/providers/atom/package-info.java | 8 ++-- - .../api/validation/ViolationReport.java | 6 +-- - .../ResteasyConstraintViolation.java | 6 +-- - .../core/StringParameterInjector.java | 2 +- - .../org/jboss/resteasy/links/AddLinks.java | 2 +- - .../jboss/resteasy/links/ParentResource.java | 2 +- - .../resteasy/links/RESTServiceDiscovery.java | 8 ++-- - .../jboss/resteasy/links/impl/BeanUtils.java | 2 +- - .../resteasy/links/impl/LinkDecorator.java | 4 +- - .../jboss/resteasy/links/package-info.java | 4 +- - .../org/jboss/resteasy/links/test/Book.java | 12 +++--- - .../jboss/resteasy/links/test/Comment.java | 12 +++--- - .../org/jboss/resteasy/links/test/IdBook.java | 8 ++-- - .../jboss/resteasy/links/test/JpaIdBook.java | 2 +- - .../resteasy/links/test/ResourceIdBook.java | 2 +- - .../links/test/ResourceIdMethodBook.java | 2 +- - .../resteasy/links/test/ResourceIdsBook.java | 2 +- - .../links/test/ResourceIdsMethodBook.java | 2 +- - .../links/test/ScrollableCollection.java | 12 +++--- - .../jboss/resteasy/links/test/XmlIdBook.java | 4 +- - .../springmvc/test/jaxb/BasicJaxbObject.java | 2 +- - .../test/resources/TypeMappingResource.java | 2 +- - .../wadl/ResteasyWadlDefaultResource.java | 2 +- - .../wadl/ResteasyWadlServletWriter.java | 6 +-- - .../resteasy/wadl/ResteasyWadlWriter.java | 6 +-- - .../jboss/resteasy/wadl/jaxb/Application.java | 14 +++---- - .../org/jboss/resteasy/wadl/jaxb/Doc.java | 16 ++++---- - .../jboss/resteasy/wadl/jaxb/Grammars.java | 10 ++--- - .../jboss/resteasy/wadl/jaxb/HTTPMethods.java | 4 +- - .../org/jboss/resteasy/wadl/jaxb/Include.java | 14 +++---- - .../org/jboss/resteasy/wadl/jaxb/Link.java | 20 +++++----- - .../org/jboss/resteasy/wadl/jaxb/Method.java | 22 +++++----- - .../resteasy/wadl/jaxb/ObjectFactory.java | 2 +- - .../org/jboss/resteasy/wadl/jaxb/Option.java | 14 +++---- - .../org/jboss/resteasy/wadl/jaxb/Param.java | 22 +++++----- - .../jboss/resteasy/wadl/jaxb/ParamStyle.java | 6 +-- - .../resteasy/wadl/jaxb/Representation.java | 22 +++++----- - .../org/jboss/resteasy/wadl/jaxb/Request.java | 12 +++--- - .../jboss/resteasy/wadl/jaxb/Resource.java | 26 ++++++------ - .../resteasy/wadl/jaxb/ResourceType.java | 26 ++++++------ - .../jboss/resteasy/wadl/jaxb/Resources.java | 18 ++++----- - .../jboss/resteasy/wadl/jaxb/Response.java | 14 +++---- - .../resteasy/wadl/jaxb/package-info.java | 2 +- - .../wadl/wadl/TestWADL_JAXB_Types.java | 4 +- - .../java/org/jboss/resteasy/test/XmlData.java | 2 +- - .../spring/deployment/resource/Contact.java | 2 +- - .../spring/deployment/resource/Contacts.java | 4 +- - .../resource/TypeMappingResource.java | 2 +- - .../spring/inmodule/resource/Contact.java | 2 +- - .../spring/inmodule/resource/Contacts.java | 4 +- - .../resource/TypeMappingResource.java | 2 +- - .../resource/JaxrsAsyncServletXmlData.java | 2 +- - .../resource/BeanReaderWriterXFormat.java | 4 +- - .../test/cdi/basic/resource/EJBBook.java | 8 ++-- - .../cdi/basic/resource/EJBBookReaderImpl.java | 6 +-- - .../cdi/basic/resource/EJBBookWriterImpl.java | 6 +-- - .../injection/resource/ApplicationUser.java | 6 +-- - .../injection/resource/CDIInjectionBook.java | 8 ++-- - .../resource/InterceptorBook.java | 8 ++-- - .../proxy/resource/ProxyJaxbCredit.java | 4 +- - .../ProxyJaxbResourcePostMessage.java | 2 +- - .../AsyncTimeoutExceptionsSticker.java | 4 +- - .../resource/ApplicationFilterCustomer.java | 6 +-- - .../test/core/logging/DebugLoggingTest.java | 4 +- - .../resource/ServletConfigResource.java | 2 +- - .../resteasy/test/form/Resteasy1405Test.java | 6 +-- - .../test/form/resteasy1405/InputData.java | 6 +-- - .../test/form/resteasy1405/MyResource.java | 6 +-- - .../providers/atom/AtomComplexModelTest.java | 6 +-- - .../atom/resource/AtomAssetMetadata.java | 10 ++--- - .../resource/AtomComplexModelArchived.java | 8 ++-- - ...mplexModelAtomAssetMetadataDecorators.java | 2 +- - ...ComplexModelAtomAssetMetadtaProcessor.java | 4 +- - .../resource/AtomComplexModelCategories.java | 8 ++-- - .../AtomComplexModelCheckinComment.java | 8 ++-- - .../resource/AtomComplexModelCreated.java | 8 ++-- - .../resource/AtomComplexModelDisabled.java | 8 ++-- - .../atom/resource/AtomComplexModelFormat.java | 8 ++-- - .../atom/resource/AtomComplexModelNote.java | 8 ++-- - .../atom/resource/AtomComplexModelState.java | 8 ++-- - .../atom/resource/AtomComplexModelUuid.java | 8 ++-- - .../AtomComplexModelVersionNumber.java | 8 ++-- - .../atom/resource/AtomProviderCustomer.java | 8 ++-- - .../AtomProviderDataCollectionRecord.java | 8 ++-- - .../JAXBContextFinderCustomerAtom.java | 8 ++-- - .../providers/atom/resource/LinkProduct.java | 12 +++--- - .../atom/resource/ObjectFactory.java | 6 +-- - .../jackson/resource/JacksonXmlProduct.java | 8 ++-- - .../resource/JacksonXmlResourceWithJAXB.java | 4 +- - ...cksonXmlResourceWithJacksonAnnotation.java | 2 +- - .../jackson2/resource/Jackson2XmlProduct.java | 8 ++-- - .../resource/Jackson2XmlResourceWithJAXB.java | 4 +- - ...kson2XmlResourceWithJacksonAnnotation.java | 2 +- - .../JacksonJaxbCoexistenceProduct2.java | 8 ++-- - .../JacksonJaxbCoexistenceXmlProduct.java | 8 ++-- - .../test/providers/jaxb/JaxbCacheTest.java | 2 +- - .../test/providers/jaxb/JaxbElementTest.java | 2 +- - .../jaxb/JaxbMarshallingSoakTest.java | 4 +- - .../jaxb/JaxbXmlRootElementProviderTest.java | 2 +- - .../resteasy/test/providers/jaxb/MapTest.java | 4 +- - .../providers/jaxb/SeeAlsoAnnotationTest.java | 2 +- - .../jaxb/XmlJAXBContextFinderTest.java | 12 +++--- - .../providers/jaxb/XmlJaxbProvidersTest.java | 4 +- - .../test/providers/jaxb/link/Customer.java | 8 ++-- - .../providers/jaxb/link/package-info.java | 4 +- - .../AbstractJaxbClassCompanyCustomer.java | 6 +-- - .../resource/AbstractJaxbClassCustomer.java | 16 ++++---- - .../resource/AbstractJaxbClassPerson.java | 10 ++--- - .../AbstractJaxbClassPrivatCustomer.java | 6 +-- - .../jaxb/resource/BadContentTypeTestBean.java | 2 +- - .../jaxb/resource/CharSetCustomer.java | 8 ++-- - .../CharSetFavoriteMovieXmlRootElement.java | 2 +- - .../jaxb/resource/CharacterSetData.java | 2 +- - .../test/providers/jaxb/resource/Child.java | 12 +++--- - .../jaxb/resource/CollectionCustomer.java | 8 ++-- - .../CollectionNamespacedCustomer.java | 8 ++-- - .../jaxb/resource/CustomOverrideFoo.java | 2 +- - .../jaxb/resource/EmptyContentTypeFoo.java | 2 +- - .../jaxb/resource/GenericResourceModel.java | 2 +- - .../GenericSuperInterfaceDataCenter.java | 2 +- - .../jaxb/resource/InheritanceAnimal.java | 4 +- - .../jaxb/resource/InheritanceCat.java | 6 +-- - .../jaxb/resource/InheritanceDog.java | 6 +-- - .../jaxb/resource/InheritanceZoo.java | 4 +- - .../test/providers/jaxb/resource/Item.java | 14 +++---- - .../providers/jaxb/resource/Itemtype.java | 8 ++-- - .../providers/jaxb/resource/JAXBCache.java | 4 +- - .../jaxb/resource/JaxbCacheChild.java | 12 +++--- - .../jaxb/resource/JaxbCacheParent.java | 12 +++--- - .../jaxb/resource/JaxbCollectionFoo.java | 8 ++-- - .../resource/JaxbCollectionNamespacedFoo.java | 8 ++-- - .../jaxb/resource/JaxbElementClient.java | 2 +- - .../jaxb/resource/JaxbJsonElementClient.java | 2 +- - .../resource/JaxbMarshallingSoakItem.java | 2 +- - ...eepCharsetFavoriteMovieXmlRootElement.java | 2 +- - .../jaxb/resource/LinkJaxbCustomer.java | 8 ++-- - .../test/providers/jaxb/resource/MapFoo.java | 4 +- - .../test/providers/jaxb/resource/MapJaxb.java | 12 +++--- - .../test/providers/jaxb/resource/Order.java | 12 +++--- - .../providers/jaxb/resource/Ordertype.java | 10 ++--- - .../test/providers/jaxb/resource/Parent.java | 12 +++--- - .../jaxb/resource/QualityFactorThing.java | 2 +- - .../resource/SeeAlsoAnnotationBaseFoo.java | 2 +- - .../resource/SeeAlsoAnnotationFooIntf.java | 2 +- - .../resource/SeeAlsoAnnotationRealFoo.java | 2 +- - .../test/providers/jaxb/resource/ShipTo.java | 14 +++---- - .../providers/jaxb/resource/Shiptotype.java | 8 ++-- - .../jaxb/resource/StreamResetPerson.java | 8 ++-- - .../jaxb/resource/StreamResetPlace.java | 8 ++-- - .../jaxb/resource/StringCharsetRespond.java | 4 +- - .../jaxb/resource/XmlEnumParamLocation.java | 4 +- - .../jaxb/resource/XmlHeaderDecorator.java | 2 +- - .../jaxb/resource/XmlHeaderJunkIntf.java | 2 +- - .../jaxb/resource/XmlHeaderThing.java | 2 +- - .../resource/XmlJavaTypeAdapterAlien.java | 2 +- - .../XmlJavaTypeAdapterAlienAdapter.java | 2 +- - .../jaxb/resource/XmlJavaTypeAdapterFoo.java | 10 ++--- - .../resource/XmlJavaTypeAdapterHuman.java | 8 ++-- - .../jaxb/resource/XmlJaxbProvidersHelper.java | 8 ++-- - .../jaxb/resource/parsing/ObjectFactory.java | 6 +-- - .../resource/parsing/ParsingAbstractData.java | 8 ++-- - .../parsing/ParsingDataCollectionPackage.java | 8 ++-- - .../parsing/ParsingDataCollectionRecord.java | 8 ++-- - .../providers/jettison/JaxbSmokeTest.java | 6 +-- - .../BaseClassFromTypeListCustomer.java | 8 ++-- - .../providers/jettison/resource/Book.java | 6 +-- - .../resource/ContentTypeMatchingError.java | 4 +- - .../jettison/resource/JettisonCustomer.java | 10 ++--- - .../resource/JettisonCustomerList.java | 4 +- - .../resource/JettisonMediaTypeObject.java | 8 ++-- - .../jettison/resource/JsonCollectionFoo.java | 8 ++-- - .../resource/JsonCollectionNamespacedFoo.java | 8 ++-- - .../jettison/resource/JsonMapFoo.java | 4 +- - .../resource/NamespaceMappingTestBase.java | 10 ++--- - .../resource/NamespaceMappingTestExtends.java | 8 ++-- - .../jettison/resource/ObjectFactory.java | 6 +-- - .../jettison/resource/TypeMappingBean.java | 2 +- - .../jettison/resource/UserEntity.java | 8 ++-- - .../multipart/MimeMultipartProviderTest.java | 4 +- - .../resource/ContextProvidersCustomer.java | 8 ++-- - .../resource/ContextProvidersName.java | 8 ++-- - .../resource/ContextProvidersXop.java | 8 ++-- - .../resource/EmbeddedMultipartCustomer.java | 4 +- - ...ltContentTypeWildcardOverwriteXmlBean.java | 6 +-- - .../MimeMultipartProviderCustomer.java | 4 +- - .../MimeMultipartProviderResource.java | 8 ++-- - .../basic/MediaTypeNegotiationTest.java | 2 +- - .../test/sourceProvider/resource/Book.java | 2 +- - .../resource/ContextProvidersCustomer.java | 8 ++-- - .../resource/ContextProvidersName.java | 8 ++-- - .../resource/ContextProvidersXop.java | 8 ++-- - .../resource/CustomExceptionMapperReport.java | 6 +-- - .../test/xxe/SecureProcessing2Test.java | 14 +++---- - .../test/xxe/SecureProcessingTest.java | 14 +++---- - .../test/xxe/XxeSecureProcessingTest.java | 6 +-- - .../ExternalParameterEntityWrapper.java | 2 +- - .../test/xxe/resource/ObjectFactory.java | 6 +-- - .../xxe/resource/SecureProcessingBar.java | 2 +- - .../SecureProcessingFavoriteMovie.java | 8 ++-- - ...ProcessingFavoriteMovieXmlRootElement.java | 2 +- - .../SecureProcessingFavoriteMovieXmlType.java | 8 ++-- - .../resource/SecureProcessingResource.java | 2 +- - ...ProcessingFavoriteMovieXmlRootElement.java | 2 +- - .../xxe/resource/xxeJaxb/ObjectFactory.java | 6 +-- - .../xxeJaxb/XxeJaxbFavoriteMovie.java | 8 ++-- - .../XxeJaxbFavoriteMovieXmlRootElement.java | 2 +- - .../xxeJaxb/XxeJaxbFavoriteMovieXmlType.java | 8 ++-- - .../xxeJaxb/XxeJaxbMovieResource.java | 2 +- - .../resource/xxeJettison/FavoriteMovie.java | 8 ++-- - .../FavoriteMovieXmlRootElement.java | 2 +- - .../xxeJettison/FavoriteMovieXmlType.java | 8 ++-- - .../xxeJettison/JettisonMovieResource.java | 2 +- - .../resource/xxeJettison/ObjectFactory.java | 6 +-- - .../resource/xxeNamespace/FavoriteMovie.java | 8 ++-- - .../FavoriteMovieXmlRootElement.java | 2 +- - .../xxeNamespace/FavoriteMovieXmlType.java | 8 ++-- - .../resource/xxeNamespace/MovieResource.java | 2 +- - .../resource/xxeNamespace/ObjectFactory.java | 8 ++-- - .../interception/DecoratorMatcherTest.java | 10 ++--- - .../test/providers/AppCategoriesTest.java | 8 ++-- - .../providers/AtomProviderAppServiceTest.java | 8 ++-- - .../test/providers/AtomProviderModelTest.java | 4 +- - .../providers/JaxbNamespacePrefixTest.java | 8 ++-- - .../test/providers/NamespaceMappingTest.java | 10 ++--- - .../UserDefinedContextResolverTest.java | 4 +- - .../mapping/NamespaceMappingTestBase.java | 10 ++--- - .../mapping/NamespaceMappingTestExtends.java | 8 ++-- - .../namespace/mapping/ObjectFactory.java | 6 +-- - .../AtomProviderModelCustomerAtom.java | 8 ++-- - .../providers/resource/ObjectFactory.java | 2 +- - .../JaxbNameSpacePrefixItem.java | 12 +++--- - .../JaxbNameSpacePrefixItems.java | 8 ++-- - .../JaxbNameSpacePrefixPurchaseOrderType.java | 12 +++--- - .../JaxbNameSpacePrefixUSAddress.java | 16 ++++---- - .../jaxbNameSpacePrefix/ObjectFactory.java | 6 +-- - .../jaxbNameSpacePrefix/package-info.java | 2 +- - 314 files changed, 1130 insertions(+), 1130 deletions(-) - -diff --git a/docbook/reference/en/en-US/modules/Jaxb.xml b/docbook/reference/en/en-US/modules/Jaxb.xml -index 970040871..00fefda08 100644 ---- a/docbook/reference/en/en-US/modules/Jaxb.xml -+++ b/docbook/reference/en/en-US/modules/Jaxb.xml -@@ -511,7 +511,7 @@ document.getElementById("zone").innerHTML += data.book.author; - JSON namespace mapping. For example, if you defined your JAXB namespace within your package-info.java class like this: - - --@javax.xml.bind.annotation.XmlSchema(namespace="http://jboss.org/books") -+@jakarta.xml.bind.annotation.XmlSchema(namespace="http://jboss.org/books") - package org.jboss.resteasy.test.books; - - -diff --git a/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/AbderaTest.java b/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/AbderaTest.java -index e549014d7..c116669c8 100644 ---- a/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/AbderaTest.java -+++ b/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/AbderaTest.java -@@ -21,7 +21,7 @@ import javax.ws.rs.Produces; - import javax.ws.rs.core.Context; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.UriInfo; --import javax.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBContext; - import java.io.StringReader; - import java.io.StringWriter; - import java.util.Date; -diff --git a/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/Customer.java b/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/Customer.java -index 91f585d41..fc2b9e31c 100644 ---- a/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/Customer.java -+++ b/providers/abdera-atom/src/test/java/org/jboss/resteasy/test/providers/atom/Customer.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.atom; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetContext.java b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetContext.java -index d9a81ebdd..31b5c0929 100644 ---- a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetContext.java -+++ b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetContext.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.jaxb.fastinfoset; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.Validator; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.Validator; - - /** - * @author Bill Burke -@@ -55,4 +55,4 @@ public class FastinfoSetContext extends JAXBContext - } - - --} -\ No newline at end of file -+} -diff --git a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetJAXBContextFinder.java b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetJAXBContextFinder.java -index a2a430c6a..ec75205c9 100644 ---- a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetJAXBContextFinder.java -+++ b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetJAXBContextFinder.java -@@ -10,8 +10,8 @@ import javax.ws.rs.Consumes; - import javax.ws.rs.Produces; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.lang.annotation.Annotation; - - /** -diff --git a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetMarshaller.java b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetMarshaller.java -index e82637948..cc1a7aca5 100644 ---- a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetMarshaller.java -+++ b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetMarshaller.java -@@ -4,13 +4,13 @@ import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer; - import org.w3c.dom.Node; - import org.xml.sax.ContentHandler; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentMarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentMarshaller; - import javax.xml.stream.XMLEventWriter; - import javax.xml.stream.XMLStreamWriter; - import javax.xml.transform.Result; -@@ -179,4 +179,4 @@ public class FastinfoSetMarshaller implements Marshaller - { - return marshaller.getListener(); - } --} -\ No newline at end of file -+} -diff --git a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetUnmarshaller.java b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetUnmarshaller.java -index 9f66f66cd..4d8b0c490 100644 ---- a/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetUnmarshaller.java -+++ b/providers/fastinfoset/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/fastinfoset/FastinfoSetUnmarshaller.java -@@ -6,15 +6,15 @@ import org.jboss.resteasy.plugins.providers.fastinfoset.i18n.Messages; - import org.w3c.dom.Node; - import org.xml.sax.InputSource; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.UnmarshallerHandler; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentUnmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.UnmarshallerHandler; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentUnmarshaller; - import javax.xml.stream.XMLEventReader; - import javax.xml.stream.XMLStreamReader; - import javax.xml.transform.Source; -@@ -235,4 +235,4 @@ public class FastinfoSetUnmarshaller implements Unmarshaller - { - return unmarshaller.getListener(); - } --} -\ No newline at end of file -+} -diff --git a/providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java b/providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java -index 706eb4964..510b20702 100644 ---- a/providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java -+++ b/providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java -@@ -6,7 +6,7 @@ import org.apache.http.impl.client.DefaultHttpClient; - import org.codehaus.jackson.annotate.JsonProperty; - import java.io.BufferedReader; - import java.io.InputStreamReader; --import javax.xml.bind.annotation.*; -+import jakarta.xml.bind.annotation.*; - - import org.jboss.resteasy.annotations.providers.NoJackson; - import org.jboss.resteasy.annotations.providers.jaxb.json.BadgerFish; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Formatted.java b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Formatted.java -index 446111088..13ffa82af 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Formatted.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Formatted.java -@@ -3,7 +3,7 @@ package org.jboss.resteasy.annotations.providers.jaxb; - import org.jboss.resteasy.annotations.Decorator; - import org.jboss.resteasy.plugins.providers.jaxb.PrettyProcessor; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/JAXBConfig.java b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/JAXBConfig.java -index 64cedf147..13a3e41e1 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/JAXBConfig.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/JAXBConfig.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.annotations.providers.jaxb; - - import javax.xml.XMLConstants; --import javax.xml.bind.annotation.XmlNs; -+import jakarta.xml.bind.annotation.XmlNs; - import java.lang.annotation.Documented; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Stylesheet.java b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Stylesheet.java -index caacabf21..2106c6f3a 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Stylesheet.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/Stylesheet.java -@@ -3,7 +3,7 @@ package org.jboss.resteasy.annotations.providers.jaxb; - import org.jboss.resteasy.annotations.Decorator; - import org.jboss.resteasy.plugins.providers.jaxb.StylesheetProcessor; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/XmlHeader.java b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/XmlHeader.java -index 56e50030c..b039ede73 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/XmlHeader.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/annotations/providers/jaxb/XmlHeader.java -@@ -3,7 +3,7 @@ package org.jboss.resteasy.annotations.providers.jaxb; - import org.jboss.resteasy.annotations.Decorator; - import org.jboss.resteasy.plugins.providers.jaxb.XmlHeaderProcessor; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBContextFinder.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBContextFinder.java -index efc515fd9..355d63a3d 100755 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBContextFinder.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBContextFinder.java -@@ -8,10 +8,10 @@ import javax.ws.rs.core.Context; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlRegistry; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.annotation.XmlType; - import java.lang.annotation.Annotation; - import java.util.Set; - import java.util.HashSet; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBProvider.java -index 98a4f38f0..9e7b06988 100755 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/AbstractJAXBProvider.java -@@ -14,11 +14,11 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.Unmarshaller; - import javax.xml.transform.stream.StreamSource; - - import java.io.IOException; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/BaseMarshaller.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/BaseMarshaller.java -index dacf9a6be..f618a54cc 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/BaseMarshaller.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/BaseMarshaller.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.plugins.providers.jaxb; - --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; - import java.io.OutputStream; - import java.io.OutputStreamWriter; - import java.io.UnsupportedEncodingException; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/CollectionProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/CollectionProvider.java -index 5146d233b..646b2f2c9 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/CollectionProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/CollectionProvider.java -@@ -21,16 +21,16 @@ import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.MessageBodyWriter; - import javax.ws.rs.ext.Provider; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSeeAlso; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import javax.xml.transform.sax.SAXSource; - import javax.xml.transform.stream.StreamSource; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextFinder.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextFinder.java -index f45cf487b..0ccdae735 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextFinder.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextFinder.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.plugins.providers.jaxb; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.lang.annotation.Annotation; - - /** -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextWrapper.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextWrapper.java -index e545b5f6e..65a4cf400 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextWrapper.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBContextWrapper.java -@@ -6,18 +6,18 @@ import org.jboss.resteasy.plugins.providers.jaxb.i18n.Messages; - import org.w3c.dom.Node; - import org.xml.sax.SAXException; - --import javax.xml.bind.Binder; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.JAXBIntrospector; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; --import javax.xml.bind.SchemaOutputResolver; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.Validator; --import javax.xml.transform.stream.StreamSource; --import javax.xml.validation.Schema; --import javax.xml.validation.SchemaFactory; -+import jakarta.xml.bind.Binder; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBIntrospector; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.SchemaOutputResolver; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.Validator; -+import jakarta.xml.transform.stream.StreamSource; -+import jakarta.xml.validation.Schema; -+import jakarta.xml.validation.SchemaFactory; - - import java.io.IOException; - import java.io.InputStream; -@@ -240,7 +240,7 @@ public class JAXBContextWrapper extends JAXBContext - - /** - * @return -- * @see javax.xml.bind.JAXBContext#createBinder() -+ * @see jakarta.xml.bind.JAXBContext#createBinder() - */ - public Binder createBinder() - { -@@ -251,7 +251,7 @@ public class JAXBContextWrapper extends JAXBContext - * @param - * @param domType - * @return -- * @see javax.xml.bind.JAXBContext#createBinder(java.lang.Class) -+ * @see jakarta.xml.bind.JAXBContext#createBinder(java.lang.Class) - */ - public Binder createBinder(Class domType) - { -@@ -260,7 +260,7 @@ public class JAXBContextWrapper extends JAXBContext - - /** - * @return -- * @see javax.xml.bind.JAXBContext#createJAXBIntrospector() -+ * @see jakarta.xml.bind.JAXBContext#createJAXBIntrospector() - */ - public JAXBIntrospector createJAXBIntrospector() - { -@@ -270,7 +270,7 @@ public class JAXBContextWrapper extends JAXBContext - /** - * @return - * @throws JAXBException -- * @see javax.xml.bind.JAXBContext#createMarshaller() -+ * @see jakarta.xml.bind.JAXBContext#createMarshaller() - */ - public Marshaller createMarshaller() throws JAXBException - { -@@ -292,7 +292,7 @@ public class JAXBContextWrapper extends JAXBContext - /** - * @return - * @throws JAXBException -- * @see javax.xml.bind.JAXBContext#createUnmarshaller() -+ * @see jakarta.xml.bind.JAXBContext#createUnmarshaller() - */ - public Unmarshaller createUnmarshaller() throws JAXBException - { -@@ -302,8 +302,8 @@ public class JAXBContextWrapper extends JAXBContext - /** - * @return - * @throws JAXBException -- * @see javax.xml.bind.JAXBContext#createValidator() -- * @deprecated See javax.xml.bind.JAXBContext#createValidator(). -+ * @see jakarta.xml.bind.JAXBContext#createValidator() -+ * @deprecated See jakarta.xml.bind.JAXBContext#createValidator(). - */ - public Validator createValidator() throws JAXBException - { -@@ -313,7 +313,7 @@ public class JAXBContextWrapper extends JAXBContext - /** - * @param outputResolver - * @throws IOException -- * @see javax.xml.bind.JAXBContext#generateSchema(javax.xml.bind.SchemaOutputResolver) -+ * @see jakarta.xml.bind.JAXBContext#generateSchema(jakarta.xml.bind.SchemaOutputResolver) - */ - public void generateSchema(SchemaOutputResolver outputResolver) throws IOException - { -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBElementProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBElementProvider.java -index c2fa34163..b5bdb97ca 100755 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBElementProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBElementProvider.java -@@ -10,12 +10,12 @@ import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Unmarshaller; --import javax.xml.transform.sax.SAXSource; --import javax.xml.transform.stream.StreamSource; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.transform.sax.SAXSource; -+import jakarta.xml.transform.stream.StreamSource; - - import java.io.IOException; - import java.io.InputStream; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlRootElementProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlRootElementProvider.java -index 15b5a5ff1..a1bf8e511 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlRootElementProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlRootElementProvider.java -@@ -7,7 +7,7 @@ import javax.ws.rs.Consumes; - import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.lang.annotation.Annotation; - import java.lang.reflect.Type; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlSeeAlsoProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlSeeAlsoProvider.java -index 01c21fd6a..e5aeece05 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlSeeAlsoProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlSeeAlsoProvider.java -@@ -9,11 +9,11 @@ import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSeeAlso; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; - - import java.lang.annotation.Annotation; - import java.lang.reflect.Type; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlTypeProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlTypeProvider.java -index fb982e961..c71daa22d 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlTypeProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JAXBXmlTypeProvider.java -@@ -11,15 +11,15 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlRegistry; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlType; --import javax.xml.transform.sax.SAXSource; --import javax.xml.transform.stream.StreamSource; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.transform.sax.SAXSource; -+import jakarta.xml.transform.stream.StreamSource; - - import java.io.IOException; - import java.io.InputStream; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbCollection.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbCollection.java -index 1cc7d46bd..ddf3d05f2 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbCollection.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbCollection.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.providers.jaxb; - --import javax.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAnyElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbMap.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbMap.java -index 9537a40b6..967d01545 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbMap.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/JaxbMap.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.plugins.providers.jaxb; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlTransient; - import javax.xml.namespace.QName; - import java.util.ArrayList; - import java.util.HashMap; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/MapProvider.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/MapProvider.java -index 4173308e2..9c457de03 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/MapProvider.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/MapProvider.java -@@ -23,17 +23,17 @@ import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.MessageBodyWriter; - import javax.ws.rs.ext.Provider; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSeeAlso; --import javax.xml.bind.annotation.XmlType; --import javax.xml.namespace.QName; --import javax.xml.transform.sax.SAXSource; --import javax.xml.transform.stream.StreamSource; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.namespace.QName; -+import jakarta.xml.transform.sax.SAXSource; -+import jakarta.xml.transform.stream.StreamSource; - - import java.io.IOException; - import java.io.InputStream; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/PrettyProcessor.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/PrettyProcessor.java -index 3df39db19..510a7a0fd 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/PrettyProcessor.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/PrettyProcessor.java -@@ -5,7 +5,7 @@ import org.jboss.resteasy.annotations.providers.jaxb.Formatted; - import org.jboss.resteasy.spi.interception.DecoratorProcessor; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.Annotation; - - /** -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/SecureUnmarshaller.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/SecureUnmarshaller.java -index 973b2e826..70cff395a 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/SecureUnmarshaller.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/SecureUnmarshaller.java -@@ -8,24 +8,24 @@ import java.security.AccessController; - import java.security.PrivilegedActionException; - import java.security.PrivilegedExceptionAction; - --import javax.xml.XMLConstants; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.UnmarshallerHandler; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentUnmarshaller; --import javax.xml.parsers.ParserConfigurationException; --import javax.xml.parsers.SAXParser; --import javax.xml.parsers.SAXParserFactory; --import javax.xml.stream.XMLEventReader; --import javax.xml.stream.XMLInputFactory; --import javax.xml.stream.XMLStreamReader; --import javax.xml.transform.Source; --import javax.xml.transform.sax.SAXSource; --import javax.xml.validation.Schema; -+import jakarta.xml.XMLConstants; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.UnmarshallerHandler; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentUnmarshaller; -+import jakarta.xml.parsers.ParserConfigurationException; -+import jakarta.xml.parsers.SAXParser; -+import jakarta.xml.parsers.SAXParserFactory; -+import jakarta.xml.stream.XMLEventReader; -+import jakarta.xml.stream.XMLInputFactory; -+import jakarta.xml.stream.XMLStreamReader; -+import jakarta.xml.transform.Source; -+import jakarta.xml.transform.sax.SAXSource; -+import jakarta.xml.validation.Schema; - - import org.jboss.resteasy.plugins.providers.jaxb.i18n.Messages; - import org.w3c.dom.Node; -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/StylesheetProcessor.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/StylesheetProcessor.java -index 36e4915f3..5a799a22c 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/StylesheetProcessor.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/StylesheetProcessor.java -@@ -6,8 +6,8 @@ import org.jboss.resteasy.spi.interception.DecoratorProcessor; - import org.jboss.resteasy.util.StringContextReplacement; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; - import java.lang.annotation.Annotation; - - /** -@@ -32,4 +32,4 @@ public class StylesheetProcessor implements DecoratorProcessorBill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/GetResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/GetResourceMethod.java -index 3efc2e128..b2ea950f9 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/GetResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/GetResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/HeadResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/HeadResourceMethod.java -index f24b99c83..4559ed246 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/HeadResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/HeadResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/OptionsResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/OptionsResourceMethod.java -index 9a160401c..4f6d8a0c1 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/OptionsResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/OptionsResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PostResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PostResourceMethod.java -index 995778303..2eb75906e 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PostResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PostResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PutResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PutResourceMethod.java -index f7719bca6..7c39ec4bf 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PutResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/PutResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryData.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryData.java -index e463d8f09..1f99de341 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryData.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryData.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Set; - import java.util.TreeSet; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryEntry.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryEntry.java -index c148a7c71..7464c772f 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryEntry.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryEntry.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryStatsResource.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryStatsResource.java -index dfb5cabe4..de17b0344 100755 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryStatsResource.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/RegistryStatsResource.java -@@ -11,7 +11,7 @@ import javax.ws.rs.GET; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBException; - import java.util.List; - import java.util.concurrent.atomic.AtomicLong; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/ResourceMethodEntry.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/ResourceMethodEntry.java -index 6c3a40d5d..87fce6ec5 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/ResourceMethodEntry.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/ResourceMethodEntry.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.plugins.stats; - --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.XmlSeeAlso; -+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.XmlSeeAlso; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/SubresourceLocator.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/SubresourceLocator.java -index 02383c8e3..c68501ac0 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/SubresourceLocator.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/SubresourceLocator.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/TraceResourceMethod.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/TraceResourceMethod.java -index df025dbb7..a146572c4 100644 ---- a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/TraceResourceMethod.java -+++ b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/stats/TraceResourceMethod.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.stats; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerContext.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerContext.java -index f0622c400..da9d27112 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerContext.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerContext.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.jaxb.json; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.Validator; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.Validator; - - /** - * @author Bill Burke -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerMarshaller.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerMarshaller.java -index e13c44e43..4ecdd2440 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerMarshaller.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerMarshaller.java -@@ -5,12 +5,12 @@ import org.jboss.resteasy.plugins.providers.jaxb.BaseMarshaller; - import org.w3c.dom.Node; - import org.xml.sax.ContentHandler; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentMarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentMarshaller; - import javax.xml.stream.XMLEventWriter; - import javax.xml.stream.XMLStreamWriter; - import javax.xml.transform.Result; -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerUnmarshaller.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerUnmarshaller.java -index c6292d776..8877d2504 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerUnmarshaller.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/BadgerUnmarshaller.java -@@ -7,15 +7,15 @@ import org.jboss.resteasy.plugins.providers.jaxb.json.i18n.Messages; - import org.w3c.dom.Node; - import org.xml.sax.InputSource; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.UnmarshallerHandler; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentUnmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.UnmarshallerHandler; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentUnmarshaller; - import javax.xml.stream.XMLEventReader; - import javax.xml.stream.XMLStreamReader; - import javax.xml.transform.Source; -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedContext.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedContext.java -index 17956bb45..10c5348e0 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedContext.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedContext.java -@@ -5,11 +5,11 @@ import org.codehaus.jettison.mapped.MappedNamespaceConvention; - import org.jboss.resteasy.annotations.providers.jaxb.json.Mapped; - import org.jboss.resteasy.annotations.providers.jaxb.json.XmlNsMap; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.Validator; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.Validator; - import javax.xml.namespace.QName; - import java.util.ArrayList; - import java.util.HashMap; -@@ -123,4 +123,4 @@ public class JettisonMappedContext extends JAXBContext - } - - --} -\ No newline at end of file -+} -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedMarshaller.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedMarshaller.java -index 39dfcdbe0..10c018607 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedMarshaller.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedMarshaller.java -@@ -7,12 +7,12 @@ import org.jboss.resteasy.plugins.providers.jaxb.BaseMarshaller; - import org.w3c.dom.Node; - import org.xml.sax.ContentHandler; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentMarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentMarshaller; - import javax.xml.stream.XMLEventWriter; - import javax.xml.stream.XMLStreamWriter; - import javax.xml.transform.Result; -@@ -172,4 +172,4 @@ public class JettisonMappedMarshaller extends BaseMarshaller - { - return marshaller.getListener(); - } --} -\ No newline at end of file -+} -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedUnmarshaller.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedUnmarshaller.java -index 4e374172c..9aa46484c 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedUnmarshaller.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JettisonMappedUnmarshaller.java -@@ -9,15 +9,15 @@ import org.jboss.resteasy.plugins.providers.jaxb.json.i18n.Messages; - import org.w3c.dom.Node; - import org.xml.sax.InputSource; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.PropertyException; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.UnmarshallerHandler; --import javax.xml.bind.ValidationEventHandler; --import javax.xml.bind.annotation.adapters.XmlAdapter; --import javax.xml.bind.attachment.AttachmentUnmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.UnmarshallerHandler; -+import jakarta.xml.bind.ValidationEventHandler; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.attachment.AttachmentUnmarshaller; - import javax.xml.stream.XMLEventReader; - import javax.xml.stream.XMLStreamReader; - import javax.xml.transform.Source; -@@ -271,4 +271,4 @@ public class JettisonMappedUnmarshaller implements Unmarshaller - { - return unmarshaller.getListener(); - } --} -\ No newline at end of file -+} -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonCollectionProvider.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonCollectionProvider.java -index 574f944e4..6927fb43c 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonCollectionProvider.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonCollectionProvider.java -@@ -17,9 +17,9 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - - import java.io.BufferedReader; - import java.io.ByteArrayInputStream; -diff --git a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonJAXBContextFinder.java b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonJAXBContextFinder.java -index 18d7ab838..638eb32e1 100644 ---- a/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonJAXBContextFinder.java -+++ b/providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonJAXBContextFinder.java -@@ -10,8 +10,8 @@ import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.lang.annotation.Annotation; - import java.util.concurrent.ConcurrentHashMap; - -diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/annotations/providers/multipart/XopWithMultipartRelated.java b/providers/multipart/src/main/java/org/jboss/resteasy/annotations/providers/multipart/XopWithMultipartRelated.java -index 3178174bd..64072f5d3 100755 ---- a/providers/multipart/src/main/java/org/jboss/resteasy/annotations/providers/multipart/XopWithMultipartRelated.java -+++ b/providers/multipart/src/main/java/org/jboss/resteasy/annotations/providers/multipart/XopWithMultipartRelated.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.annotations.providers.multipart; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlMimeType; -+import jakarta.xml.bind.annotation.XmlMimeType; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -index 919f6f0a9..eb231a0e1 100755 ---- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -+++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java -@@ -10,13 +10,13 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.core.Response; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.attachment.AttachmentMarshaller; --import javax.xml.bind.attachment.AttachmentUnmarshaller; --import javax.xml.transform.stream.StreamSource; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.attachment.AttachmentMarshaller; -+import jakarta.xml.bind.attachment.AttachmentUnmarshaller; -+import jakata.xml.transform.stream.StreamSource; - - import java.io.ByteArrayInputStream; - import java.io.ByteArrayOutputStream; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomEntryProvider.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomEntryProvider.java -index c0e7d6b01..02252aa53 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomEntryProvider.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomEntryProvider.java -@@ -19,9 +19,9 @@ import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.MessageBodyWriter; - import javax.ws.rs.ext.Provider; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - - import java.io.IOException; - import java.io.InputStream; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomFeedProvider.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomFeedProvider.java -index 18af4c95a..0b6f28ba7 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomFeedProvider.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/AtomFeedProvider.java -@@ -19,9 +19,9 @@ import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.MessageBodyWriter; - import javax.ws.rs.ext.Provider; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - - import java.io.IOException; - import java.io.InputStream; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/BaseLink.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/BaseLink.java -index 1ab955a65..2009e4dbb 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/BaseLink.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/BaseLink.java -@@ -5,9 +5,9 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; - - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.UriInfo; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import java.net.URI; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Category.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Category.java -index c3fc6d4cc..5841ed842 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Category.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Category.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.net.URI; - - /** -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/CommonAttributes.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/CommonAttributes.java -index d97365b89..c547ee64e 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/CommonAttributes.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/CommonAttributes.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAttribute; - import java.net.URI; - import java.util.HashMap; - import java.util.Map; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Content.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Content.java -index a1093ffb7..072aa6501 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Content.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Content.java -@@ -5,17 +5,17 @@ import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlTypeProvider; - import org.w3c.dom.Element; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlMixed; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlMixed; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - import java.net.URI; - import java.security.AccessController; - import java.security.PrivilegedActionException; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Entry.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Entry.java -index bf0d162fd..ff4e81d9b 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Entry.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Entry.java -@@ -5,18 +5,18 @@ import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlTypeProvider; - import org.w3c.dom.Element; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlMixed; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlMixed; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - import java.net.URI; - import java.util.ArrayList; - import java.util.Date; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Feed.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Feed.java -index 3a8e90e76..92811db58 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Feed.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Feed.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Generator.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Generator.java -index 40b6ff56d..0ef6059e3 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Generator.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Generator.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlValue; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlValue; - import java.net.URI; - - /** -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Link.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Link.java -index 772c3a2c2..72eea1af9 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Link.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Link.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.atom; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.net.URI; - - /** -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/MediaTypeAdapter.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/MediaTypeAdapter.java -index 5542d309d..ff1c609a4 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/MediaTypeAdapter.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/MediaTypeAdapter.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.plugins.providers.atom; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - - /** - * @author Bill Burke -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Person.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Person.java -index de90c2aa3..925329e94 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Person.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Person.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; - import java.net.URI; - - /** -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/RelativeLink.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/RelativeLink.java -index 9130e75c0..640c956c2 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/RelativeLink.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/RelativeLink.java -@@ -5,9 +5,9 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; - - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.UriInfo; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import java.net.URI; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Source.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Source.java -index 820cef22e..e37e4d260 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Source.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Source.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementRef; --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.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlType; - import java.net.URI; - import java.util.ArrayList; - import java.util.Date; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Text.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Text.java -index dad058817..b5f0b0818 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Text.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/Text.java -@@ -4,17 +4,17 @@ import java.util.ArrayList; - import java.util.List; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlMixed; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlMixed; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - - import org.jboss.resteasy.plugins.providers.jaxb.JAXBContextFinder; - import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlTypeProvider; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/UriAdapter.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/UriAdapter.java -index 0d92125bc..235a3d98c 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/UriAdapter.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/UriAdapter.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.plugins.providers.atom; - --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - import java.net.URI; - - /** -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppAccept.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppAccept.java -index aa5451fab..1c84d319a 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppAccept.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppAccept.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.plugins.providers.atom.app; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.XmlValue; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlValue; - - /** - *

-diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCategories.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCategories.java -index e9e2c5833..1d1d8219c 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCategories.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCategories.java -@@ -16,15 +16,15 @@ package org.jboss.resteasy.plugins.providers.atom.app; - - import org.jboss.resteasy.plugins.providers.atom.Category; - --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.XmlElements; --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.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElements; -+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 java.util.ArrayList; - import java.util.List; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCollection.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCollection.java -index 35fd9f91c..5f40bcb27 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCollection.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCollection.java -@@ -16,13 +16,13 @@ package org.jboss.resteasy.plugins.providers.atom.app; - - import org.w3c.dom.Element; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCommonAttributes.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCommonAttributes.java -index b851845fc..df4142b1f 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCommonAttributes.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppCommonAttributes.java -@@ -14,14 +14,14 @@ - */ - package org.jboss.resteasy.plugins.providers.atom.app; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import java.io.Serializable; - import java.util.HashMap; -@@ -57,7 +57,7 @@ public class AppCommonAttributes implements Serializable - * {@link String } - * - */ -- @javax.xml.bind.annotation.XmlTransient -+ @jakarta.xml.bind.annotation.XmlTransient - public String getBase() { - return base; - } -@@ -82,7 +82,7 @@ public class AppCommonAttributes implements Serializable - * {@link String } - * - */ -- @javax.xml.bind.annotation.XmlTransient -+ @jakarta.xml.bind.annotation.XmlTransient - public String getLang() { - return lang; - } -@@ -107,7 +107,7 @@ public class AppCommonAttributes implements Serializable - * {@link String } - * - */ -- @javax.xml.bind.annotation.XmlTransient -+ @jakarta.xml.bind.annotation.XmlTransient - public String getSpace() { - return space; - } -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppService.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppService.java -index 5df7dc438..a3c7b38ca 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppService.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppService.java -@@ -14,9 +14,9 @@ - */ - package org.jboss.resteasy.plugins.providers.atom.app; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppWorkspace.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppWorkspace.java -index 6a3fdc43c..64cfda8b2 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppWorkspace.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/AppWorkspace.java -@@ -14,10 +14,10 @@ - */ - package org.jboss.resteasy.plugins.providers.atom.app; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/BooleanAdapter.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/BooleanAdapter.java -index b0b382156..2da90580a 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/BooleanAdapter.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/BooleanAdapter.java -@@ -14,7 +14,7 @@ - */ - package org.jboss.resteasy.plugins.providers.atom.app; - --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - - public class BooleanAdapter extends XmlAdapter - { -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/package-info.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/package-info.java -index 758075207..6f3f0dff3 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/package-info.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/app/package-info.java -@@ -12,10 +12,10 @@ - * limitations under the License. - * - */ --@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2007/app", -+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2007/app", - xmlns = { -- @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.w3.org/2007/app", prefix = "app"), -- @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.w3.org/2005/Atom", prefix = "atom") -+ @jakarta.xml.bind.annotation.XmlNs(namespaceURI = "http://www.w3.org/2007/app", prefix = "app"), -+ @jakarta.xml.bind.annotation.XmlNs(namespaceURI = "http://www.w3.org/2005/Atom", prefix = "atom") - }, -- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) - package org.jboss.resteasy.plugins.providers.atom.app; -diff --git a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/package-info.java b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/package-info.java -index fbe5fd487..93223224f 100644 ---- a/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/package-info.java -+++ b/providers/resteasy-atom/src/main/java/org/jboss/resteasy/plugins/providers/atom/package-info.java -@@ -9,8 +9,8 @@ - }) package org.jboss.resteasy.plugins.providers.atom; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlNsForm; --import javax.xml.bind.annotation.XmlSchema; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -+import jakarta.xml.bind.annotation.XmlNsForm; -+import jakarta.xml.bind.annotation.XmlSchema; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; - import java.net.URI; -\ No newline at end of file -diff --git a/providers/resteasy-validator-provider-11/src/main/java/org/jboss/resteasy/api/validation/ViolationReport.java b/providers/resteasy-validator-provider-11/src/main/java/org/jboss/resteasy/api/validation/ViolationReport.java -index 463e890dc..b159c0316 100644 ---- a/providers/resteasy-validator-provider-11/src/main/java/org/jboss/resteasy/api/validation/ViolationReport.java -+++ b/providers/resteasy-validator-provider-11/src/main/java/org/jboss/resteasy/api/validation/ViolationReport.java -@@ -2,9 +2,9 @@ package org.jboss.resteasy.api.validation; - - import java.util.ArrayList; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * -diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/api/validation/ResteasyConstraintViolation.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/api/validation/ResteasyConstraintViolation.java -index e2f4c69d8..2e45cd632 100644 ---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/api/validation/ResteasyConstraintViolation.java -+++ b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/api/validation/ResteasyConstraintViolation.java -@@ -2,9 +2,9 @@ package org.jboss.resteasy.api.validation; - - import java.io.Serializable; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * -diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java -index 2411831c9..ff4041c6d 100755 ---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java -+++ b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java -@@ -192,7 +192,7 @@ public class StringParameterInjector - { - for (Annotation ann : baseType.getAnnotations()) - { -- if (ann.annotationType().getName().equals("javax.xml.bind.annotation.XmlEnum")) -+ if (ann.annotationType().getName().equals("jakarta.xml.bind.annotation.XmlEnum")) - { - valueOf = fromValue; - } -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java -index 8fed5c9bb..f68e63508 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java -@@ -3,7 +3,7 @@ package org.jboss.resteasy.links; - import org.jboss.resteasy.annotations.Decorator; - import org.jboss.resteasy.links.impl.LinkDecorator; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.Documented; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java -index bdc6ef310..13cabee92 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java -@@ -12,7 +12,7 @@ import java.lang.annotation.Target; - *

- *

- * For example, if an entity needs its parent ID and its ID in the path of a resource method, we -- * will use this entity's {@link javax.xml.bind.annotation.XmlID @XmlID} id, and its parent's, in -+ * will use this entity's {@link jakarta.xml.bind.annotation.XmlID @XmlID} id, and its parent's, in - * reverse order, to form the path parameter list (from the furthest parent, to this entity). - *

- * @author Stéphane Épardaud -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java -index 306aa4ea1..d01251bc8 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.links; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.net.URI; - import java.util.ArrayList; - -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/BeanUtils.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/BeanUtils.java -index 8ec7e3fdf..4ba5f9c2e 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/BeanUtils.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/BeanUtils.java -@@ -6,7 +6,7 @@ import org.jboss.resteasy.links.ResourceIDs; - import org.jboss.resteasy.links.i18n.Messages; - - import javax.persistence.Id; --import javax.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlID; - - import java.lang.annotation.Annotation; - import java.lang.reflect.Field; -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/LinkDecorator.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/LinkDecorator.java -index c3e000b93..dd0059b6c 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/LinkDecorator.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/impl/LinkDecorator.java -@@ -8,8 +8,8 @@ import org.jboss.resteasy.spi.interception.DecoratorProcessor; - - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.UriInfo; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Marshaller.Listener; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller.Listener; - import java.lang.annotation.Annotation; - - public class LinkDecorator implements DecoratorProcessor { -diff --git a/resteasy-links/src/main/java/org/jboss/resteasy/links/package-info.java b/resteasy-links/src/main/java/org/jboss/resteasy/links/package-info.java -index 3fe9e08ad..3c71f0ca0 100644 ---- a/resteasy-links/src/main/java/org/jboss/resteasy/links/package-info.java -+++ b/resteasy-links/src/main/java/org/jboss/resteasy/links/package-info.java -@@ -1,5 +1,5 @@ - @XmlSchema(xmlns = @XmlNs(namespaceURI = "http://www.w3.org/2005/Atom", prefix = "atom")) - package org.jboss.resteasy.links; - --import javax.xml.bind.annotation.XmlNs; --import javax.xml.bind.annotation.XmlSchema; -\ No newline at end of file -+import jakarta.xml.bind.annotation.XmlNs; -+import jakarta.xml.bind.annotation.XmlSchema; -\ No newline at end of file -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Book.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Book.java -index f1d6896b1..1d7b264d0 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Book.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Book.java -@@ -4,12 +4,12 @@ import org.jboss.resteasy.annotations.providers.jaxb.json.Mapped; - import org.jboss.resteasy.annotations.providers.jaxb.json.XmlNsMap; - import org.jboss.resteasy.links.RESTServiceDiscovery; - --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.XmlID; --import javax.xml.bind.annotation.XmlRootElement; -+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.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Comment.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Comment.java -index b5feac481..269500c34 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Comment.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/Comment.java -@@ -3,12 +3,12 @@ package org.jboss.resteasy.links.test; - import org.jboss.resteasy.links.ParentResource; - import org.jboss.resteasy.links.RESTServiceDiscovery; - --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.XmlID; --import javax.xml.bind.annotation.XmlRootElement; -+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.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.NONE) -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/IdBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/IdBook.java -index 4165bec80..81cb7adff 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/IdBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/IdBook.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.links.test; - - import org.jboss.resteasy.links.RESTServiceDiscovery; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.NONE) -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/JpaIdBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/JpaIdBook.java -index 90f1dadd4..778c1697a 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/JpaIdBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/JpaIdBook.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.links.test; - - import javax.persistence.Id; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class JpaIdBook extends IdBook{ -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdBook.java -index 6f07acef2..9078f74a8 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdBook.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.links.test; - - import org.jboss.resteasy.links.ResourceID; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class ResourceIdBook extends IdBook{ -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdMethodBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdMethodBook.java -index 904b61194..8df49b05a 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdMethodBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdMethodBook.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.links.test; - - import org.jboss.resteasy.links.ResourceID; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class ResourceIdMethodBook extends IdBook{ -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsBook.java -index 18b0e74be..cde06aec8 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsBook.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.links.test; - - import org.jboss.resteasy.links.ResourceIDs; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @ResourceIDs({"namea", "nameb"}) -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsMethodBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsMethodBook.java -index 1d6c7bc98..085a73e16 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsMethodBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ResourceIdsMethodBook.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.links.test; - - import org.jboss.resteasy.links.ResourceIDs; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @ResourceIDs({"namea", "nameb"}) -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ScrollableCollection.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ScrollableCollection.java -index 82eeb696c..55bdbc8e9 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ScrollableCollection.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/ScrollableCollection.java -@@ -4,12 +4,12 @@ import org.jboss.resteasy.links.RESTServiceDiscovery; - import org.jboss.resteasy.links.ResourceFacade; - import org.jboss.resteasy.links.ResourceID; - --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.XmlTransient; -+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.XmlTransient; - - import java.util.ArrayList; - import java.util.HashMap; -diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/XmlIdBook.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/XmlIdBook.java -index 07552f08b..52d49a65d 100644 ---- a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/XmlIdBook.java -+++ b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/XmlIdBook.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.links.test; - --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class XmlIdBook extends IdBook { -diff --git a/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/jaxb/BasicJaxbObject.java b/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/jaxb/BasicJaxbObject.java -index ecd1b2b5c..f38f73d89 100644 ---- a/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/jaxb/BasicJaxbObject.java -+++ b/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/jaxb/BasicJaxbObject.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.springmvc.test.jaxb; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Date; - - @XmlRootElement -diff --git a/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/resources/TypeMappingResource.java b/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/resources/TypeMappingResource.java -index 235d0a1c9..338123756 100644 ---- a/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/resources/TypeMappingResource.java -+++ b/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/resources/TypeMappingResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.springmvc.test.resources; - - import javax.ws.rs.GET; - import javax.ws.rs.Path; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @Path("/test") - public class TypeMappingResource -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlDefaultResource.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlDefaultResource.java -index 35769607f..c24411be2 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlDefaultResource.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlDefaultResource.java -@@ -6,7 +6,7 @@ import org.jboss.resteasy.wadl.i18n.Messages; - import javax.ws.rs.GET; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBException; - import java.util.HashMap; - import java.util.Map; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlServletWriter.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlServletWriter.java -index eb250bc62..42c229ff7 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlServletWriter.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlServletWriter.java -@@ -6,9 +6,9 @@ import javax.servlet.ServletOutputStream; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - import javax.xml.namespace.QName; - import java.io.IOException; - import java.io.PrintWriter; -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlWriter.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlWriter.java -index 8f4d754c1..7debdddc5 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlWriter.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlWriter.java -@@ -5,9 +5,9 @@ import org.jboss.resteasy.wadl.i18n.Messages; - import org.jboss.resteasy.wadl.jaxb.*; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - import javax.xml.namespace.QName; - import java.io.PrintWriter; - import java.io.StringWriter; -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Application.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Application.java -index df4352899..f7a388d2a 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Application.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Application.java -@@ -10,13 +10,13 @@ package org.jboss.resteasy.wadl.jaxb; - - import java.util.ArrayList; - import java.util.List; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElements; --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.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElements; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; - - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Doc.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Doc.java -index f11ec6a49..2783a82b8 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Doc.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Doc.java -@@ -12,14 +12,14 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlMixed; --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.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlMixed; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Grammars.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Grammars.java -index eea47849e..330f667b2 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Grammars.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Grammars.java -@@ -10,11 +10,11 @@ package org.jboss.resteasy.wadl.jaxb; - - import java.util.ArrayList; - import java.util.List; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --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.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; - - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/HTTPMethods.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/HTTPMethods.java -index f5634033c..a3ffa8655 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/HTTPMethods.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/HTTPMethods.java -@@ -8,8 +8,8 @@ - - package org.jboss.resteasy.wadl.jaxb; - --import javax.xml.bind.annotation.XmlEnum; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlEnum; -+import jakarta.xml.bind.annotation.XmlType; - - - /** -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Include.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Include.java -index 1be909fad..5290fafce 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Include.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Include.java -@@ -12,13 +12,13 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.namespace.QName; - - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Link.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Link.java -index 47a88ec75..e7c84f404 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Link.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Link.java -@@ -12,16 +12,16 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Method.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Method.java -index bac373602..129efbd64 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Method.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Method.java -@@ -12,17 +12,17 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ObjectFactory.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ObjectFactory.java -index 9708b0d6e..f5cd006e7 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ObjectFactory.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ObjectFactory.java -@@ -8,7 +8,7 @@ - - package org.jboss.resteasy.wadl.jaxb; - --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.annotation.XmlRegistry; - - - /** -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Option.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Option.java -index c4936ac3b..a34bb7dd5 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Option.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Option.java -@@ -12,13 +12,13 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --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.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Param.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Param.java -index b594d5eb5..085954d78 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Param.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Param.java -@@ -12,17 +12,17 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ParamStyle.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ParamStyle.java -index 2b611d64c..4ef710c2e 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ParamStyle.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ParamStyle.java -@@ -8,9 +8,9 @@ - - package org.jboss.resteasy.wadl.jaxb; - --import javax.xml.bind.annotation.XmlEnum; --import javax.xml.bind.annotation.XmlEnumValue; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlEnum; -+import jakarta.xml.bind.annotation.XmlEnumValue; -+import jakarta.xml.bind.annotation.XmlType; - - - /** -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Representation.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Representation.java -index 9ffc77ef3..007b087cb 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Representation.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Representation.java -@@ -12,17 +12,17 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Request.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Request.java -index f88e3344f..daf74e2fe 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Request.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Request.java -@@ -12,12 +12,12 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --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.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resource.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resource.java -index 858fe105f..05adcc87f 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resource.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resource.java -@@ -12,19 +12,19 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElements; --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElements; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ResourceType.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ResourceType.java -index 545277ccd..5c42752eb 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ResourceType.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/ResourceType.java -@@ -12,19 +12,19 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElements; --import javax.xml.bind.annotation.XmlID; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElements; -+import jakarta.xml.bind.annotation.XmlID; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resources.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resources.java -index 046374310..08b0cde11 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resources.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Resources.java -@@ -12,15 +12,15 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+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 javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Response.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Response.java -index e7ed8b96f..9c6ac12e8 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Response.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/Response.java -@@ -12,13 +12,13 @@ import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - import java.util.Map; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAttribute; --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.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.namespace.QName; - import org.w3c.dom.Element; - -diff --git a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/package-info.java b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/package-info.java -index 374978417..018c7f8db 100644 ---- a/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/package-info.java -+++ b/resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/jaxb/package-info.java -@@ -5,5 +5,5 @@ - // Generated on: 2015.06.18 at 10:10:02 PM CST - // - --@javax.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) - package org.jboss.resteasy.wadl.jaxb; -diff --git a/resteasy-wadl/src/test/java/org/jboss/resteasy/wadl/wadl/TestWADL_JAXB_Types.java b/resteasy-wadl/src/test/java/org/jboss/resteasy/wadl/wadl/TestWADL_JAXB_Types.java -index 483e13868..7f7e7a6dc 100644 ---- a/resteasy-wadl/src/test/java/org/jboss/resteasy/wadl/wadl/TestWADL_JAXB_Types.java -+++ b/resteasy-wadl/src/test/java/org/jboss/resteasy/wadl/wadl/TestWADL_JAXB_Types.java -@@ -4,8 +4,8 @@ import org.jboss.resteasy.wadl.jaxb.Application; - import org.jboss.resteasy.wadl.jaxb.ObjectFactory; - import org.junit.Test; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Marshaller; - - /** - * @author Weinan Li -diff --git a/server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/XmlData.java b/server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/XmlData.java -index 38982e7ff..c7673eaf9 100755 ---- a/server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/XmlData.java -+++ b/server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/XmlData.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contact.java b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contact.java -index 0722ed9f2..0b95b3747 100644 ---- a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contact.java -+++ b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contact.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.spring.deployment.resource; - - import javax.ws.rs.FormParam; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class Contact { -diff --git a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contacts.java b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contacts.java -index ba194ff1b..1900423d2 100644 ---- a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contacts.java -+++ b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/Contacts.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.spring.deployment.resource; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.Collection; - -diff --git a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/TypeMappingResource.java b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/TypeMappingResource.java -index 78660d390..2d83205f5 100644 ---- a/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/TypeMappingResource.java -+++ b/testsuite/integration-tests-spring/deployment/src/test/java/org/jboss/resteasy/test/spring/deployment/resource/TypeMappingResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.spring.deployment.resource; - - import javax.ws.rs.GET; - import javax.ws.rs.Path; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @Path("/test") - public class TypeMappingResource { -diff --git a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contact.java b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contact.java -index 08c629437..8f0ba80b3 100644 ---- a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contact.java -+++ b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contact.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.spring.inmodule.resource; - - import javax.ws.rs.FormParam; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class Contact { -diff --git a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contacts.java b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contacts.java -index 42e9c64ac..4650c759b 100644 ---- a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contacts.java -+++ b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/Contacts.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.spring.inmodule.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.Collection; - -diff --git a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/TypeMappingResource.java b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/TypeMappingResource.java -index 3875724c6..0ee062359 100644 ---- a/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/TypeMappingResource.java -+++ b/testsuite/integration-tests-spring/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/resource/TypeMappingResource.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.spring.inmodule.resource; - - import javax.ws.rs.GET; - import javax.ws.rs.Path; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @Path("/test") - public class TypeMappingResource { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/JaxrsAsyncServletXmlData.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/JaxrsAsyncServletXmlData.java -index 95c128801..355eab247 100755 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/JaxrsAsyncServletXmlData.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/JaxrsAsyncServletXmlData.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.asynch.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/BeanReaderWriterXFormat.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/BeanReaderWriterXFormat.java -index e14db664c..f8d3a09ed 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/BeanReaderWriterXFormat.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/BeanReaderWriterXFormat.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.cdi.basic.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "xformat") - public class BeanReaderWriterXFormat { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBook.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBook.java -index 775d5e96b..930ef8e92 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBook.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBook.java -@@ -4,10 +4,10 @@ import javax.persistence.Entity; - import javax.persistence.Id; - import javax.validation.constraints.NotNull; - import javax.validation.constraints.Size; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.io.Serializable; - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookReaderImpl.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookReaderImpl.java -index 8a5546ff2..a41c34320 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookReaderImpl.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookReaderImpl.java -@@ -12,9 +12,9 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.io.IOException; - import java.io.InputStream; - import java.lang.annotation.Annotation; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookWriterImpl.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookWriterImpl.java -index b87f14836..813e645f7 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookWriterImpl.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/basic/resource/EJBBookWriterImpl.java -@@ -13,9 +13,9 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.MessageBodyWriter; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.io.IOException; - import java.io.OutputStream; - import java.lang.annotation.Annotation; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/ApplicationUser.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/ApplicationUser.java -index 9cd33f0da..136735430 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/ApplicationUser.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/ApplicationUser.java -@@ -7,9 +7,9 @@ import javax.persistence.EnumType; - import javax.persistence.Enumerated; - import javax.persistence.Id; - import javax.persistence.Table; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @Entity - @Table(name = "application_user") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/CDIInjectionBook.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/CDIInjectionBook.java -index bedccca85..0c989b8a8 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/CDIInjectionBook.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/resource/CDIInjectionBook.java -@@ -4,10 +4,10 @@ import javax.persistence.Entity; - import javax.persistence.Id; - import javax.validation.constraints.NotNull; - import javax.validation.constraints.Size; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * Book is -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/resource/InterceptorBook.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/resource/InterceptorBook.java -index 6dff634c2..4a3d46b85 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/resource/InterceptorBook.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/cdi/interceptors/resource/InterceptorBook.java -@@ -4,10 +4,10 @@ import javax.persistence.Entity; - import javax.persistence.Id; - import javax.validation.constraints.NotNull; - import javax.validation.constraints.Size; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * Book is -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbCredit.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbCredit.java -index 332a07e57..ca3c76f27 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbCredit.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbCredit.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.client.proxy.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class ProxyJaxbCredit { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbResourcePostMessage.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbResourcePostMessage.java -index f161c522d..d0f162896 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbResourcePostMessage.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/proxy/resource/ProxyJaxbResourcePostMessage.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.client.proxy.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.math.BigDecimal; - import java.util.Date; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/AsyncTimeoutExceptionsSticker.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/AsyncTimeoutExceptionsSticker.java -index 2c3ca840e..d759aff6f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/AsyncTimeoutExceptionsSticker.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/AsyncTimeoutExceptionsSticker.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.client.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class AsyncTimeoutExceptionsSticker { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/ApplicationFilterCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/ApplicationFilterCustomer.java -index dd2b96df1..e637ce4bb 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/ApplicationFilterCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/ApplicationFilterCustomer.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.core.basic.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - public class ApplicationFilterCustomer { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java -index 6f6efcc6f..2820e44fb 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/logging/DebugLoggingTest.java -@@ -73,7 +73,7 @@ public class DebugLoggingTest { - // enable RESTEasy debug logging - TestUtil.runCmd(client, "/subsystem=logging/console-handler=CONSOLE:write-attribute(name=level,value=ALL)"); - TestUtil.runCmd(client, "/subsystem=logging/logger=org.jboss.resteasy:add(level=ALL)"); -- TestUtil.runCmd(client, "/subsystem=logging/logger=javax.xml.bind:add(level=ALL)"); -+ TestUtil.runCmd(client, "/subsystem=logging/logger=jakarta.xml.bind:add(level=ALL)"); - TestUtil.runCmd(client, "/subsystem=logging/logger=com.fasterxml.jackson:add(level=ALL)"); - - client.close(); -@@ -86,7 +86,7 @@ public class DebugLoggingTest { - // enable RESTEasy debug logging - TestUtil.runCmd(client, "/subsystem=logging/console-handler=CONSOLE:write-attribute(name=level,value=INFO)"); - TestUtil.runCmd(client, "/subsystem=logging/logger=org.jboss.resteasy:remove()"); -- TestUtil.runCmd(client, "/subsystem=logging/logger=javax.xml.bind:remove()"); -+ TestUtil.runCmd(client, "/subsystem=logging/logger=jakarta.xml.bind:remove()"); - TestUtil.runCmd(client, "/subsystem=logging/logger=com.fasterxml.jackson:remove()"); - - client.close(); -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/servlet/resource/ServletConfigResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/servlet/resource/ServletConfigResource.java -index 480debc8e..4b3d193d1 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/servlet/resource/ServletConfigResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/servlet/resource/ServletConfigResource.java -@@ -7,7 +7,7 @@ import javax.ws.rs.GET; - import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @Path("my") - public class ServletConfigResource { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/Resteasy1405Test.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/Resteasy1405Test.java -index 201c4c42f..9ef563185 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/Resteasy1405Test.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/Resteasy1405Test.java -@@ -17,9 +17,9 @@ import javax.ws.rs.client.Entity; - import javax.ws.rs.client.WebTarget; - import javax.ws.rs.core.GenericEntity; - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; - - import org.jboss.arquillian.container.test.api.Deployment; - import org.jboss.arquillian.container.test.api.RunAsClient; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/InputData.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/InputData.java -index fbdd0ffaa..ed8527da0 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/InputData.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/InputData.java -@@ -2,9 +2,9 @@ package org.jboss.resteasy.test.form.resteasy1405; - - import java.util.List; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementWrapper; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElementWrapper; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class InputData -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/MyResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/MyResource.java -index 42aa4e0ad..5215004a6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/MyResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/form/resteasy1405/MyResource.java -@@ -10,9 +10,9 @@ import javax.ws.rs.Path; - import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.Response; --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 javax.xml.transform.stream.StreamSource; - - import org.jboss.logging.Logger; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/AtomComplexModelTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/AtomComplexModelTest.java -index 589900f31..424635ca9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/AtomComplexModelTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/AtomComplexModelTest.java -@@ -39,9 +39,9 @@ import org.junit.runner.RunWith; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.Response; - import javax.ws.rs.core.UriBuilder; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; - import java.io.*; - import java.lang.reflect.ReflectPermission; - import java.net.HttpURLConnection; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomAssetMetadata.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomAssetMetadata.java -index 318a180ed..6bdcb353a 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomAssetMetadata.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomAssetMetadata.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.atom.resource; - --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.XmlSeeAlso; -+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.XmlSeeAlso; - import java.util.Date; - - @XmlRootElement(name = "metadata") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelArchived.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelArchived.java -index 1541d621b..9549bc7fb 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelArchived.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelArchived.java -@@ -17,10 +17,10 @@ - package org.jboss.resteasy.test.providers.atom.resource; - - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "archived") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadataDecorators.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadataDecorators.java -index 2840bd199..ef7e700af 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadataDecorators.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadataDecorators.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.atom.resource; - - import org.jboss.resteasy.annotations.Decorator; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadtaProcessor.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadtaProcessor.java -index afc470065..3c1feefea 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadtaProcessor.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelAtomAssetMetadtaProcessor.java -@@ -5,8 +5,8 @@ import org.jboss.resteasy.plugins.providers.atom.Entry; - import org.jboss.resteasy.spi.interception.DecoratorProcessor; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Marshaller; - import java.io.PrintWriter; - import java.io.StringWriter; - import java.lang.annotation.Annotation; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCategories.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCategories.java -index 08b6bec76..8c60bf1a0 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCategories.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCategories.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "categories") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCheckinComment.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCheckinComment.java -index 97e381227..736451961 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCheckinComment.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCheckinComment.java -@@ -17,10 +17,10 @@ - package org.jboss.resteasy.test.providers.atom.resource; - - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "checkinComment") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCreated.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCreated.java -index 09081abdc..bda459667 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCreated.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelCreated.java -@@ -17,10 +17,10 @@ - package org.jboss.resteasy.test.providers.atom.resource; - - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Date; - - @XmlRootElement(name = "created") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelDisabled.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelDisabled.java -index df72fe6d6..4cbb1e155 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelDisabled.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelDisabled.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "disabled") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelFormat.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelFormat.java -index 728ae8395..6e755c7c0 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelFormat.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelFormat.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "format") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelNote.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelNote.java -index 0fc1726b1..0d8f5cf0f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelNote.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelNote.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "note") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelState.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelState.java -index 4f80a3ffe..b2b8ac3bf 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelState.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelState.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "state") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelUuid.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelUuid.java -index f9fac14b2..036d97b3f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelUuid.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelUuid.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "uuid") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelVersionNumber.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelVersionNumber.java -index 5202eccbd..89ff9d468 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelVersionNumber.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomComplexModelVersionNumber.java -@@ -16,10 +16,10 @@ - - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "versionNumber") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderCustomer.java -index ea94f5601..5d7e43851 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer", namespace = "http://jboss.org/Customer") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderDataCollectionRecord.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderDataCollectionRecord.java -index c11351e1f..8c296f040 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderDataCollectionRecord.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/AtomProviderDataCollectionRecord.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.atom.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - import javax.xml.datatype.XMLGregorianCalendar; - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/JAXBContextFinderCustomerAtom.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/JAXBContextFinderCustomerAtom.java -index f58c9308e..a4e5f5a13 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/JAXBContextFinderCustomerAtom.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/JAXBContextFinderCustomerAtom.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.atom.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/LinkProduct.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/LinkProduct.java -index 541258d65..a5344162a 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/LinkProduct.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/LinkProduct.java -@@ -2,12 +2,12 @@ package org.jboss.resteasy.test.providers.atom.resource; - - import org.jboss.resteasy.plugins.providers.atom.Link; - --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.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+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.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/ObjectFactory.java -index 189fcdbf6..ab7c0b7b4 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/atom/resource/ObjectFactory.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.atom.resource; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.datatype.XMLGregorianCalendar; - import javax.xml.namespace.QName; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlProduct.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlProduct.java -index 3dd56e482..c1bc603ba 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlProduct.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlProduct.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.jackson.resource; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "product") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJAXB.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJAXB.java -index 65d82458c..4cb7fbfd1 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJAXB.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJAXB.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jackson.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class JacksonXmlResourceWithJAXB { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJacksonAnnotation.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJacksonAnnotation.java -index 7f0feaa85..bc8b8c456 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJacksonAnnotation.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson/resource/JacksonXmlResourceWithJacksonAnnotation.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.jackson.resource; - - import org.codehaus.jackson.annotate.JsonProperty; - --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElement; - - public class JacksonXmlResourceWithJacksonAnnotation { - String attr1; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlProduct.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlProduct.java -index 112f4ee93..c491c8d68 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlProduct.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlProduct.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.jackson2.resource; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "product") - @NoJackson -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJAXB.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJAXB.java -index e4168b45e..a045f31cc 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJAXB.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJAXB.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jackson2.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class Jackson2XmlResourceWithJAXB { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJacksonAnnotation.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJacksonAnnotation.java -index 725e6c0a2..c5ab88972 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJacksonAnnotation.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/Jackson2XmlResourceWithJacksonAnnotation.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.jackson2.resource; - - import com.fasterxml.jackson.annotation.JsonProperty; - --import javax.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlElement; - - public class Jackson2XmlResourceWithJacksonAnnotation { - String attr1; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceProduct2.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceProduct2.java -index 97cac7d40..5eb9ba817 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceProduct2.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceProduct2.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.jackson2.resource; - - import org.jboss.resteasy.annotations.providers.jaxb.IgnoreMediaTypes; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "product") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceXmlProduct.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceXmlProduct.java -index 7e81149d8..659c935e6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceXmlProduct.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/resource/JacksonJaxbCoexistenceXmlProduct.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.jackson2.resource; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "product") - @NoJackson -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbCacheTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbCacheTest.java -index d8d5d58b7..9d4953cd4 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbCacheTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbCacheTest.java -@@ -19,7 +19,7 @@ import org.junit.runner.RunWith; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Providers; --import javax.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBContext; - import java.lang.reflect.ReflectPermission; - import java.util.PropertyPermission; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbElementTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbElementTest.java -index a8200078e..1c061570b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbElementTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbElementTest.java -@@ -21,7 +21,7 @@ import org.junit.Assert; - import org.junit.runner.RunWith; - import javax.ws.rs.client.Entity; - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbMarshallingSoakTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbMarshallingSoakTest.java -index 1f6a0697a..9ac3919cc 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbMarshallingSoakTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbMarshallingSoakTest.java -@@ -23,8 +23,8 @@ import org.junit.runner.RunWith; - - import javax.ws.rs.client.Entity; - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.io.ByteArrayInputStream; - import java.lang.reflect.ReflectPermission; - import java.net.SocketPermission; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbXmlRootElementProviderTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbXmlRootElementProviderTest.java -index 8b5ccca20..7616258b6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbXmlRootElementProviderTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/JaxbXmlRootElementProviderTest.java -@@ -26,7 +26,7 @@ import org.junit.Test; - import org.junit.runner.RunWith; - - import javax.ws.rs.client.ResponseProcessingException; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - import javax.xml.namespace.QName; - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/MapTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/MapTest.java -index 7df5bd579..92d28a53f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/MapTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/MapTest.java -@@ -26,8 +26,8 @@ import javax.ws.rs.client.Entity; - - import javax.ws.rs.core.GenericType; - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; - import javax.xml.namespace.QName; - import javax.xml.transform.stream.StreamSource; - import java.io.ByteArrayInputStream; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/SeeAlsoAnnotationTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/SeeAlsoAnnotationTest.java -index ac8d7f128..c17186853 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/SeeAlsoAnnotationTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/SeeAlsoAnnotationTest.java -@@ -21,7 +21,7 @@ import org.junit.Test; - import org.junit.runner.RunWith; - - import javax.ws.rs.client.Entity; --import javax.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBContext; - import java.io.StringWriter; - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJAXBContextFinderTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJAXBContextFinderTest.java -index 79417f240..51a8901c4 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJAXBContextFinderTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJAXBContextFinderTest.java -@@ -10,12 +10,12 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.Response; - import javax.ws.rs.ext.ContextResolver; - import javax.ws.rs.ext.Provider; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import org.jboss.arquillian.container.test.api.Deployment; - import org.jboss.arquillian.container.test.api.RunAsClient; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJaxbProvidersTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJaxbProvidersTest.java -index 691e0d73a..1d7290c7d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJaxbProvidersTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/XmlJaxbProvidersTest.java -@@ -32,8 +32,8 @@ import org.junit.Test; - import org.junit.runner.RunWith; - - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Unmarshaller; - import java.io.File; - import java.io.FilePermission; - import java.io.InputStream; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/Customer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/Customer.java -index 96eace6b2..f76323be1 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/Customer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/Customer.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jaxb.link; - - import javax.ws.rs.core.Link; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/package-info.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/package-info.java -index 97573b0eb..2463dd2e9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/package-info.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/link/package-info.java -@@ -4,5 +4,5 @@ - }) package org.jboss.resteasy.test.providers.jaxb.link; - - import javax.ws.rs.core.Link; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -\ No newline at end of file -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -\ No newline at end of file -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCompanyCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCompanyCustomer.java -index 942add32b..ed3547857 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCompanyCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCompanyCustomer.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCustomer.java -index eee3a27ef..fc2e7e542 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassCustomer.java -@@ -1,13 +1,13 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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.XmlElementWrapper; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlSeeAlso; --import javax.xml.bind.annotation.XmlTransient; -+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.XmlElementWrapper; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlTransient; - import java.text.DateFormat; - import java.text.ParseException; - import java.util.Date; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPerson.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPerson.java -index da3146879..c84d7a62d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPerson.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPerson.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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 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; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPrivatCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPrivatCustomer.java -index 5cdd6404a..a0ac6ed49 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPrivatCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/AbstractJaxbClassPrivatCustomer.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/BadContentTypeTestBean.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/BadContentTypeTestBean.java -index 081f5343e..75b160322 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/BadContentTypeTestBean.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/BadContentTypeTestBean.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class BadContentTypeTestBean { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetCustomer.java -index db7158a27..ef17c1007 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - @XmlAccessorType(XmlAccessType.PROPERTY) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetFavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetFavoriteMovieXmlRootElement.java -index 916de5aaf..a1ff9fc8e 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetFavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharSetFavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class CharSetFavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharacterSetData.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharacterSetData.java -index 885abcbd1..e5f2c23cc 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharacterSetData.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CharacterSetData.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "test-data") - public class CharacterSetData { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Child.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Child.java -index f31ad7189..98500c840 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Child.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Child.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - - /** - * A Child. -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionCustomer.java -index 76fd34580..f53b29930 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionNamespacedCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionNamespacedCustomer.java -index b538d259a..21984a89b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionNamespacedCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CollectionNamespacedCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer", namespace = "http://customer.com") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CustomOverrideFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CustomOverrideFoo.java -index c6e35aab9..b9e068e47 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CustomOverrideFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/CustomOverrideFoo.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class CustomOverrideFoo { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/EmptyContentTypeFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/EmptyContentTypeFoo.java -index 3bdf84071..f2eb7bec3 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/EmptyContentTypeFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/EmptyContentTypeFoo.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class EmptyContentTypeFoo { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericResourceModel.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericResourceModel.java -index 3a7eb57d3..47cc6b0ae 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericResourceModel.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericResourceModel.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class GenericResourceModel { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericSuperInterfaceDataCenter.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericSuperInterfaceDataCenter.java -index b5bf30968..ac275f679 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericSuperInterfaceDataCenter.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/GenericSuperInterfaceDataCenter.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class GenericSuperInterfaceDataCenter extends GenericSuperInterfaceBaseResource { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceAnimal.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceAnimal.java -index e5918c667..c71f981fe 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceAnimal.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceAnimal.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlSeeAlso; - - @XmlSeeAlso({InheritanceDog.class, InheritanceCat.class}) - public abstract class InheritanceAnimal { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceCat.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceCat.java -index 255599637..dcb5c8e89 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceCat.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceCat.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.PROPERTY) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceDog.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceDog.java -index 0d85e19cd..6a04e2b57 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceDog.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceDog.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.PROPERTY) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceZoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceZoo.java -index f4a46cf32..6f0124657 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceZoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/InheritanceZoo.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Item.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Item.java -index 663e861c5..6a4316cf4 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Item.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Item.java -@@ -1,12 +1,12 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.Unmarshaller; --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.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.Unmarshaller; -+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.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Itemtype.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Itemtype.java -index 0f50467cb..1239d4b5f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Itemtype.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Itemtype.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - - import java.math.BigDecimal; - import java.math.BigInteger; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JAXBCache.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JAXBCache.java -index d179d9696..94f342a71 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JAXBCache.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JAXBCache.java -@@ -3,8 +3,8 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - import org.jboss.resteasy.core.ExceptionAdapter; - import org.jboss.logging.Logger; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.util.concurrent.ConcurrentHashMap; - - public final class JAXBCache { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheChild.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheChild.java -index 85af3e1b9..1d9bce928 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheChild.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheChild.java -@@ -1,12 +1,12 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - - --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheParent.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheParent.java -index f236a9302..31291444d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheParent.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCacheParent.java -@@ -1,12 +1,12 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementWrapper; --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.XmlElementWrapper; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionFoo.java -index 5a95b5613..90725f4ed 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionFoo.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "foo") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionNamespacedFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionNamespacedFoo.java -index 7e8aad865..9f53b83ae 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionNamespacedFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbCollectionNamespacedFoo.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "foo", namespace = "http://foo.com") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbElementClient.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbElementClient.java -index 08ca08f5b..38faaa98c 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbElementClient.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbElementClient.java -@@ -6,7 +6,7 @@ import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.PathParam; - import javax.ws.rs.Produces; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - - @Consumes("application/xml") - @Produces("application/xml") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbJsonElementClient.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbJsonElementClient.java -index 562943068..93550e2b9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbJsonElementClient.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbJsonElementClient.java -@@ -6,7 +6,7 @@ import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.PathParam; - import javax.ws.rs.Produces; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - - @Consumes("application/json") - @Produces("application/json") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbMarshallingSoakItem.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbMarshallingSoakItem.java -index dfc21af20..1fb46bb58 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbMarshallingSoakItem.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/JaxbMarshallingSoakItem.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Map; - - @XmlRootElement(name = "item") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/KeepCharsetFavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/KeepCharsetFavoriteMovieXmlRootElement.java -index 30bbaffc4..711d4ad7e 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/KeepCharsetFavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/KeepCharsetFavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class KeepCharsetFavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/LinkJaxbCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/LinkJaxbCustomer.java -index c3e9419fd..e8220b709 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/LinkJaxbCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/LinkJaxbCustomer.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - - import javax.ws.rs.core.Link; --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapFoo.java -index 56a9f1962..302eae236 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapFoo.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(namespace = "http://foo.com") - public class MapFoo { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapJaxb.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapJaxb.java -index 0fb3eff7d..a22868aac 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapJaxb.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/MapJaxb.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAnyElement; --import javax.xml.bind.annotation.XmlAnyAttribute; --import javax.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAnyElement; -+import jakarta.xml.bind.annotation.XmlAnyAttribute; -+import jakarta.xml.bind.annotation.XmlTransient; - import javax.xml.namespace.QName; - import java.util.ArrayList; - import java.util.HashMap; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Order.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Order.java -index 9b2760c1f..b42b2d0e1 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Order.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Order.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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; -+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 java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Ordertype.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Ordertype.java -index 89e0c55d1..705b57eb5 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Ordertype.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Ordertype.java -@@ -2,11 +2,11 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - - import java.util.ArrayList; - import java.util.List; --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.XmlType; -+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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Parent.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Parent.java -index ff25628a0..4667d419f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Parent.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Parent.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlElementWrapper; --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.XmlElementWrapper; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlType; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/QualityFactorThing.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/QualityFactorThing.java -index 78576022d..f8ca04343 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/QualityFactorThing.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/QualityFactorThing.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class QualityFactorThing { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationBaseFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationBaseFoo.java -index c44c4c6df..2f2806696 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationBaseFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationBaseFoo.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlSeeAlso; - - @XmlSeeAlso(SeeAlsoAnnotationRealFoo.class) - public class SeeAlsoAnnotationBaseFoo { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationFooIntf.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationFooIntf.java -index 6c57a02a3..8eee3f05b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationFooIntf.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationFooIntf.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlSeeAlso; - - @XmlSeeAlso(SeeAlsoAnnotationRealFoo.class) - public interface SeeAlsoAnnotationFooIntf { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationRealFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationRealFoo.java -index 808ffec7c..fb3765ef2 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationRealFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/SeeAlsoAnnotationRealFoo.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class SeeAlsoAnnotationRealFoo extends SeeAlsoAnnotationBaseFoo implements SeeAlsoAnnotationFooIntf { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/ShipTo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/ShipTo.java -index 20ea75484..06766360f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/ShipTo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/ShipTo.java -@@ -1,12 +1,12 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.Unmarshaller; --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.XmlTransient; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.Unmarshaller; -+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.XmlTransient; -+import jakarta.xml.bind.annotation.XmlType; - - @XmlRootElement(name = "shipto") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Shiptotype.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Shiptotype.java -index 5223269b3..8ab8ef04b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Shiptotype.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/Shiptotype.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPerson.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPerson.java -index 409cd6be6..0b6034d44 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPerson.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPerson.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "person") - @XmlAccessorType(XmlAccessType.PROPERTY) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPlace.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPlace.java -index 1c834ae67..33df4ef60 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPlace.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StreamResetPlace.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "place") - @XmlAccessorType(XmlAccessType.PROPERTY) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StringCharsetRespond.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StringCharsetRespond.java -index 0eae77032..441af9fc7 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StringCharsetRespond.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/StringCharsetRespond.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "respond_test") - public class StringCharsetRespond { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlEnumParamLocation.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlEnumParamLocation.java -index 159cbeef0..a38ed0882 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlEnumParamLocation.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlEnumParamLocation.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlEnum; --import javax.xml.bind.annotation.XmlEnumValue; -+import jakarta.xml.bind.annotation.XmlEnum; -+import jakarta.xml.bind.annotation.XmlEnumValue; - - @XmlEnum - public enum XmlEnumParamLocation { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderDecorator.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderDecorator.java -index cdbb48d07..c04de9c96 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderDecorator.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderDecorator.java -@@ -4,7 +4,7 @@ import org.jboss.resteasy.annotations.DecorateTypes; - import org.jboss.resteasy.spi.interception.DecoratorProcessor; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - import java.lang.annotation.Annotation; - - @DecorateTypes("application/json") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderJunkIntf.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderJunkIntf.java -index 56e9c1ba8..8ad48202a 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderJunkIntf.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderJunkIntf.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - - import org.jboss.resteasy.annotations.Decorator; - --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.Marshaller; - - /** - * Test correct type (Marshaller), but incorrect media type -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderThing.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderThing.java -index c785c1b73..cf3ba5191 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderThing.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlHeaderThing.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlHeaderJunkIntf -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlien.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlien.java -index 9b6d669a4..9dce52b5e 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlien.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlien.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - @XmlJavaTypeAdapter(XmlJavaTypeAdapterAlienAdapter.class) - public class XmlJavaTypeAdapterAlien { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlienAdapter.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlienAdapter.java -index a1b1d4fbe..41097cf99 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlienAdapter.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterAlienAdapter.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - - import org.jboss.logging.Logger; - --import javax.xml.bind.annotation.adapters.XmlAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlAdapter; - - public class XmlJavaTypeAdapterAlienAdapter extends XmlAdapter { - public static int marshalCounter; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterFoo.java -index c0c93fdef..de66b1027 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterFoo.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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.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.adapters.XmlJavaTypeAdapter; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterHuman.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterHuman.java -index 7735e511d..9db752097 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterHuman.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJavaTypeAdapterHuman.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "human") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJaxbProvidersHelper.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJaxbProvidersHelper.java -index 90467f03d..eb321b543 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJaxbProvidersHelper.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/XmlJaxbProvidersHelper.java -@@ -4,10 +4,10 @@ package org.jboss.resteasy.test.providers.jaxb.resource; - import org.jboss.resteasy.core.ExceptionAdapter; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Unmarshaller; - import javax.xml.stream.XMLStreamReader; - import java.io.InputStream; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ObjectFactory.java -index 027b50aca..bbd732abf 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jaxb.resource.parsing; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.datatype.XMLGregorianCalendar; - import javax.xml.namespace.QName; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingAbstractData.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingAbstractData.java -index 29a69eb20..2cb608e16 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingAbstractData.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingAbstractData.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource.parsing; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlSeeAlso; --import javax.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; - - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "ParsingAbstractData") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionPackage.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionPackage.java -index 0b2f200dd..c34f6d9df 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionPackage.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionPackage.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource.parsing; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - import java.util.ArrayList; - import java.util.List; - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionRecord.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionRecord.java -index 3d6a644cc..d4e40ad71 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionRecord.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jaxb/resource/parsing/ParsingDataCollectionRecord.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jaxb.resource.parsing; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - import javax.xml.datatype.XMLGregorianCalendar; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/JaxbSmokeTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/JaxbSmokeTest.java -index d6424bee2..902b56465 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/JaxbSmokeTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/JaxbSmokeTest.java -@@ -23,9 +23,9 @@ import org.junit.Before; - import org.junit.Test; - import org.junit.runner.RunWith; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.io.StringReader; - import java.io.StringWriter; - import java.util.ArrayList; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/BaseClassFromTypeListCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/BaseClassFromTypeListCustomer.java -index 1b24fb59d..48639d986 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/BaseClassFromTypeListCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/BaseClassFromTypeListCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/Book.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/Book.java -index 9267092e6..0f1e02049 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/Book.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/Book.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "book") - public class Book { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ContentTypeMatchingError.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ContentTypeMatchingError.java -index 73f38acbb..3b8a16dc9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ContentTypeMatchingError.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ContentTypeMatchingError.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class ContentTypeMatchingError { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomer.java -index 7f6bf7038..3d7b96214 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomer.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlTransient; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlTransient; - import java.io.Serializable; - import java.text.DateFormat; - import java.text.ParseException; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomerList.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomerList.java -index 3f10e1079..ff57eceec 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomerList.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonCustomerList.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlElementRef; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElementRef; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Collection; - - @XmlRootElement(name = "customers") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonMediaTypeObject.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonMediaTypeObject.java -index ba760478f..af424aefe 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonMediaTypeObject.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JettisonMediaTypeObject.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionFoo.java -index a05a3de21..92be30a88 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionFoo.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAccessType; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionNamespacedFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionNamespacedFoo.java -index 6437c7104..580534ae6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionNamespacedFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonCollectionNamespacedFoo.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "foo", namespace = "http://foo.com") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonMapFoo.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonMapFoo.java -index 16d0d70e1..f2756cbf9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonMapFoo.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/JsonMapFoo.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAttribute; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAttribute; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class JsonMapFoo { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestBase.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestBase.java -index 25b59b7d3..b64373bab 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestBase.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestBase.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlSeeAlso; --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.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestExtends.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestExtends.java -index 90ef05b0e..6f5dfbb26 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestExtends.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/NamespaceMappingTestExtends.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ObjectFactory.java -index 382e6e19a..7b55445e9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/TypeMappingBean.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/TypeMappingBean.java -index 10587457e..faf3a0999 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/TypeMappingBean.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/TypeMappingBean.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class TypeMappingBean { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/UserEntity.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/UserEntity.java -index 7231b2352..74c86af1c 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/UserEntity.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jettison/resource/UserEntity.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.jettison.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlAccessorType(XmlAccessType.NONE) - @XmlRootElement(name = "user") -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -index b06dc04e6..dae54aa8d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java -@@ -31,8 +31,8 @@ import javax.ws.rs.client.ClientBuilder; - import javax.ws.rs.client.Entity; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.Response; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - import java.io.*; - import java.nio.charset.StandardCharsets; - import java.util.ArrayList; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersCustomer.java -index 03904761b..c7f047110 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersName.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersName.java -index 486eb3022..183478e94 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersName.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersName.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "name") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersXop.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersXop.java -index e7854a3c3..78809703d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersXop.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/ContextProvidersXop.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlMimeType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlMimeType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/EmbeddedMultipartCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/EmbeddedMultipartCustomer.java -index 17a2a2355..c7f1bc261 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/EmbeddedMultipartCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/EmbeddedMultipartCustomer.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - public class EmbeddedMultipartCustomer { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/InputPartDefaultContentTypeWildcardOverwriteXmlBean.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/InputPartDefaultContentTypeWildcardOverwriteXmlBean.java -index 4d3a2ff5b..ed92a3834 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/InputPartDefaultContentTypeWildcardOverwriteXmlBean.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/InputPartDefaultContentTypeWildcardOverwriteXmlBean.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderCustomer.java -index b8e8dec17..96937393b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderCustomer.java -@@ -1,7 +1,7 @@ - package org.jboss.resteasy.test.providers.multipart.resource; - --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - public class MimeMultipartProviderCustomer { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -index 435812a84..ef4a96fc5 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java -@@ -23,10 +23,10 @@ import javax.ws.rs.PUT; - import javax.ws.rs.Path; - import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlMimeType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlMimeType; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.io.IOException; - import java.io.InputStream; - import java.io.InputStreamReader; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/MediaTypeNegotiationTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/MediaTypeNegotiationTest.java -index a877a2213..09f4de7db 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/MediaTypeNegotiationTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/MediaTypeNegotiationTest.java -@@ -12,7 +12,7 @@ import javax.ws.rs.core.MediaType; - import javax.ws.rs.core.Response; - import javax.ws.rs.core.Response.Status; - import javax.ws.rs.ext.ExceptionMapper; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - import org.jboss.arquillian.container.test.api.Deployment; - import org.jboss.arquillian.container.test.api.RunAsClient; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/sourceProvider/resource/Book.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/sourceProvider/resource/Book.java -index 5298b779b..7dd97f2da 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/sourceProvider/resource/Book.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/sourceProvider/resource/Book.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.sourceProvider.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class Book { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersCustomer.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersCustomer.java -index 7f1bbe5c7..0f7d3304b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersCustomer.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersCustomer.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.validation.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "customer") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersName.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersName.java -index 488f73bec..8b723f9de 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersName.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersName.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.validation.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "name") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersXop.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersXop.java -index f712ee63d..39d2c7a0c 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersXop.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/ContextProvidersXop.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.validation.resource; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlMimeType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlMimeType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/CustomExceptionMapperReport.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/CustomExceptionMapperReport.java -index ad4eb736b..aa9604c1f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/CustomExceptionMapperReport.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/validation/resource/CustomExceptionMapperReport.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.validation.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement(name = "testReport") - @XmlAccessorType(XmlAccessType.FIELD) -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java -index d8cc4bcf2..34b0877df 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessing2Test.java -@@ -435,7 +435,7 @@ public class SecureProcessing2Test { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/xmlType/", URL_PREFIX + ext)).request() -@@ -443,7 +443,7 @@ public class SecureProcessing2Test { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/JAXBElement/", URL_PREFIX + ext)).request() -@@ -451,7 +451,7 @@ public class SecureProcessing2Test { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/collection/", URL_PREFIX + ext)).request() -@@ -459,7 +459,7 @@ public class SecureProcessing2Test { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/map/", URL_PREFIX + ext)).request() -@@ -467,7 +467,7 @@ public class SecureProcessing2Test { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - } - -@@ -548,7 +548,7 @@ public class SecureProcessing2Test { - String entity = response.readEntity(String.class); - logger.info("doDTDFails(): result: " + entity); - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); -- Assert.assertThat("Wrong exception in response", entity, startsWith("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong exception in response", entity, startsWith("jakarta.xml.bind.UnmarshalException")); - Assert.assertThat("Wrong content of response", entity, containsString("DOCTYPE")); - Assert.assertThat("Wrong content of response", entity, containsString("true")); - } -@@ -561,7 +561,7 @@ public class SecureProcessing2Test { - String entity = response.readEntity(String.class); - logger.info("doDTDFails(): result: " + entity); - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); -- Assert.assertThat("Wrong exception in response", entity, startsWith("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong exception in response", entity, startsWith("jakarta.xml.bind.UnmarshalException")); - Assert.assertThat("Wrong content of response", entity, containsString("DOCTYPE")); - Assert.assertThat("Wrong content of response", entity, containsString("http://apache.org/xml/features/disallow-doctype-decl")); - Assert.assertThat("Wrong content of response", entity, containsString("true")); -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java -index 1224673f3..eb5d80bb1 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/SecureProcessingTest.java -@@ -450,7 +450,7 @@ public class SecureProcessingTest { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/xmlType/", URL_PREFIX + ext)).request() -@@ -458,7 +458,7 @@ public class SecureProcessingTest { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/JAXBElement/", URL_PREFIX + ext)).request() -@@ -466,7 +466,7 @@ public class SecureProcessingTest { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/collection/", URL_PREFIX + ext)).request() -@@ -474,7 +474,7 @@ public class SecureProcessingTest { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - { - Response response = client.target(generateURL("/entityExpansion/map/", URL_PREFIX + ext)).request() -@@ -482,7 +482,7 @@ public class SecureProcessingTest { - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); - String entity = response.readEntity(String.class); - logger.info("doEntityExpansionFails() result: " + entity); -- Assert.assertThat("Wrong type of exception", entity, containsString("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong type of exception", entity, containsString("jakarta.xml.bind.UnmarshalException")); - } - } - -@@ -563,7 +563,7 @@ public class SecureProcessingTest { - String entity = response.readEntity(String.class); - logger.info("doDTDFails(): result: " + entity); - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); -- Assert.assertThat("Wrong exception in response", entity, startsWith("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong exception in response", entity, startsWith("jakarta.xml.bind.UnmarshalException")); - Assert.assertThat("Wrong content of response", entity, containsString("DOCTYPE")); - Assert.assertThat("Wrong content of response", entity, containsString("true")); - } -@@ -576,7 +576,7 @@ public class SecureProcessingTest { - String entity = response.readEntity(String.class); - logger.info("doDTDFails(): result: " + entity); - Assert.assertEquals(HttpResponseCodes.SC_BAD_REQUEST, response.getStatus()); -- Assert.assertThat("Wrong exception in response", entity, startsWith("javax.xml.bind.UnmarshalException")); -+ Assert.assertThat("Wrong exception in response", entity, startsWith("jakarta.xml.bind.UnmarshalException")); - Assert.assertThat("Wrong content of response", entity, containsString("DOCTYPE")); - Assert.assertThat("Wrong content of response", entity, containsString("http://apache.org/xml/features/disallow-doctype-decl")); - Assert.assertThat("Wrong content of response", entity, containsString("true")); -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/XxeSecureProcessingTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/XxeSecureProcessingTest.java -index 38ba6d256..f0e2e1917 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/XxeSecureProcessingTest.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/XxeSecureProcessingTest.java -@@ -119,7 +119,7 @@ public class XxeSecureProcessingTest { - Assert.assertEquals(400, response.getStatus()); - String entity = response.readEntity(String.class); - logger.debug("Result: " + entity); -- Assert.assertTrue(entity.contains("javax.xml.bind.UnmarshalException")); -+ Assert.assertTrue(entity.contains("jakarta.xml.bind.UnmarshalException")); - response.close(); - } - -@@ -149,7 +149,7 @@ public class XxeSecureProcessingTest { - Assert.assertEquals(400, response.getStatus()); - String entity = response.readEntity(String.class); - logger.debug("Result: " + entity); -- Assert.assertTrue(entity.contains("javax.xml.bind.UnmarshalException")); -+ Assert.assertTrue(entity.contains("jakarta.xml.bind.UnmarshalException")); - response.close(); - } - -@@ -179,7 +179,7 @@ public class XxeSecureProcessingTest { - Assert.assertEquals(400, response.getStatus()); - String entity = response.readEntity(String.class); - logger.debug("Result: " + entity); -- Assert.assertTrue(entity.contains("javax.xml.bind.UnmarshalException")); -+ Assert.assertTrue(entity.contains("jakarta.xml.bind.UnmarshalException")); - response.close(); - } - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ExternalParameterEntityWrapper.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ExternalParameterEntityWrapper.java -index fd724e41b..c5f0a3a4c 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ExternalParameterEntityWrapper.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ExternalParameterEntityWrapper.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class ExternalParameterEntityWrapper { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ObjectFactory.java -index 8b470a1ed..fbc4eaabf 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingBar.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingBar.java -index 2b47e5e28..14d938fe8 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingBar.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingBar.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class SecureProcessingBar { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovie.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovie.java -index 3aa15d5b8..0d4042009 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovie.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovie.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlRootElement.java -index 139dde5fb..287a04f6d 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class SecureProcessingFavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlType.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlType.java -index 45e6953cf..3bbb21d98 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlType.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingFavoriteMovieXmlType.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingResource.java -index ff501846c..173c27fa2 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/SecureProcessingResource.java -@@ -10,7 +10,7 @@ import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - - @Path("/") - public class SecureProcessingResource { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/XxeSecureProcessingFavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/XxeSecureProcessingFavoriteMovieXmlRootElement.java -index 6b8002dae..2935c7e54 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/XxeSecureProcessingFavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/XxeSecureProcessingFavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class XxeSecureProcessingFavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/ObjectFactory.java -index ce0a2a1b1..542d3cf0f 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.xxe.resource.xxeJaxb; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovie.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovie.java -index 291850633..c457bbf9a 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovie.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovie.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource.xxeJaxb; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlRootElement.java -index 83c7cf35a..e919f3117 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource.xxeJaxb; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class XxeJaxbFavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlType.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlType.java -index e04ea4f9d..aec77c58c 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlType.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbFavoriteMovieXmlType.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource.xxeJaxb; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbMovieResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbMovieResource.java -index 59e3e1a67..3deea6ef2 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbMovieResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJaxb/XxeJaxbMovieResource.java -@@ -4,7 +4,7 @@ import org.jboss.logging.Logger; - import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - import java.util.Iterator; - import java.util.List; - import java.util.Map; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovie.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovie.java -index 32fa72943..247fcf91b 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovie.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovie.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource.xxeJettison; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlRootElement.java -index 7feccf59e..f089f4df2 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlRootElement.java -@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.xxe.resource.xxeJettison; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - @NoJackson -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlType.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlType.java -index b3a8a3bb7..1fc263ba6 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlType.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/FavoriteMovieXmlType.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.xxe.resource.xxeJettison; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/JettisonMovieResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/JettisonMovieResource.java -index 261ad28aa..9e07414e9 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/JettisonMovieResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/JettisonMovieResource.java -@@ -5,7 +5,7 @@ import org.jboss.logging.Logger; - import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - import java.util.List; - import java.util.Map; - import java.util.Set; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/ObjectFactory.java -index 102f54786..a3518b6c3 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeJettison/ObjectFactory.java -@@ -2,9 +2,9 @@ package org.jboss.resteasy.test.xxe.resource.xxeJettison; - - import org.jboss.resteasy.annotations.providers.NoJackson; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovie.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovie.java -index 7e9e6aff5..080c14369 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovie.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovie.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource.xxeNamespace; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - /** - *

Java class for FavoriteMovie complex type. -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlRootElement.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlRootElement.java -index ba7a264f8..05869b4ac 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlRootElement.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlRootElement.java -@@ -1,6 +1,6 @@ - package org.jboss.resteasy.test.xxe.resource.xxeNamespace; - --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - @XmlRootElement - public class FavoriteMovieXmlRootElement { -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlType.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlType.java -index 0a71a40c0..2445a2afc 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlType.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/FavoriteMovieXmlType.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.xxe.resource.xxeNamespace; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/MovieResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/MovieResource.java -index e53f8ce01..bf39499a7 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/MovieResource.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/MovieResource.java -@@ -5,7 +5,7 @@ import org.jboss.logging.Logger; - import javax.ws.rs.Consumes; - import javax.ws.rs.POST; - import javax.ws.rs.Path; --import javax.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBElement; - import java.util.Iterator; - import java.util.List; - import java.util.Map; -diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/ObjectFactory.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/ObjectFactory.java -index 858ef279d..0c7ddf3f8 100644 ---- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/ObjectFactory.java -+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/xxe/resource/xxeNamespace/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.xxe.resource.xxeNamespace; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -@@ -45,4 +45,4 @@ public class ObjectFactory { - public JAXBElement createFavoriteMovie(FavoriteMovieXmlType value) { - return new JAXBElement(_FavoriteMovie_QNAME, FavoriteMovieXmlType.class, null, value); - } --} -\ No newline at end of file -+} -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/DecoratorMatcherTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/DecoratorMatcherTest.java -index cbf2b0193..4c1a8d5db 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/DecoratorMatcherTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/DecoratorMatcherTest.java -@@ -8,11 +8,11 @@ import org.junit.Before; - import org.junit.Test; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; --import javax.xml.bind.annotation.XmlRootElement; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; -+import jakarta.xml.bind.annotation.XmlRootElement; - import java.lang.annotation.Annotation; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AppCategoriesTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AppCategoriesTest.java -index cbaad23ed..7584cdbdb 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AppCategoriesTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AppCategoriesTest.java -@@ -5,10 +5,10 @@ import org.jboss.resteasy.plugins.providers.atom.app.AppCategories; - import org.junit.Assert; - import org.junit.Test; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; - import javax.xml.namespace.QName; - import java.io.StringReader; - import java.io.StringWriter; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderAppServiceTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderAppServiceTest.java -index 1a511be67..e028fa9cc 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderAppServiceTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderAppServiceTest.java -@@ -9,10 +9,10 @@ import org.jboss.resteasy.plugins.providers.atom.app.AppWorkspace; - import org.junit.Assert; - import org.junit.Test; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; - import javax.xml.namespace.QName; - import java.io.StringReader; - import java.io.StringWriter; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderModelTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderModelTest.java -index 2c3beb0db..66cce13dd 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderModelTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/AtomProviderModelTest.java -@@ -16,8 +16,8 @@ import org.jboss.resteasy.test.providers.resource.AtomProviderModelCustomerAtom; - import org.junit.Test; - - import javax.ws.rs.core.MediaType; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Marshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Marshaller; - import javax.xml.parsers.DocumentBuilderFactory; - import java.io.ByteArrayOutputStream; - import java.io.PrintStream; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JaxbNamespacePrefixTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JaxbNamespacePrefixTest.java -index b8a7def81..3f6bb8e5a 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JaxbNamespacePrefixTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JaxbNamespacePrefixTest.java -@@ -9,10 +9,10 @@ import org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix.ObjectFact - import org.junit.Assert; - import org.junit.Test; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.Marshaller; --import javax.xml.bind.PropertyException; --import javax.xml.bind.annotation.XmlSchema; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.PropertyException; -+import jakarta.xml.bind.annotation.XmlSchema; - import java.io.ByteArrayOutputStream; - import java.math.BigDecimal; - -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/NamespaceMappingTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/NamespaceMappingTest.java -index 293725dcd..289d07420 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/NamespaceMappingTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/NamespaceMappingTest.java -@@ -12,11 +12,11 @@ import org.junit.Assert; - import org.junit.BeforeClass; - import org.junit.Test; - --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBElement; --import javax.xml.bind.JAXBException; --import javax.xml.bind.Marshaller; --import javax.xml.bind.Unmarshaller; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.JAXBException; -+import jakarta.xml.bind.Marshaller; -+import jakarta.xml.bind.Unmarshaller; - import javax.xml.stream.XMLStreamReader; - import javax.xml.stream.XMLStreamWriter; - import java.io.StringWriter; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/UserDefinedContextResolverTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/UserDefinedContextResolverTest.java -index 430dfe7a9..3e3b5b991 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/UserDefinedContextResolverTest.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/UserDefinedContextResolverTest.java -@@ -5,8 +5,8 @@ import java.lang.annotation.Annotation; - import javax.ws.rs.Produces; - import javax.ws.rs.core.MediaType; - import javax.ws.rs.ext.ContextResolver; --import javax.xml.bind.JAXBContext; --import javax.xml.bind.JAXBException; -+import jakarta.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBException; - - import org.jboss.resteasy.plugins.providers.jaxb.JAXBContextFinder; - import org.jboss.resteasy.spi.ResteasyProviderFactory; -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestBase.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestBase.java -index c7f5160f3..55c9d97fc 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestBase.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestBase.java -@@ -1,10 +1,10 @@ - package org.jboss.resteasy.test.providers.namespace.mapping; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --import javax.xml.bind.annotation.XmlSeeAlso; --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.XmlSeeAlso; -+import jakarta.xml.bind.annotation.XmlType; - - - /** -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestExtends.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestExtends.java -index 4da449702..be7775214 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestExtends.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/NamespaceMappingTestExtends.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.namespace.mapping; - --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/ObjectFactory.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/ObjectFactory.java -index 934b25397..cef1b7a1c 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/ObjectFactory.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/namespace/mapping/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.namespace.mapping; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/AtomProviderModelCustomerAtom.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/AtomProviderModelCustomerAtom.java -index 77d46de13..d049cb1fe 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/AtomProviderModelCustomerAtom.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/AtomProviderModelCustomerAtom.java -@@ -1,9 +1,9 @@ - package org.jboss.resteasy.test.providers.resource; - --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 jakarta.xml.bind.annotation.XmlAccessType; -+import jakarta.xml.bind.annotation.XmlAccessorType; -+import jakarta.xml.bind.annotation.XmlElement; -+import jakarta.xml.bind.annotation.XmlRootElement; - - /** - * @author Bill Burke -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/ObjectFactory.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/ObjectFactory.java -index b3cb94870..5fcb84c25 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/ObjectFactory.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/ObjectFactory.java -@@ -6,7 +6,7 @@ import org.jboss.resteasy.plugins.providers.atom.app.AppCollection; - import org.jboss.resteasy.plugins.providers.atom.app.AppService; - import org.jboss.resteasy.plugins.providers.atom.app.AppWorkspace; - --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.annotation.XmlRegistry; - - /** - * This class shouldn't be renamed. JAXBContext require this name. -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItem.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItem.java -index bcdabde0a..9fc2bb128 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItem.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItem.java -@@ -1,12 +1,12 @@ - package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; - - import java.math.BigDecimal; --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.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; -+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.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.datatype.XMLGregorianCalendar; - - -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItems.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItems.java -index 7af65756b..eaa4fee22 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItems.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixItems.java -@@ -2,10 +2,10 @@ package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; - - import java.util.ArrayList; - import java.util.List; --import javax.xml.bind.annotation.XmlAccessType; --import javax.xml.bind.annotation.XmlAccessorType; --import javax.xml.bind.annotation.XmlElement; --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.XmlType; - - - /** -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixPurchaseOrderType.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixPurchaseOrderType.java -index 2ae655114..a1db06ea1 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixPurchaseOrderType.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixPurchaseOrderType.java -@@ -1,11 +1,11 @@ - package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; - --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.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; -+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.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; - import javax.xml.datatype.XMLGregorianCalendar; - - -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixUSAddress.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixUSAddress.java -index ff7947576..ee1799907 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixUSAddress.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/JaxbNameSpacePrefixUSAddress.java -@@ -1,14 +1,14 @@ - package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; - - import java.math.BigDecimal; --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.XmlSchemaType; --import javax.xml.bind.annotation.XmlType; --import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; --import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -+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.XmlSchemaType; -+import jakarta.xml.bind.annotation.XmlType; -+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - - /** -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/ObjectFactory.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/ObjectFactory.java -index a7522a3f4..e0a327ac2 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/ObjectFactory.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/ObjectFactory.java -@@ -1,8 +1,8 @@ - package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; - --import javax.xml.bind.JAXBElement; --import javax.xml.bind.annotation.XmlElementDecl; --import javax.xml.bind.annotation.XmlRegistry; -+import jakarta.xml.bind.JAXBElement; -+import jakarta.xml.bind.annotation.XmlElementDecl; -+import jakarta.xml.bind.annotation.XmlRegistry; - import javax.xml.namespace.QName; - - /** -diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/package-info.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/package-info.java -index 9e55677e9..bd7fefdcb 100644 ---- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/package-info.java -+++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/resource/jaxbNameSpacePrefix/package-info.java -@@ -1,2 +1,2 @@ --@javax.xml.bind.annotation.XmlSchema(namespace = "http://jboss.org/resteasy/test/providers/resource/jaxbNameSpacePrefix", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://jboss.org/resteasy/test/providers/resource/jaxbNameSpacePrefix", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) - package org.jboss.resteasy.test.providers.resource.jaxbNameSpacePrefix; --- -2.39.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..51c1398 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +resteasy package is retired on branch c10s for CS-2364 \ No newline at end of file diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c8aa455..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# recipients: rhcs-team ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/resteasy.spec b/resteasy.spec deleted file mode 100644 index cc339d1..0000000 --- a/resteasy.spec +++ /dev/null @@ -1,462 +0,0 @@ -%global namedreltag .Final -%global namedversion %{version}%{namedreltag} - -Name: resteasy -Version: 3.0.26 -Release: 30%{?dist} -Summary: Framework for RESTful Web services and Java applications -License: Apache-2.0 -URL: http://resteasy.jboss.org/ -Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz -Patch1: 0001-RESTEASY-2559-Improper-validation-of-response-header.patch -Patch2: 0001-Remove-Log4jLogger.patch -Patch3: 0001-Replace-javax.activation-imports-with-jakarta.activa.patch -Patch4: 0001-Update-to-new-jakarta-xml-bind-namespace.patch - -BuildArch: noarch -%if 0%{?fedora} -ExclusiveArch: %{java_arches} noarch -%endif - -BuildRequires: maven-local -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(jakarta.activation:jakarta.activation-api) -BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api) -BuildRequires: mvn(org.apache.httpcomponents:httpclient) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) - -# Jackson 2 -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider) - -BuildRequires: mvn(org.jboss:jboss-parent:pom:) -BuildRequires: mvn(org.jboss.logging:jboss-logging) -BuildRequires: mvn(org.jboss.logging:jboss-logging-annotations) -BuildRequires: mvn(org.jboss.logging:jboss-logging-processor) -BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec) -BuildRequires: mvn(org.slf4j:slf4j-api) - -%description -%global desc \ -RESTEasy contains a JBoss project that provides frameworks to help\ -build RESTful Web Services and RESTful Java applications. It is a fully\ -certified and portable implementation of the JAX-RS specification. -%{desc} -%global extdesc %{desc}\ -\ -This package contains - -%package -n pki-%{name} -Summary: Framework for RESTful Web services and Java applications -Obsoletes: %{name} < %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -Requires: pki-%{name}-client = %{version}-%{release} -Requires: pki-%{name}-core = %{version}-%{release} -Requires: pki-%{name}-jackson2-provider = %{version}-%{release} -Requires: pki-%{name}-servlet-initializer = %{version}-%{release} - -# subpackages removed in fedora 32 -Obsoletes: %{name}-fastinfoset-provider < 3.0.26-1 -Obsoletes: %{name}-jackson-provider < 3.0.26-1 -Obsoletes: %{name}-jettison-provider < 3.0.26-1 -Obsoletes: %{name}-json-p-provider < 3.0.26-1 -Obsoletes: %{name}-multipart-provider < 3.0.26-1 -Obsoletes: %{name}-netty3 < 3.0.26-1 -Obsoletes: %{name}-optional < 3.0.26-1 -Obsoletes: %{name}-test < 3.0.26-1 -Obsoletes: %{name}-validator-provider-11 < 3.0.26-1 -Obsoletes: %{name}-yaml-provider < 3.0.26-1 - -%description -n pki-%{name} -%{desc} - -%package -n pki-%{name}-core -Summary: Core modules for %{name} -Obsoletes: resteasy-jaxrs-api < 3.0.7 -Obsoletes: %{name}-core < %{version}-%{release} -Conflicts: %{name}-core < %{version}-%{release} -Provides: %{name}-core = %{version}-%{release} - -%description -n pki-%{name}-core -%{extdesc} %{summary}. - -%package -n pki-%{name}-jackson2-provider -Summary: Module jackson2-provider for %{name} -Obsoletes: %{name}-jackson2-provider < %{version}-%{release} -Conflicts: %{name}-jackson2-provider < %{version}-%{release} -Provides: %{name}-jackson2-provider = %{version}-%{release} - -%description -n pki-%{name}-jackson2-provider -%{extdesc} %{summary}. - -%package -n pki-%{name}-client -Summary: Client for %{name} -Obsoletes: %{name}-client < %{version}-%{release} -Conflicts: %{name}-client < %{version}-%{release} -Provides: %{name}-client = %{version}-%{release} - -%description -n pki-%{name}-client -%{extdesc} %{summary}. - -%package -n pki-%{name}-servlet-initializer -Summary: %{name} Servlet Initializer -Obsoletes: %{name}-servlet-initializer < %{version}-%{release} -Conflicts: %{name}-servlet-initializer < %{version}-%{release} -Provides: %{name}-servlet-initializer = %{version}-%{release} - -%description -n pki-%{name}-servlet-initializer -%{extdesc} %{summary}. - -%prep -%autosetup -n Resteasy-%{namedversion} -p 1 - -%pom_disable_module arquillian -%pom_disable_module eagledns -%pom_disable_module jboss-modules -%pom_disable_module profiling-tests -%pom_disable_module resteasy-bom -%pom_disable_module resteasy-cache -%pom_disable_module resteasy-cdi -%pom_disable_module resteasy-dependencies-bom -%pom_disable_module resteasy-guice -%pom_disable_module resteasy-jaxrs-testsuite -%pom_disable_module resteasy-jsapi -%pom_disable_module resteasy-jsapi-testing -%pom_disable_module resteasy-links -%pom_disable_module resteasy-spring -%pom_disable_module resteasy-wadl -%pom_disable_module resteasy-wadl-undertow-connector -%pom_disable_module security -%pom_disable_module server-adapters -%pom_disable_module testsuite -%pom_disable_module tjws - -pushd providers -%pom_disable_module fastinfoset -%pom_disable_module jackson -%pom_disable_module jettison -%pom_disable_module json-p-ee7 -%pom_disable_module multipart -%pom_disable_module resteasy-atom -%pom_disable_module resteasy-html -%pom_disable_module resteasy-validator-provider-11 -%pom_disable_module yaml -%pom_disable_module jaxb -popd - -find -name '*.jar' -print -delete - -%pom_remove_plugin :maven-clover2-plugin -%pom_remove_plugin :maven-javadoc-plugin - -# depend on jakarta-activation -%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:2.1.1 resteasy-jaxrs -%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:2.1.1 resteasy-spring - -# depend on jakarta-annotations -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api jboss-modules -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api providers/jaxb -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-dependencies-bom -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-guice -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-jaxrs -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-links -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-spring -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/keystone/keystone-core -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/resteasy-crypto -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-core -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-idp -%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api server-adapters/resteasy-jdk-http - -# remove resteasy-dependencies pom -%pom_remove_dep "org.jboss.resteasy:resteasy-dependencies" - -# remove redundant jcip-dependencies dep from resteasy-jaxrs -%pom_remove_dep net.jcip:jcip-annotations resteasy-jaxrs - -# remove junit dependency from all modules -%pom_remove_dep junit:junit resteasy-client -%pom_remove_dep junit:junit providers/resteasy-atom -%pom_remove_dep junit:junit providers/jaxb -%pom_remove_dep junit:junit resteasy-jaxrs -%pom_remove_dep junit:junit resteasy-servlet-initializer - -# remove log4j dependency -%pom_remove_dep log4j:log4j resteasy-jaxrs - -# depend on servlet-api from pki-servlet-4.0-api -%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-jaxrs -%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-servlet-initializer -%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom -%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb -%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jackson2 - -# add dependencies for EE APIs that were removed in Java 11 -%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-jaxrs -%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-servlet-initializer - -%pom_remove_plugin :maven-clean-plugin - -%mvn_package ":resteasy-jaxrs" core -%mvn_package ":providers-pom" core -%mvn_package ":resteasy-jaxrs-all" core -%mvn_package ":resteasy-pom" core -%mvn_package ":resteasy-jackson2-provider" jackson2-provider -%mvn_package ":resteasy-client" client -%mvn_package ":resteasy-servlet-initializer" servlet-initializer - -# Disable useless artifacts generation, package __noinstall do not work -%pom_add_plugin org.apache.maven.plugins:maven-source-plugin . ' - - true -' - -%build -%mvn_build -f -j - -%install -%mvn_install - -%files -n pki-%{name} -%doc README.md -%license License.html - -%files -n pki-%{name}-core -f .mfiles-core -%license License.html - -%files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider -%license License.html - -%files -n pki-%{name}-client -f .mfiles-client -%license License.html - -%files -n pki-%{name}-servlet-initializer -f .mfiles-servlet-initializer -%license License.html - -%changelog -* Mon Jun 24 2024 Troy Dawson - 3.0.26-30 -- Bump release for June 2024 mass rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 3.0.26-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.0.26-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.26-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 06 2023 Dogtag PKI Team - 3.0.26-26 -- Conditionalize use of ExclusiveArch - -* Mon May 01 2023 Dogtag PKI Team - 3.0.26-25 -- Update top-level package to depend on servlet-initializer - -* Mon May 01 2023 Dogtag PKI Team - 3.0.26-24 -- Enable servlet-initializer subpackage - -* Fri Feb 03 2023 Chris Kelley - 3.0.26-23 -- Remove dependency on jaxb-api2 compat package - -* Fri Feb 03 2023 Chris Kelley - 3.0.26-22 -- Remove dependency on jakarta-activation1 compat package - -* Mon Jan 23 2023 Marian Koncek - 3.0.26-21 -- Depend on compat jaxb-api version 2 - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.26-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 09 2023 Marian Koncek - 3.0.26-19 -- Depend on compat jakarta.activation - -* Tue Dec 20 2022 Marian Koncek - 3.0.26-18 -- Rebuild with compat jakarta.activation version 1 - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0.26-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 3.0.26-16 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 3.0.26-15 -- Rebuilt for java-17-openjdk as system jdk - -* Fri Jan 21 2022 Fedora Release Engineering - 3.0.26-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Sep 30 2021 Dogtag PKI Team - 3.0.26-13 -- Drop pki-resteasy-jaxb-provider - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.26-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 18 2021 Dogtag PKI Team - 3.0.26-11 -- Replace jboss-annotations-1.2-api with jakarta-annotations - -* Wed Jun 2 2021 Dogtag PKI Team - 3.0.26-10 -- Drop log4j dependency -- Add jakarta-activation dependency - -* Wed May 19 2021 Dogtag PKI Team - 3.0.26-9 -- Drop pki-resteasy-javadoc and pki-resteasy-atom-provider - -* Mon May 10 2021 Dogtag PKI Team - 3.0.26-8 -- Rename subpackages to pki-resteasy - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.26-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Alexander Scheel - 3.0.26-6 -- CVE-2020-1695: Improper validation of response header in MediaTypeHeaderDelegate.java class - Resolves: rh-bz#1845547 - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.26-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Fabio Valentini - 3.0.26-4 -- Migrate away from native2ascii (removed with OpenJDK 11). -- Add missing dependencies for packages that were removed from OpenJDK 11. - -* Sat Jul 11 2020 Jiri Vanek - 3.0.26-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Oct 18 2019 Dogtag PKI Team 3.0.26-1 -- Update to version 3.0.26. -- Build with reduced functionality and dependency set. - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.19-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.19-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0.19-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.19-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.19-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Dec 27 2016 gil cattaneo 3.0.19-4 -- build fix for netty 3.10.6.Final - -* Tue Sep 13 2016 gil cattaneo 3.0.19-3 -- re-introduce jandex jars - -* Mon Aug 22 2016 gil cattaneo 3.0.19-2 -- move "Obsoletes" to resteasy-core - -* Sun Aug 21 2016 gil cattaneo 3.0.19-1 -- update to 3.0.19.Final - -* Fri Aug 12 2016 gil cattaneo 3.0.17-2 -- add sub package netty3 - -* Mon Jun 06 2016 gil cattaneo 3.0.17-1 -- update to 3.0.17.Final -- introduce license macro -- enable resteasy-links, resteasy-oauth, resteasy-wadl modules -- build resteasy-netty{3,4} - -* Mon Feb 22 2016 Mat Booth - 3.0.6-11 -- Fix failure to build from source - -* Thu Feb 04 2016 Fedora Release Engineering - 3.0.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jul 27 2015 Ade Lee - 3.0.6-9 -- Remove activation.jar dependency to fix build. - -* Thu Jun 18 2015 Fedora Release Engineering - 3.0.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Dec 5 2014 Ade Lee - 3.0.6-7 -- Refactor into subpackages. -- Change build requires to mvn() format - -* Mon Sep 29 2014 Ade Lee - 3.0.6-6 -- Add fix for CVE-2014-3490 - -* Tue Jun 24 2014 Ade Lee - 3.0.6-5 -- Replace broken dependencies junit4-> junit -- Add patch to handle new bouncycastle API in version 1.50 -- Fix bogus dates in changelog - -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 3.0.6-3 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Jan 14 2014 Marek Goldmann - 3.0.6-2 -- Support for Netty 4 in Rawhide - -* Fri Jan 10 2014 Marek Goldmann - 3.0.6-1 -- Upstream release 3.0.6.Final - -* Fri Aug 09 2013 Marek Goldmann - 3.0.1-3 -- Remove versioning from the jandex files - -* Fri Aug 09 2013 Marek Goldmann - 3.0.1-2 -- Added jandex index files to all jars - -* Fri Aug 09 2013 Marek Goldmann - 3.0.1-1 -- Upstream release 3.0.1.Final -- Using xmvn - -* Sun Aug 04 2013 Fedora Release Engineering - 2.3.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 9 2013 Ade Lee 2.3.2-13 -- Removed dependency on maven-checkstyle-plugin - -* Tue Apr 2 2013 Endi S. Dewata - 2.3.2-12 -- Removed Tomcat 6 dependency - -* Thu Feb 14 2013 Fedora Release Engineering - 2.3.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 2.3.2-10 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Aug 7 2012 Ade Lee - 2.3.2-9 -- Added tomcat6-servlet-2.5-api as a dependency - -* Sat Jul 21 2012 Fedora Release Engineering - 2.3.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Apr 24 2012 Marek Goldmann 2.3.2-7 -- Create also the jandex index jar files - -* Tue Apr 24 2012 Marek Goldmann 2.3.2-6 -- Added resteasy-multipart-provider module - -* Mon Apr 23 2012 Juan Hernandez 2.3.2-5 -- Fix the async HTTP Servlet 3.0 artifact id - -* Mon Apr 23 2012 Juan Hernandez 2.3.2-4 -- Added an additional artifact and group id for jaxrs-api - -* Mon Apr 23 2012 Juan Hernandez 2.3.2-3 -- Added async HTTP Servlet 3.0 module - -* Thu Apr 12 2012 Juan Hernandez 2.3.2-2 -- Build CDI integration module (bug #812978) - -* Tue Mar 6 2012 Ade Lee 2.3.2-1 -- Initial packaging diff --git a/sources b/sources deleted file mode 100644 index c68efcd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (resteasy-3.0.26.Final.tar.gz) = 1a3440a597d594d3239d85052b8bea3f3c23b4cd5a0d4ebeeaf0d1e3024f076dc3574c788736692f6ed60e22147f6a4c5a241209bf8a66498b2923fc8406cb6d diff --git a/tests/roles/Test_Setup/files/ca.cfg b/tests/roles/Test_Setup/files/ca.cfg deleted file mode 100644 index 158c1d5..0000000 --- a/tests/roles/Test_Setup/files/ca.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[DEFAULT] -pki_server_database_password=Secret.123 - -[CA] -pki_admin_email=caadmin@example.com -pki_admin_name=caadmin -pki_admin_nickname=caadmin -pki_admin_password=Secret.123 -pki_admin_uid=caadmin - -pki_client_database_password=Secret.123 -pki_client_database_purge=False -pki_client_pkcs12_password=Secret.123 - -pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com -pki_ds_database=ca -pki_ds_password=Secret.123 - -pki_security_domain_name=EXAMPLE - -pki_ca_signing_nickname=ca_signing -pki_ocsp_signing_nickname=ca_ocsp_signing -pki_audit_signing_nickname=ca_audit_signing -pki_sslserver_nickname=sslserver -pki_subsystem_nickname=subsystem diff --git a/tests/roles/Test_Setup/files/ds-create.sh b/tests/roles/Test_Setup/files/ds-create.sh deleted file mode 100644 index a702f75..0000000 --- a/tests/roles/Test_Setup/files/ds-create.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -ex - -# This command needs to be executed as it pulls the machine name -# dynamically. -dscreate create-template /tmp/test_dir/ds.inf - -sed -i \ - -e "s/;instance_name = .*/instance_name = localhost/g" \ - -e "s/;root_password = .*/root_password = Secret.123/g" \ - -e "s/;suffix = .*/suffix = dc=example,dc=com/g" \ - -e "s/;self_sign_cert = .*/self_sign_cert = False/g" \ - /tmp/test_dir/ds.inf - -dscreate from-file /tmp/test_dir/ds.inf - -ldapadd -H ldap://$HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF -dn: dc=example,dc=com -objectClass: domain -dc: example - -dn: dc=pki,dc=example,dc=com -objectClass: domain -dc: pki -EOF diff --git a/tests/roles/Test_Setup/files/kra.cfg b/tests/roles/Test_Setup/files/kra.cfg deleted file mode 100644 index d93f4bb..0000000 --- a/tests/roles/Test_Setup/files/kra.cfg +++ /dev/null @@ -1,27 +0,0 @@ -[DEFAULT] -pki_server_database_password=Secret.123 - -[KRA] -pki_admin_email=kraadmin@example.com -pki_admin_name=kraadmin -pki_admin_nickname=kraadmin -pki_admin_password=Secret.123 -pki_admin_uid=kraadmin - -pki_client_database_password=Secret.123 -pki_client_database_purge=False -pki_client_pkcs12_password=Secret.123 - -pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com -pki_ds_database=kra -pki_ds_password=Secret.123 - -pki_security_domain_name=EXAMPLE -pki_security_domain_user=caadmin -pki_security_domain_password=Secret.123 - -pki_storage_nickname=kra_storage -pki_transport_nickname=kra_transport -pki_audit_signing_nickname=kra_audit_signing -pki_sslserver_nickname=sslserver -pki_subsystem_nickname=subsystem diff --git a/tests/roles/Test_Setup/tasks/main.yml b/tests/roles/Test_Setup/tasks/main.yml deleted file mode 100644 index 0ac9be4..0000000 --- a/tests/roles/Test_Setup/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- - -- name: Install resteasy packages - dnf: - name: > - pki-resteasy-client, pki-resteasy-core, pki-resteasy-jackson2-provider, pki-resteasy-servlet-initializer - -- name: Install required packages - dnf: - name: > - 389-ds-base, pki-ca, pki-kra - -- name: Creates directory - file: path=/tmp/test_files state=directory - -- name: Copying templates to /tmp folder - copy : src=. dest=/tmp/test_dir - -- name: Setup DS Service - shell: sh /tmp/test_dir/ds-create.sh - -- name: Install CA subsystem - shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v - -- name: Install KRA subsystem - shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 027a70a..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,29 +0,0 @@ -- hosts: localhost - remote_user: root - tags: - - classic - roles: - - role: Test_Setup - - role: standard-test-basic - tests: - - verify_spawn_ca: - dir: . - run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep 'running'" - - verify_spawn_kra: - dir: . - run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'running'" - - destroy_kra: - dir: . - run: "pkidestroy -i pki-tomcat -s KRA && sleep 5" - - verify_destroy_kra: - dir: . - run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'" - - destroy_ca: - dir: . - run: "pkidestroy -i pki-tomcat -s CA" - - verify_destroy_ca: - dir: . - run: "curl http://localhost:8080/ca/admin/ca/getStatus &> testfile.log || true && grep 'Connection refused' testfile.log" - required_packages: - - pki-ca - - pki-kra