From bd9622e03e86508f936405a93104dd8d4597a8f6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 10 2020 17:59:28 +0000 Subject: update to version 40 --- diff --git a/.gitignore b/.gitignore index d0508b1..e61253a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /oss-parent-26.tar.gz /oss-parent-34.tar.gz /oss-parent-38.tar.gz +/oss-parent-40.tar.gz diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index e58b38f..1a120f2 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,11 +1,13 @@ -%global oname oss-parent +%global srcname oss-parent + Name: fasterxml-oss-parent -Version: 38 -Release: 4%{?dist} +Version: 40 +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 + +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) @@ -24,10 +26,12 @@ and extension. This package contains the parent pom file for FasterXML.com projects. %prep -%setup -q -n %{oname}-%{oname}-%{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 @@ -36,19 +40,8 @@ This package contains the parent pom file for FasterXML.com projects. %pom_remove_plugin :taglist-maven-plugin %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} - -J-Xmx1024m - ${javadoc.maxmemory} -' - %build -%mvn_build -j +%mvn_build %install %mvn_install @@ -58,6 +51,9 @@ This package contains the parent pom file for FasterXML.com projects. %license LICENSE NOTICE %changelog +* Mon Aug 10 2020 Fabio Valentini - 40-1 +- Update to version 40. + * Mon Jul 27 2020 Fedora Release Engineering - 38-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 07d0e0f..85d91ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oss-parent-38.tar.gz) = ef0b7a933c598bea33ecce3ec2b4c27fcf2e8c030d3fe23681cc9c2d7f564385dd30dc2b3b2be11a523d017c6817a1048cc80c48351a0a39ec6c8d391ef752ac +SHA512 (oss-parent-40.tar.gz) = 7b5c6c1f9d31faabb299e39fede843786863faac63d3cf65502cb25c57811071ec26de15912ce8e47149324f15810c944a59e48f2fc5041a5ee350898356ade9