From 1a56258aad922a960522e0f095b7592472086079 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Thu, 31 Jul 2025 16:19:45 +0200 Subject: [PATCH] Rebase to jackson-annotations 2.19.1 Resolves: RHEL-103106 --- .gitignore | 1 + jackson-annotations.spec | 18 +++++++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 24552dc..852005e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ SOURCES/jackson-annotations-2.10.0-try-3.tar.gz /jackson-annotations-2.10.0-try-3.tar.gz /jackson-annotations-2.14.2.tar.gz +/jackson-annotations-2.19.1.tar.gz diff --git a/jackson-annotations.spec b/jackson-annotations.spec index b35f6e3..3c276ea 100644 --- a/jackson-annotations.spec +++ b/jackson-annotations.spec @@ -1,5 +1,5 @@ Name: jackson-annotations -Version: 2.14.2 +Version: 2.19.1 Release: 1%{?dist} Summary: Core annotations for Jackson data processor License: Apache-2.0 @@ -9,7 +9,7 @@ Source0: %{url}/archive/%{name}-%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) >= 2.14 -BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildArch: noarch @@ -25,9 +25,13 @@ used by Jackson data-binding package. %setup -q -n %{name}-%{name}-%{version} %pom_remove_plugin "org.moditect:moditect-maven-plugin" -%pom_remove_plugin "org.sonatype.plugins:nexus-staging-maven-plugin" -%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" -%pom_remove_plugin "org.codehaus.mojo:build-helper-maven-plugin" +%pom_remove_plugin "org.sonatype.central:central-publishing-maven-plugin" +%pom_remove_plugin "org.gradlex:gradle-module-metadata-maven-plugin" +%pom_remove_plugin "org.codehaus.mojo:build-helper-maven-plugin" +%pom_xpath_set "//pom:javac.src.version" "1.8" +%pom_xpath_set "//pom:javac.target.version" "1.8" +%pom_xpath_set "//pom:maven.compiler.source" "1.8" +%pom_xpath_set "//pom:maven.compiler.target" "1.8" sed -i 's/\r//' LICENSE @@ -44,6 +48,10 @@ sed -i 's/\r//' LICENSE %license LICENSE %changelog +* 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 diff --git a/sources b/sources index d9dbff4..3a21318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-annotations-2.14.2.tar.gz) = d32ca3b1d8a89461044608b32f6a12a09d081194de044a90fc7d8579e960446048705e29a82ab4e92f0921b7b2f90fc7b91356bf6e3e4c4f38ba2865fb77bfa3 +SHA512 (jackson-annotations-2.19.1.tar.gz) = 919a08aad58f370a22e634b6a91e468a81335a667ace1dae3fa249cb8e5927fda3ce0797a4f6eb43f679abd119e29d8ec63894d4ea810e39b13e292d92f33971