diff --git a/.gitignore b/.gitignore index 1cd086a..caef954 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ maven-invoker-plugin-1.5.tgz /maven-invoker-plugin-1.6-source-release.zip /maven-invoker-plugin-1.7-source-release.zip /maven-invoker-plugin-1.8-source-release.zip +/maven-invoker-plugin-1.9-source-release.zip diff --git a/maven-invoker-plugin-generics.patch b/maven-invoker-plugin-generics.patch new file mode 100644 index 0000000..23484fa --- /dev/null +++ b/maven-invoker-plugin-generics.patch @@ -0,0 +1,20 @@ +--- src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java~ 2014-06-28 11:39:46.000000000 +0200 ++++ src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java 2015-03-11 07:37:09.283091566 +0100 +@@ -2179,7 +2179,7 @@ + try + { + Map composite = getInterpolationValueSource(); +- reader = new BufferedReader( new InterpolationFilterReader( newReader( tokenFile ), composite ) ); ++ reader = new BufferedReader( new InterpolationFilterReader( newReader( tokenFile ), ( Map ) composite ) ); + + String line; + while ( ( line = reader.readLine() ) != null ) +@@ -2242,7 +2242,7 @@ + // interpolation with token @...@ + Map composite = getInterpolationValueSource(); + reader = ReaderFactory.newXmlReader( originalFile ); +- reader = new InterpolationFilterReader( reader, composite, "@", "@" ); ++ reader = new InterpolationFilterReader( reader, ( Map ) composite, "@", "@" ); + xml = IOUtil.toString( reader ); + } + finally diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec index 26f55e9..1322002 100644 --- a/maven-invoker-plugin.spec +++ b/maven-invoker-plugin.spec @@ -1,11 +1,11 @@ Name: maven-invoker-plugin -Version: 1.8 -Release: 13%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: Maven Invoker Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-invoker-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: pom-xml.patch +Patch0: %{name}-generics.patch BuildArch: noarch BuildRequires: maven-local @@ -62,6 +62,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Wed Mar 11 2015 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 + * Tue Oct 14 2014 Mikolaj Izdebski - 1.8-13 - Remove legacy Obsoletes/Provides for maven2 plugin diff --git a/pom-xml.patch b/pom-xml.patch deleted file mode 100644 index 503c1ea..0000000 --- a/pom-xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pom.xml.orig 2013-01-18 17:01:28.968287168 +0800 -+++ pom.xml 2013-01-18 17:01:41.000866596 +0800 -@@ -61,7 +61,7 @@ - bsh - 2.0b4 - org.codehaus.groovy -- groovy-all -+ groovy - 2.0.1 - 3.2 - diff --git a/sources b/sources index 5cada48..7755ecd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee3f68a95867c5c2bd845c5c3ad0cfb1 maven-invoker-plugin-1.8-source-release.zip +f9682cefa688e0792def4f768795cfb8 maven-invoker-plugin-1.9-source-release.zip