From 3411ea1eb05b1767216c5d929502dca0c3576449 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Wed, 22 Nov 2023 11:58:25 +0100 Subject: [PATCH] Rebase to upstream version 2.14.2 Resolves: RHEL-9625 --- .gitignore | 1 + jackson-core.spec | 31 +++++++++++++------------------ sources | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 342cef9..1976963 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/jackson-core-2.10.0.tar.gz /jackson-core-2.10.0.tar.gz +/jackson-core-2.14.2.tar.gz diff --git a/jackson-core.spec b/jackson-core.spec index 6365fe5..3e48f5f 100644 --- a/jackson-core.spec +++ b/jackson-core.spec @@ -1,8 +1,9 @@ Name: jackson-core -Version: 2.10.0 +Version: 2.14.2 Release: 1%{?dist} Summary: Core part of Jackson -License: ASL 2.0 +License: Apache-2.0 + URL: https://github.com/FasterXML/jackson-core Source0: %{url}/archive/%{name}-%{version}.tar.gz @@ -11,23 +12,15 @@ BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version} BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -%ifarch %{arm} -# Speed up builds on 32bit arm in case we get such a builder -BuildRequires: java-1.8.0-openjdk-aarch32-devel -%endif - BuildArch: noarch +%if 0%{?fedora} +ExclusiveArch: %{java_arches} noarch +%endif %description Core part of Jackson that defines Streaming API as well as basic shared abstractions. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains API documentation for %{name}. - %prep %setup -q -n %{name}-%{name}-%{version} @@ -35,15 +28,17 @@ This package contains API documentation for %{name}. %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_add_plugin "org.apache.felix:maven-bundle-plugin" . "true" -cp -p src/main/resources/META-INF/LICENSE . cp -p src/main/resources/META-INF/NOTICE . sed -i 's/\r//' LICENSE NOTICE %mvn_file : %{name} %build -%mvn_build +%mvn_build -f -j %install %mvn_install @@ -52,10 +47,10 @@ sed -i 's/\r//' LICENSE NOTICE %doc README.md release-notes/* %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog +* Wed Nov 22 2023 Red Hat PKI Team - 2.14.2-1 +- Rebase to upstream version 2.14.2 + * Tue Nov 12 2019 Red Hat PKI Team - 2.10.0-1 - Update to latest upstream release diff --git a/sources b/sources index 8e66779..e532e02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-core-2.10.0.tar.gz) = d1d90df0f27c425bc8e92a34e2f233240954b8538de4b96a3ba642747358732add744e462f76b600664d35490323d8ac0eb2d543e84ffcb03c240d46f32cbad8 +SHA512 (jackson-core-2.14.2.tar.gz) = c81e479af171b20d941dccf0c058ab3a81b280b15f2c7ae414e2c3029963d6276b68b28e64eef981b7a195b5e9f3b9a43624ece15f27349d04aa469575d44381