From 245da91233b920c5fdc799565302016d20fbb505 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 14:01:58 +0000 Subject: [PATCH] import CS jackson-bom-2.14.2-1.module_el8+988+30834131 --- .gitignore | 2 +- .jackson-bom.metadata | 2 +- SPECS/jackson-bom.spec | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9d232be..0ed4e70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jackson-bom-2.10.0.tar.gz +SOURCES/jackson-bom-2.14.2.tar.gz diff --git a/.jackson-bom.metadata b/.jackson-bom.metadata index 05c1a40..9b05479 100644 --- a/.jackson-bom.metadata +++ b/.jackson-bom.metadata @@ -1 +1 @@ -21d7b3edf47a684464890afb3e121316c51ed797 SOURCES/jackson-bom-2.10.0.tar.gz +3f7a611e9e9f7c35f7b170b9a0a2602f56a0184f SOURCES/jackson-bom-2.14.2.tar.gz diff --git a/SPECS/jackson-bom.spec b/SPECS/jackson-bom.spec index e595c4b..edaae43 100644 --- a/SPECS/jackson-bom.spec +++ b/SPECS/jackson-bom.spec @@ -1,8 +1,9 @@ Name: jackson-bom -Version: 2.10.0 +Version: 2.14.2 Release: 1%{?dist} Summary: Bill of materials POM for Jackson projects -License: ASL 2.0 +License: Apache-2.0 + URL: https://github.com/FasterXML/jackson-bom Source0: %{url}/archive/%{name}-%{version}.tar.gz # Upstream chooses not to include licenses with their pom only projects: @@ -10,9 +11,12 @@ Source0: %{url}/archive/%{name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local -BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) >= 2.10 +BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:) >= 2.14 BuildArch: noarch +%if 0%{?fedora} +ExclusiveArch: %{java_arches} noarch +%endif %description A "bill of materials" POM for Jackson dependencies. @@ -20,14 +24,12 @@ A "bill of materials" POM for Jackson dependencies. %prep %setup -q -n %{name}-%{name}-%{version} -cp -p %{SOURCE1} LICENSE -sed -i 's/\r//' LICENSE - # Disable plugins not needed during RPM builds %pom_remove_plugin ":maven-enforcer-plugin" base +%pom_remove_plugin ":nexus-staging-maven-plugin" base # New EE coords -%pom_change_dep "javax.activation:javax.activation-api" "jakarta.activation:jakarta.activation-api" base +%pom_change_dep "javax.activation:javax.activation-api" "jakarta.activation:jakarta.activation-api:2" base %build %mvn_build -j @@ -40,6 +42,9 @@ sed -i 's/\r//' LICENSE %license LICENSE %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