From 5d527a1396a8085e2dd4ab72de580d281cc9ab35 Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 28 Sep 2015 16:52:47 +0200 Subject: [PATCH] update to 24 --- .gitignore | 1 + fasterxml-oss-parent.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ee49289..0f04fd6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /oss-parent-11.tar.gz /oss-parent-16.tar.gz /18e.tar.gz +/oss-parent-24.tar.gz diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index e75cfc2..ec96ec6 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,18 +1,18 @@ %global oname oss-parent Name: fasterxml-oss-parent -Version: 18e -Release: 2%{?dist} +Version: 24 +Release: 1%{?dist} Summary: FasterXML parent pom # pom file licenses ASL 2.0 and LGPL 2.1 License: ASL 2.0 and LGPLv2+ URL: http://fasterxml.com/ -Source0: https://github.com/FasterXML/oss-parent/archive/%{version}.tar.gz +Source0: https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz BuildRequires: maven-local -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-plugin-bundle -BuildRequires: maven-site-plugin +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildArch: noarch @@ -27,13 +27,15 @@ and extension. This package contains the parent pom file for FasterXML.com projects. %prep -%setup -q -n %{oname}-%{version} +%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:build/pom:extensions/pom:extension[pom:artifactId='wagon-gitsite']" %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']" ' @@ -53,6 +55,9 @@ This package contains the parent pom file for FasterXML.com projects. %license LICENSE NOTICE %changelog +* Mon Sep 28 2015 gil cattaneo 24-1 +- update to 24 + * Wed Jun 17 2015 Fedora Release Engineering - 18e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 2d1d4dd..387e818 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dea40080bb9726e28a93a21817cc204 18e.tar.gz +43c710f1ec851e99f64184d8a556ebc2 oss-parent-24.tar.gz