From 5306f075721fb5f7152c97106ef09aa6113c2f4b Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Tue, 7 Jul 2026 09:48:56 +0200
Subject: [PATCH] Rebase jackson-modules-base to 2.21.4

Resolves: RHEL-190947
---
 .gitignore                |  1 +
 jackson-modules-base.spec | 11 +++++++++--
 sources                   |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87c6e74..93fe99e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /jackson-modules-base-2.11.4.tar.gz
 /jackson-modules-base-2.14.1.tar.gz
 /jackson-modules-base-2.19.1.tar.gz
+/jackson-modules-base-2.21.4.tar.gz
diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec
index a48c680..b402bab 100644
--- a/jackson-modules-base.spec
+++ b/jackson-modules-base.spec
@@ -1,7 +1,7 @@
 %bcond_with     jp_minimal
 
 Name:           jackson-modules-base
-Version:        2.19.1
+Version:        2.21.4
 Release:        1%{?dist}
 Summary:        Jackson modules: Base
 License:        Apache-2.0
@@ -12,7 +12,8 @@ Patch1:         0001-Expose-javax.security.auth-from-JDK-internals.patch
 
 BuildRequires:  maven-local
 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}
@@ -88,9 +89,11 @@ 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
 
 %pom_remove_plugin "org.gradlex:gradle-module-metadata-maven-plugin" jaxb
+%pom_remove_plugin "org.cyclonedx:cyclonedx-maven-plugin" jaxb
 # Allow javax,activation to be optional
 %pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb "
 <configuration>
@@ -125,6 +128,10 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja
 %license LICENSE NOTICE
 
 %changelog
+* Tue Jul 07 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.21.4-1
+- Update to version 2.21.4
+- Resolves: RHEL-190947
+
 * Thu Jul 17 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.19.1-1
 - Update to version 2.19.1
 - Resolves: RHEL-100245
diff --git a/sources b/sources
index 35af801..7f336ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jackson-modules-base-2.19.1.tar.gz) = af5e6534038b14fac2138f66c174964718e985e7c6164405d56b7742e7610414cdb9652a787f949344804b891332fb7816e7b4cbf17235f7eac709dff83dbec8
+SHA512 (jackson-modules-base-2.21.4.tar.gz) = d86ced5667b79fe0fbd4a5a346dd2f44d399ac232b66ee578fc05ddd9a0b6bae019cf23997322d6dc1fc6b156135ac91ba6d78107ef7b459505df552758b545e