From 971e94c71ac698846f228847c5cdc44d68f03e31 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Feb 20 2019 15:17:17 +0000 Subject: Update to latest upstream version --- diff --git a/.gitignore b/.gitignore index 6ac1c7d..9990657 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /18e.tar.gz /oss-parent-24.tar.gz /oss-parent-26.tar.gz +/oss-parent-34.tar.gz diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index 24be272..99481ab 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,7 +1,7 @@ %global oname oss-parent Name: fasterxml-oss-parent -Version: 26 -Release: 8%{?dist} +Version: 34 +Release: 1%{?dist} Summary: FasterXML parent pom License: ASL 2.0 URL: http://fasterxml.com/ @@ -26,12 +26,16 @@ 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 +# Stuff unnecessary for RPM builds +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-pmd-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_remove_plugin :maven-site-plugin +%pom_remove_plugin :nexus-maven-plugin +%pom_remove_plugin :jdepend-maven-plugin +%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']" ' @@ -39,11 +43,10 @@ This package contains the parent pom file for FasterXML.com projects. UTF-8 true ${javac.src.version} + -J-Xmx1024m + ${javadoc.maxmemory} ' -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-site-plugin - %build %mvn_build -j @@ -55,6 +58,9 @@ This package contains the parent pom file for FasterXML.com projects. %license LICENSE NOTICE %changelog +* Wed Feb 20 2019 Mat Booth - 34-1 +- Update to latest upstream version + * Thu Jan 31 2019 Fedora Release Engineering - 26-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a2926ba..1f2e1c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0226f2c47371592eb820dee9442e7fc oss-parent-26.tar.gz +SHA512 (oss-parent-34.tar.gz) = 0a10548a679c66f7602023d466065a15bae71fe334eb32ddd611921961c47dfe7763338a2a33d8914f8155611804db6a5f43fcf9646d087429393962bb7d04f4