public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Marco Fargetta <mfargett@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/jackson-modules-base] rawhide: Update tp version 2.21.5
Date: Tue, 14 Jul 2026 17:34:19 GMT [thread overview]
Message-ID: <178405045980.1.14222887860943892780.rpms-jackson-modules-base-ea5d92f7802c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/jackson-modules-base
Branch : rawhide
Commit : ea5d92f7802cdf743c7e9db2f5ad5a08006ab350
Author : Marco Fargetta <mfargett@redhat.com>
Date : 2026-07-14T19:34:00+02:00
Stats : +220/-142 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/jackson-modules-base/c/ea5d92f7802cdf743c7e9db2f5ad5a08006ab350?branch=rawhide
Log:
Update tp version 2.21.5
---
diff --git a/.gitignore b/.gitignore
index 2838a94..3f2cc4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/jackson-modules-base-2.18.1.tar.gz
/jackson-modules-base-jackson-modules-base-2.18.2-take-2.tar.gz
/jackson-modules-base-2.18.2-take-2.tar.gz
+/jackson-modules-base-2.21.5.tar.gz
diff --git a/0001-Expose-javax.security.auth-from-JDK-internals.patch b/0001-Expose-javax.security.auth-from-JDK-internals.patch
index 43fb443..b214748 100644
--- a/0001-Expose-javax.security.auth-from-JDK-internals.patch
+++ b/0001-Expose-javax.security.auth-from-JDK-internals.patch
@@ -1,6 +1,6 @@
-From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001
-From: Chris Kelley <ckelley@redhat.com>
-Date: Thu, 8 Sep 2022 12:44:54 +0100
+From 9cc0fa5a5b4cc1e6462b1e61d279b31e87ded2ea Mon Sep 17 00:00:00 2001
+From: Marco Fargetta <mfargett@redhat.com>
+Date: Thu, 17 Jul 2025 11:19:53 +0200
Subject: [PATCH] Expose javax.security.auth from JDK internals
---
@@ -8,19 +8,19 @@ Subject: [PATCH] Expose javax.security.auth from JDK internals
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
-index e72b4934..cafe56de 100644
+index a535fafc..6963d1a6 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -97,6 +97,9 @@ not datatype, data format, or JAX-RS provider modules.
- <excludes>
- <exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
- </excludes>
-+ <argLine>
-+ --add-opens=java.base/javax.security.auth=ALL-UNNAMED
-+ </argLine>
- </configuration>
+@@ -115,6 +115,9 @@ not datatype, data format, or JAX-RS provider modules.
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
++ <configuration>
++ <argLine>--add-opens=java.base/javax.security.auth=ALL-UNNAMED</argLine>
++ </configuration>
</plugin>
</plugins>
+ </pluginManagement>
--
-2.38.1
+2.50.1
diff --git a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch
index 14a68bb..33a834f 100644
--- a/0001-Replace-javax.activation-imports-with-jakarta.activa.patch
+++ b/0001-Replace-javax.activation-imports-with-jakarta.activa.patch
@@ -1,7 +1,8 @@
-From 32bb2ba2eba90ad2fc574e28eacf76895c685015 Mon Sep 17 00:00:00 2001
-From: Chris Kelley <ckelley@redhat.com>
-Date: Fri, 3 Feb 2023 10:57:18 +0000
-Subject: [PATCH] Replace javax.activation imports with jakarta.activation
+From db5ef2226583dfdf81c77eaa0670ace2b123a3c2 Mon Sep 17 00:00:00 2001
+From: Marco Fargetta <mfargett@redhat.com>
+Date: Tue, 14 Jul 2026 19:04:38 +0200
+Subject: [PATCH] Replace javax.activation imports with
+ jakarta.activation
---
.../jackson/module/jaxb/JaxbAnnotationIntrospector.java | 6 +++---
@@ -10,7 +11,7 @@ Subject: [PATCH] Replace javax.activation imports with jakarta.activation
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
-index bf20bb95..908b89e0 100644
+index ec483c7e..69790ee0 100644
--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
+++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
@@ -728,16 +728,16 @@ public class JaxbAnnotationIntrospector
@@ -49,7 +50,7 @@ index cf09f51e..22fe4641 100644
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java
-index 077a5981..db84231c 100644
+index 308b1a8d..63f6aea3 100644
--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java
+++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/ser/DataHandlerJsonSerializer.java
@@ -5,7 +5,7 @@ import java.io.IOException;
@@ -62,5 +63,5 @@ index 077a5981..db84231c 100644
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.JavaType;
--
-2.39.0
+2.55.0
diff --git a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
index 21530c1..e58095d 100644
--- a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
+++ b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
@@ -1,29 +1,30 @@
-From 7393872afb92662f08318de1c7056395bc8e1f19 Mon Sep 17 00:00:00 2001
+From f7239fcc026a4990a9d6d70877f0bf291f317fe2 Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
-Date: Fri, 22 Mar 2024 11:27:32 +0100
+Date: Tue, 14 Jul 2026 19:24:56 +0200
Subject: [PATCH] Use jakarta.activation namespace in jaxb api
---
+ jaxb/README.md | 2 +-
.../jackson/module/jaxb/AdapterConverter.java | 2 +-
.../module/jaxb/JaxbAnnotationIntrospector.java | 16 ++++++++--------
+ .../jaxb/deser/DomElementJsonDeserializer.java | 8 ++++----
.../jackson/module/jaxb/adapters/MapAdapter.java | 4 ++--
.../module/jaxb/adapters/TestAdaptedMapType.java | 4 ++--
.../module/jaxb/adapters/TestAdapters.java | 14 +++++++-------
.../jaxb/adapters/TestAdaptersForContainers.java | 4 ++--
.../jaxb/adapters/TestIdentityAdapters.java | 4 ++--
- .../module/jaxb/failing/TestUnwrapping.java | 2 +-
- .../jackson/module/jaxb/failing/TestXmlID3.java | 4 ++--
.../jackson/module/jaxb/id/TestXmlID.java | 2 +-
.../jackson/module/jaxb/id/TestXmlID2.java | 2 +-
.../module/jaxb/introspect/TestAccessType.java | 6 +++---
.../jaxb/introspect/TestAnnotationPriority.java | 2 +-
.../jaxb/introspect/TestIntrospectorPair.java | 2 +-
- .../TestJaxbAnnotationIntrospector.java | 6 +++---
+ .../TestJaxbAnnotationIntrospector.java | 8 ++++----
.../jaxb/introspect/TestJaxbAutoDetect.java | 2 +-
.../jaxb/introspect/TestJaxbFieldAccess.java | 2 +-
.../jaxb/introspect/TestPropertyOrdering.java | 2 +-
.../jaxb/introspect/TestPropertyVisibility.java | 2 +-
.../module/jaxb/introspect/TestXmlValue.java | 2 +-
+ .../jaxb/misc/TestDomElementSerialization.java | 2 +-
.../module/jaxb/misc/TestElementWrapper.java | 4 ++--
.../jackson/module/jaxb/misc/TestEnums.java | 2 +-
.../module/jaxb/misc/TestJaxbNullProperties.java | 4 ++--
@@ -31,7 +32,10 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
.../module/jaxb/misc/TestSchemaGeneration.java | 2 +-
.../jaxb/misc/TestSerializationInclusion.java | 2 +-
.../misc/TestXmlAnyElementWithElementRef.java | 2 +-
- .../jackson/module/jaxb/misc/package-info.java | 4 ++--
+ .../jackson/module/jaxb/misc/package-info.java | 6 +++---
+ .../jackson/module/jaxb/tofix/TestEnums256.java | 4 ++--
+ .../module/jaxb/tofix/TestUnwrapping.java | 2 +-
+ .../jackson/module/jaxb/tofix/TestXmlID3.java | 4 ++--
.../module/jaxb/types/PolymorpicTestBase.java | 2 +-
.../module/jaxb/types/TestCyclicTypes.java | 2 +-
.../module/jaxb/types/TestJaxbPolymorphic.java | 2 +-
@@ -40,8 +44,20 @@ Subject: [PATCH] Use jakarta.activation namespace in jaxb api
.../jaxb/types/TestJaxbTypeCoercion1023.java | 2 +-
.../jackson/module/jaxb/types/TestJaxbTypes.java | 2 +-
.../jaxb/types/XmlSeeAlsoForSubtypes195Test.java | 2 +-
- 36 files changed, 61 insertions(+), 61 deletions(-)
+ 40 files changed, 71 insertions(+), 71 deletions(-)
+diff --git a/jaxb/README.md b/jaxb/README.md
+index 3f2fed92..acde7eea 100644
+--- a/jaxb/README.md
++++ b/jaxb/README.md
+@@ -1,6 +1,6 @@
+ ## Overview
+
+-This Jackson extension module provides support for using JAXB (`javax.xml.bind`) annotations as an alternative to native Jackson annotations.
++This Jackson extension module provides support for using JAXB (`jakarta.xml.bind`) annotations as an alternative to native Jackson annotations.
+ It is most often used to make it easier to reuse existing data beans that used with JAXB framework to read and write XML.
+
+ ## Maven dependency
diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java
index 3e45f695..a3482e52 100644
--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java
@@ -55,7 +71,7 @@ index 3e45f695..a3482e52 100644
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
-index ec483c7e..7d092c18 100644
+index 69790ee0..a85b6d22 100644
--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
+++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
@@ -4,9 +4,9 @@ import java.lang.annotation.Annotation;
@@ -94,8 +110,27 @@ index ec483c7e..7d092c18 100644
* <li>{@link XmlRegistry} not supported, unlikely to ever be.
* <li>{@link XmlSchema} not supported, unlikely to ever be.
* <li>{@link XmlSchemaType} not supported, unlikely to ever be.
+diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
+index a5bb7206..a6c16d65 100644
+--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/deser/DomElementJsonDeserializer.java
+@@ -3,10 +3,10 @@ package com.fasterxml.jackson.module.jaxb.deser;
+ import java.io.IOException;
+ import java.util.Iterator;
+
+-import javax.xml.XMLConstants;
+-import javax.xml.parsers.DocumentBuilder;
+-import javax.xml.parsers.DocumentBuilderFactory;
+-import javax.xml.parsers.ParserConfigurationException;
++import jakarta.xml.XMLConstants;
++import jakarta.xml.parsers.DocumentBuilder;
++import jakarta.xml.parsers.DocumentBuilderFactory;
++import jakarta.xml.parsers.ParserConfigurationException;
+
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
-index 239e88f6..7509a918 100644
+index d8e22e64..ad1411a8 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
@@ -1,6 +1,6 @@
@@ -104,9 +139,9 @@ index 239e88f6..7509a918 100644
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
import java.util.HashMap;
-@@ -29,4 +29,4 @@ public class MapAdapter<K, V> extends XmlAdapter<MapType<K, V>, Map<K, V>>
+ import java.util.LinkedList;
+@@ -28,4 +28,4 @@ public class MapAdapter<K, V> extends XmlAdapter<MapType<K, V>, Map<K, V>>
}
return theMap;
}
@@ -114,7 +149,7 @@ index 239e88f6..7509a918 100644
\ No newline at end of file
+}
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
-index 72f94232..29d0161c 100644
+index 7257a842..73b3a242 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters;
@@ -126,10 +161,10 @@ index 72f94232..29d0161c 100644
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- import com.fasterxml.jackson.databind.ObjectMapper;
+ import org.junit.jupiter.api.Test;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
-index 5b91d555..e85b82b6 100644
+index efe8ad43..14aa8e37 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.adapters;
@@ -143,9 +178,9 @@ index 5b91d555..e85b82b6 100644
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
-@@ -77,7 +77,7 @@ public class TestAdapters extends BaseJaxbTest
+ import org.junit.jupiter.api.Test;
+
+@@ -81,7 +81,7 @@ public class TestAdapters extends BaseJaxbTest
@Override
public Calendar unmarshal(String value) {
@@ -154,7 +189,7 @@ index 5b91d555..e85b82b6 100644
}
@Override
-@@ -85,7 +85,7 @@ public class TestAdapters extends BaseJaxbTest
+@@ -89,7 +89,7 @@ public class TestAdapters extends BaseJaxbTest
if (value == null) {
return null;
}
@@ -163,7 +198,7 @@ index 5b91d555..e85b82b6 100644
}
}
-@@ -111,7 +111,7 @@ public class TestAdapters extends BaseJaxbTest
+@@ -115,7 +115,7 @@ public class TestAdapters extends BaseJaxbTest
public static class Adapter1 extends XmlAdapter<String, Long> {
@Override
public Long unmarshal(String value) {
@@ -172,7 +207,7 @@ index 5b91d555..e85b82b6 100644
}
@Override
-@@ -119,7 +119,7 @@ public class TestAdapters extends BaseJaxbTest
+@@ -123,7 +123,7 @@ public class TestAdapters extends BaseJaxbTest
if (value == null) {
return null;
}
@@ -182,7 +217,7 @@ index 5b91d555..e85b82b6 100644
}
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
-index f0b7df80..b720d8f4 100644
+index 496c1c4a..f3f70383 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters;
@@ -194,10 +229,10 @@ index f0b7df80..b720d8f4 100644
+import jakarta.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.adapters.*;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.databind.SerializationFeature;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
-index bd2792f4..9053a447 100644
+index e4915370..fac3eedc 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
@@ -1,7 +1,7 @@
@@ -208,37 +243,10 @@ index bd2792f4..9053a447 100644
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
-diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
-index a428b49d..a180a529 100644
---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
-+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
-@@ -1,6 +1,6 @@
- package com.fasterxml.jackson.module.jaxb.failing;
-
--import javax.xml.bind.annotation.*;
-+import jakarta.xml.bind.annotation.*;
-
- import com.fasterxml.jackson.annotation.JsonUnwrapped;
- import com.fasterxml.jackson.databind.*;
-diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
-index 71d9492c..4d944602 100644
---- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
-+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
-@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.failing;
- import java.util.Arrays;
- import java.util.List;
-
--import javax.xml.bind.annotation.XmlElement;
--import javax.xml.bind.annotation.XmlID;
-+import jakarta.xml.bind.annotation.XmlElement;
-+import jakarta.xml.bind.annotation.XmlID;
+ import org.junit.jupiter.api.Test;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
-index af5b235f..9b6b1161 100644
+index 3434ac6c..a7761858 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id;
@@ -248,10 +256,10 @@ index af5b235f..9b6b1161 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
-index eabb71f4..4a775a0c 100644
+index d850e405..2962513d 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id;
@@ -261,10 +269,10 @@ index eabb71f4..4a775a0c 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.annotation.JsonPropertyOrder;
- import com.fasterxml.jackson.core.type.TypeReference;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
-index 82cc66a8..6c3151dc 100644
+index 9ab4cb5d..64cb37a1 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect;
@@ -278,10 +286,10 @@ index 82cc66a8..6c3151dc 100644
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- import com.fasterxml.jackson.databind.*;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
-index 2d2b341b..46a9f3ee 100644
+index 3c0e294b..42a28396 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
@@ -1,6 +1,6 @@
@@ -290,10 +298,10 @@ index 2d2b341b..46a9f3ee 100644
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
-index 66006a31..5ecf19bf 100644
+index 1c58a01b..b8544e3b 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
@@ -303,27 +311,29 @@ index 66006a31..5ecf19bf 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.annotation.*;
- import com.fasterxml.jackson.databind.*;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
-index f5bfa936..9931f1af 100644
+index 0d21554d..2bd481c3 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
-@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+@@ -2,10 +2,10 @@ package com.fasterxml.jackson.module.jaxb.introspect;
import java.util.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+-import javax.xml.namespace.QName;
+import jakarta.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- import javax.xml.namespace.QName;
++import jakarta.xml.namespace.QName;
+
+ import org.junit.jupiter.api.Test;
- import com.fasterxml.jackson.databind.*;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
-index 5e7c79eb..9841c930 100644
+index 804273a3..1ace281c 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
@@ -4,7 +4,7 @@ import java.io.*;
@@ -333,10 +343,10 @@ index 5e7c79eb..9841c930 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.databind.*;
- import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
-index 5fc85b9f..b9530d3e 100644
+index a17b4e89..d0b7d91b 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
@@ -349,7 +359,7 @@ index 5fc85b9f..b9530d3e 100644
import com.fasterxml.jackson.databind.*;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
-index 17a347a9..dcbd1dac 100644
+index 08db56cf..09b215f9 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
@@ -1,6 +1,6 @@
@@ -361,7 +371,7 @@ index 17a347a9..dcbd1dac 100644
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
-index f73ff664..691bc7d8 100644
+index 6aefdcec..badd3fd5 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
@@ -371,10 +381,10 @@ index f73ff664..691bc7d8 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.annotation.JsonPropertyOrder;
- import com.fasterxml.jackson.databind.*;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
-index 9b440492..52c040f9 100644
+index 385e0dc3..9a462af6 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
@@ -384,15 +394,28 @@ index 9b440492..52c040f9 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.annotation.JsonProperty;
- import com.fasterxml.jackson.databind.*;
+ import org.junit.jupiter.api.Test;
+
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
+index 561e3adb..40945071 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDomElementSerialization.java
+@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+
+-import javax.xml.parsers.DocumentBuilderFactory;
++import jakarta.xml.parsers.DocumentBuilderFactory;
+ import java.io.ByteArrayInputStream;
+ import java.io.StringWriter;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
-index fbaf7dd3..b5e5165c 100644
+index 14ac2885..f72ee7af 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
-@@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.jaxb.misc;
+@@ -4,8 +4,8 @@ import java.util.*;
- import java.util.*;
+ import org.junit.jupiter.api.Test;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
@@ -402,19 +425,19 @@ index fbaf7dd3..b5e5165c 100644
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
-index 50de1236..4ffccf32 100644
+index dff06963..4853ae5d 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
@@ -1,6 +1,6 @@
package com.fasterxml.jackson.module.jaxb.misc;
--import javax.xml.bind.annotation.XmlEnum;
-+import jakarta.xml.bind.annotation.XmlEnum;
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+
+ import org.junit.jupiter.api.Test;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
-index d684df7f..5172819e 100644
+index 4e2eaf68..8f578850 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
@@ -1,7 +1,7 @@
@@ -425,10 +448,10 @@ index d684df7f..5172819e 100644
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
- import com.fasterxml.jackson.annotation.JsonInclude;
- import com.fasterxml.jackson.databind.ObjectMapper;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
-index 98fed553..f45b5728 100644
+index d48502af..81b82313 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
@@ -1,6 +1,6 @@
@@ -437,10 +460,10 @@ index 98fed553..f45b5728 100644
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.databind.SerializationFeature;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
-index 513ae199..c3fa4b71 100644
+index d93dc58b..f339f638 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
@@ -1,6 +1,6 @@
@@ -449,10 +472,10 @@ index 513ae199..c3fa4b71 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.databind.JsonNode;
- import com.fasterxml.jackson.databind.ObjectMapper;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
-index 95a6592b..c4688bef 100644
+index 7b58dbc1..7d1baab9 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
@@ -462,10 +485,10 @@ index 95a6592b..c4688bef 100644
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
- import com.fasterxml.jackson.annotation.JsonInclude;
- import com.fasterxml.jackson.databind.ObjectMapper;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
-index 55731622..977ea0b5 100644
+index 31dc328f..9499443b 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
@@ -475,23 +498,66 @@ index 55731622..977ea0b5 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.databind.ObjectMapper;
- import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
-index 83bfdde4..ef27cae6 100644
+index 83bfdde4..93da73f0 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,9 @@
/**
* Package info can be used to add "package annotations", so here we are...
*/
-@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters({
- @javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(
+- type = javax.xml.namespace.QName.class,
+@jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters({
+ @jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter(
- type = javax.xml.namespace.QName.class,
++ type = jakarta.xml.namespace.QName.class,
value = com.fasterxml.jackson.module.jaxb.introspect.TestJaxbAnnotationIntrospector.QNameAdapter.class
)
+ })
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java
+index 6f0bb67c..284957fa 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestEnums256.java
+@@ -1,7 +1,7 @@
+ package com.fasterxml.jackson.module.jaxb.tofix;
+
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.*;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.*;
+
+ import org.junit.jupiter.api.Test;
+
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestUnwrapping.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestUnwrapping.java
+index d45d9d72..5f172f1c 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestUnwrapping.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestUnwrapping.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.tofix;
+
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+
+ import org.junit.jupiter.api.Test;
+
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestXmlID3.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestXmlID3.java
+index 7bf5824f..26f4fec8 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestXmlID3.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/tofix/TestXmlID3.java
+@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.tofix;
+ import java.util.Arrays;
+ import java.util.List;
+
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlID;
++import jakarta.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlID;
+
+ import org.junit.jupiter.api.Test;
+
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java
index 8d4f635e..a6bedfc4 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java
@@ -505,7 +571,7 @@ index 8d4f635e..a6bedfc4 100644
import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
-index 9454eeba..3d2d57a5 100644
+index 3dd50f52..1e780e00 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
@@ -515,10 +581,10 @@ index 9454eeba..3d2d57a5 100644
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
- import com.fasterxml.jackson.databind.*;
+ import org.junit.jupiter.api.Test;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
-index 76bff2d0..d66e6667 100644
+index a11ce054..c6c2455d 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
@@ -531,7 +597,7 @@ index 76bff2d0..d66e6667 100644
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
-index 41909219..afe417d1 100644
+index fe0e5c73..cf482aac 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
@@ -544,7 +610,7 @@ index 41909219..afe417d1 100644
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
-index b3568f32..67bc045e 100644
+index ea1edf0b..103036f2 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
@@ -557,7 +623,7 @@ index b3568f32..67bc045e 100644
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
-index 6b49fd20..843f0a0a 100644
+index 0a36243e..5f120729 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
@@ -1,6 +1,6 @@
@@ -569,7 +635,7 @@ index 6b49fd20..843f0a0a 100644
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
-index 2031f014..2efec6a2 100644
+index 64c591ab..2b3a0d36 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
@@ -582,7 +648,7 @@ index 2031f014..2efec6a2 100644
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/XmlSeeAlsoForSubtypes195Test.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/XmlSeeAlsoForSubtypes195Test.java
-index 517fe91f..16d8c4b0 100644
+index c754441a..850be98c 100644
--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/XmlSeeAlsoForSubtypes195Test.java
+++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/XmlSeeAlsoForSubtypes195Test.java
@@ -1,6 +1,6 @@
@@ -594,5 +660,5 @@ index 517fe91f..16d8c4b0 100644
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
--
-2.44.0
+2.55.0
diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec
index 600513d..765a0d8 100644
--- a/jackson-modules-base.spec
+++ b/jackson-modules-base.spec
@@ -1,13 +1,13 @@
%bcond_with jp_minimal
Name: jackson-modules-base
-Version: 2.18.2
-Release: 6%{?dist}
+Version: 2.21.5
+Release: 1%{?dist}
Summary: Jackson modules: Base
License: Apache-2.0
URL: https://github.com/FasterXML/jackson-modules-base
-Source0: %{url}/archive/%{name}-%{version}-take-2.tar.gz
+Source0: %{url}/archive/%{name}-%{version}.tar.gz
Patch1: 0001-Expose-javax.security.auth-from-JDK-internals.patch
Patch2: 0001-Replace-javax.activation-imports-with-jakarta.activa.patch
Patch3: 0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
@@ -19,7 +19,8 @@ BuildRequires: maven-local-openjdk25
%endif
BuildRequires: mvn(cglib:cglib)
-BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= %{version}
+#BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= %{version}
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= 2.21
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version}
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version}
BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
@@ -79,6 +80,7 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
%pom_disable_module paranamer
%pom_disable_module jakarta-xmlbind
%pom_disable_module blackbird
+%pom_disable_module spi-subtypes
%pom_disable_module no-ctor-deser
# Allow javax,activation to be optional
@@ -93,6 +95,11 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
%pom_remove_dep javax.xml.bind:jaxb-api jaxb
%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api jaxb
+
+%pom_remove_plugin "org.gradlex:gradle-module-metadata-maven-plugin" jaxb
+%pom_remove_plugin "org.cyclonedx:cyclonedx-maven-plugin" jaxb
+
+
# This test fails since mockito was upgraded to 2.x
rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java
@@ -113,6 +120,9 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja
%license LICENSE NOTICE
%changelog
+* Tue Jul 13 2026 Dogtag PKI Team <devel@lists.dogtagpki.org> - 2.21.5-1
+- Update to version 2.21.5
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index 78a6006..729700e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jackson-modules-base-2.18.2-take-2.tar.gz) = e02f28e785bb5077a442fbde80b2e69ccc9da5c368a3678e8718e295a31e19292f692a717ed62c5fc5a538e51e342f4647c3397303458e7c8c99f1477841f0bf
+SHA512 (jackson-modules-base-2.21.5.tar.gz) = a84d12076726f843e6342ae917134b7f57d320a0009217e9abe163c822c90e87756b8b3859090dc0d696e1099efad5d3b4c643ac367f21b3dc722cea8c35a165
reply other threads:[~2026-07-14 17:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178405045980.1.14222887860943892780.rpms-jackson-modules-base-ea5d92f7802c@fedoraproject.org \
--to=mfargett@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox