diff --git a/.gitignore b/.gitignore index 2fd0405..c4b6919 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jackson-databind-2.14.2.tar.gz +SOURCES/jackson-databind-2.21.4.tar.gz diff --git a/.jackson-databind.metadata b/.jackson-databind.metadata index 77c878d..6874d2b 100644 --- a/.jackson-databind.metadata +++ b/.jackson-databind.metadata @@ -1 +1 @@ -c82b472caf1e31cff5a63e756bc16c44b0003010 SOURCES/jackson-databind-2.14.2.tar.gz +212f868d9739185bfdaa6cacd02b9a84cbbf114c SOURCES/jackson-databind-2.21.4.tar.gz diff --git a/SPECS/jackson-databind.spec b/SPECS/jackson-databind.spec index f259f33..487075c 100644 --- a/SPECS/jackson-databind.spec +++ b/SPECS/jackson-databind.spec @@ -1,5 +1,5 @@ Name: jackson-databind -Version: 2.14.2 +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) @@ -31,7 +32,14 @@ Jackson Annotations for configuration. %pom_remove_plugin ":maven-enforcer-plugin" %pom_remove_plugin "org.jacoco:jacoco-maven-plugin" %pom_remove_plugin "org.moditect:moditect-maven-plugin" -%pom_remove_plugin "de.jjohannes:gradle-module-metadata-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" +%pom_xpath_inject "//pom:properties" " 1.8" +%pom_xpath_inject "//pom:properties" " 1.8" cp -p src/main/resources/META-INF/NOTICE . sed -i 's/\r//' LICENSE NOTICE @@ -44,12 +52,6 @@ rm src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkar # TestTypeFactoryWithClassLoader fails to compile # - it's the only test that uses powermock, so drop the powermock dependencies # - mockito is only transitively pulled in by powermock, so add it back -%pom_remove_dep org.powermock: -%pom_add_dep org.mockito:mockito-core::test -rm src/test/java/com/fasterxml/jackson/databind/type/TestTypeFactoryWithClassLoader.java - -# Off test that require connection with the web -rm src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java %mvn_file : %{name} @@ -64,6 +66,14 @@ rm src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java %license LICENSE NOTICE %changelog +* Wed Jul 08 2026 Red Hat PKI Team - 2.21.4-1 +- Rebase to upstream version 2.21.4 +- Resolves: RHEL-188291 + +* Thu Jul 31 2025 Red Hat PKI Team - 2.19.1-1 +- Rebase to upstream version 2.19.1 +- Resolves: RHEL-103106 + * Wed Nov 22 2023 Red Hat PKI Team - 2.14.2-1 - Rebase to upstream version 2.14.2