diff --git a/.gitignore b/.gitignore index fc9d1e2..edadaa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/jackson-bom-2.10.0.tar.gz /jackson-bom-2.10.0.tar.gz +/jackson-bom-2.14.2.tar.gz diff --git a/jackson-bom.spec b/jackson-bom.spec index e595c4b..edaae43 100644 --- a/jackson-bom.spec +++ b/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 diff --git a/sources b/sources index c549766..60f1af5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jackson-bom-2.10.0.tar.gz) = 3596050b950619e891c03a596868dda0b0a546e1fb334d029d4faf20115cb3c56896760fbb7b8d30ac8c2cca8cfea517b0f2da2efdb958fa615da5fe87ecf378 +SHA512 (jackson-bom-2.14.2.tar.gz) = a042c680a6dd6b705ba63d067c79e37e1079a1d277069d5a334ab0f34f9ac390e3da8c676577a298eba325f744f7f83274ea32d5d3b4b289ab531853a9d47976