From 54757ea7b21ec60c8882615ee0fbed3f1d8f43d5 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 5 Dec 2023 08:36:16 +0700 Subject: [PATCH] Rebase to version 56 Resolves: https://issues.redhat.com/browse/RHEL-16282 --- .gitignore | 1 + fasterxml-oss-parent.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b7cddf2..117b9de 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /oss-parent-40.tar.gz /oss-parent-41.tar.gz /oss-parent-49.tar.gz +/oss-parent-56.tar.gz diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index 5667dfb..44fe0f3 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,8 +1,8 @@ %global srcname oss-parent Name: fasterxml-oss-parent -Version: 49 -Release: 8%{?dist} +Version: 56 +Release: 1%{?dist} Summary: FasterXML parent pom License: Apache-2.0 @@ -10,9 +10,13 @@ URL: https://github.com/FasterXML/oss-parent Source0: %{url}/archive/%{srcname}-%{version}.tar.gz BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildArch: noarch +%if 0%{?fedora} +ExclusiveArch: %{java_arches} noarch +%endif %description FasterXML is the business behind the Woodstox streaming XML parser, @@ -37,11 +41,6 @@ This package contains the parent pom file for FasterXML.com projects. %pom_remove_plugin :jdepend-maven-plugin %pom_remove_plugin :taglist-maven-plugin %pom_xpath_remove "pom:build/pom:extensions" -%pom_remove_plugin "org.apache.felix:maven-bundle-plugin" -%pom_remove_plugin "org.apache.maven.plugins:maven-compiler-plugin" -%pom_remove_plugin "org.apache.maven.plugins:maven-jar-plugin" -%pom_remove_plugin "org.apache.maven.plugins:maven-surefire-plugin" -%pom_remove_plugin "org.codehaus.mojo:build-helper-maven-plugin" %build %mvn_build @@ -54,6 +53,9 @@ This package contains the parent pom file for FasterXML.com projects. %license LICENSE NOTICE %changelog +* Tue Dec 05 2023 Red Hat PKI Team - 56-1 +- Rebase to version 56 + * Thu Nov 24 2022 Chris Kelley - 49-1 - Update to version 49 - Resolves: #2070122 diff --git a/sources b/sources index ed36378..d5aae64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oss-parent-49.tar.gz) = 221e73acd80dc9268eb52af6c9ed5ad93968bce6be734d2443348e1dcde6f44d6dca8dd0171b24dc94c08516347010cb410cbbcada071cd048679aa1cd6ff226 +SHA512 (oss-parent-56.tar.gz) = f2f8b310c4e64cfa5d51a131b81069a39b5b56536989133cde1d8c227549694d1da3ff8ede80596552772f9ab0bff502439c4fe1fe569b3102fb9ab6983620fc