From bdcb6274d3f41cc046c286da099102f81bf58c1a Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Wed, 8 Jul 2026 12:28:22 +0200
Subject: [PATCH] Rebase jackson-databind to 2.21.4

Resolves: RHEL-188291
---
 .gitignore            |  1 +
 jackson-databind.spec | 12 +++++++++---
 sources               |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02b13d0..bfa070f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ SOURCES/jackson-databind-2.10.0.tar.gz
 /jackson-databind-2.10.0.tar.gz
 /jackson-databind-2.14.2.tar.gz
 /jackson-databind-2.19.1.tar.gz
+/jackson-databind-2.21.4.tar.gz
diff --git a/jackson-databind.spec b/jackson-databind.spec
index 707afa0..487075c 100644
--- a/jackson-databind.spec
+++ b/jackson-databind.spec
@@ -1,5 +1,5 @@
 Name:          jackson-databind
-Version:       2.19.1
+Version:       2.21.4
 Release:       1%{?dist}
 Summary:       General data-binding package for Jackson (2.x)
 License:       Apache-2.0 and LGPL-2.0-or-later
@@ -7,7 +7,8 @@ URL:           https://github.com/FasterXML/jackson-databind/
 Source0:       %{url}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local
-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:jackson-base:pom:) >= %{version}
 BuildRequires:  mvn(com.google.code.maven-replacer-plugin:replacer)
@@ -33,6 +34,7 @@ Jackson Annotations for configuration.
 %pom_remove_plugin "org.moditect:moditect-maven-plugin"
 %pom_remove_plugin "org.codehaus.mojo:animal-sniffer-maven-plugin"
 %pom_remove_plugin "org.gradlex:gradle-module-metadata-maven-plugin"
+%pom_remove_plugin "org.cyclonedx:cyclonedx-maven-plugin"
 
 %pom_xpath_set "//pom:javac.src.version" "1.8"
 %pom_xpath_set "//pom:javac.target.version" "1.8"
@@ -42,7 +44,7 @@ Jackson Annotations for configuration.
 cp -p src/main/resources/META-INF/NOTICE .
 sed -i 's/\r//' LICENSE NOTICE
 
-# unavailable test depsd
+# unavailable test deps
 %pom_remove_dep javax.measure:jsr-275
 rm src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java
 %pom_xpath_remove pom:classpathDependencyExcludes
@@ -64,6 +66,10 @@ rm src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkar
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jul 08 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.21.4-1
+- Rebase to upstream version 2.21.4
+- Resolves: RHEL-188291
+
 * Thu Jul 31 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.19.1-1
 - Rebase to upstream version 2.19.1
 - Resolves: RHEL-103106
diff --git a/sources b/sources
index e6f5fe6..c2e5254 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jackson-databind-2.19.1.tar.gz) = 83446b49219a66edf579b63404f5476de2787c7f9f7ed387f49080339d625d3868482db7d61f430289381817b226a48b64e9fbfca9b0c4c27d1f58d53c6e3686
+SHA512 (jackson-databind-2.21.4.tar.gz) = 60576804bb71be39e74eba07ac0cc6952be961753f4e5abeec8fa4fc2a2ef19812a17cc4753c883b70f113fe755a970fd5e911e711e9b04a242572a333d77114