diff --git a/.fasterxml-oss-parent.metadata b/.fasterxml-oss-parent.metadata index ccdbda7..5b7f6f9 100644 --- a/.fasterxml-oss-parent.metadata +++ b/.fasterxml-oss-parent.metadata @@ -1 +1 @@ -2da14ea0974333d6ab6177cb15da09fdb8773e34 SOURCES/oss-parent-26.tar.gz +e5b2277cb80bb8456f8079179b1ff26f04a01b14 SOURCES/oss-parent-49.tar.gz diff --git a/.gitignore b/.gitignore index 1116c14..8e7771d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oss-parent-26.tar.gz +SOURCES/oss-parent-49.tar.gz diff --git a/SPECS/fasterxml-oss-parent.spec b/SPECS/fasterxml-oss-parent.spec index 7caf71a..7b25602 100644 --- a/SPECS/fasterxml-oss-parent.spec +++ b/SPECS/fasterxml-oss-parent.spec @@ -1,17 +1,21 @@ -%global oname oss-parent +%global srcname oss-parent + Name: fasterxml-oss-parent -Version: 26 -Release: 6%{?dist} +Version: 49 +Release: 1%{?dist} Summary: FasterXML parent pom -License: ASL 2.0 -URL: http://fasterxml.com/ -Source0: https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz +License: Apache-2.0 +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, @@ -24,28 +28,21 @@ and extension. This package contains the parent pom file for FasterXML.com projects. %prep -%setup -q -n %{oname}-%{oname}-%{version} - -%pom_remove_plugin org.sonatype.plugins:nexus-maven-plugin -%pom_remove_plugin :maven-scm-plugin -%pom_remove_plugin org.codehaus.mojo:jdepend-maven-plugin -%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin -# org.kathrynhuxtable.maven.wagon:wagon-gitsite:0.3.1 -%pom_xpath_remove "pom:build/pom:extensions" -# remove unavailable com.google.doclava doclava 1.0.3 -%pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" -%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" ' - - UTF-8 - true - ${javac.src.version} -' +%setup -q -n %{srcname}-%{srcname}-%{version} +# Stuff unnecessary for RPM builds +%pom_remove_plugin :jacoco-maven-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-pmd-plugin +%pom_remove_plugin :maven-scm-plugin %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :jdepend-maven-plugin +%pom_remove_plugin :taglist-maven-plugin +%pom_xpath_remove "pom:build/pom:extensions" %build -%mvn_build -j +%mvn_build %install %mvn_install @@ -55,6 +52,9 @@ This package contains the parent pom file for FasterXML.com projects. %license LICENSE NOTICE %changelog +* Tue Nov 21 2023 Red Hat PKI Team - 49-1 +- Rebase to upstream version 49 + * Wed Feb 07 2018 Fedora Release Engineering - 26-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild