[maven-invoker-plugin] Update to upstream version 1.9

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Mar 11 06:39:36 UTC 2015


commit a84e31e7094e8e11786615a6c44dd46705789d9f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Mar 11 07:34:17 2015 +0100

    Update to upstream version 1.9

 .gitignore                          |  1 +
 maven-invoker-plugin-generics.patch | 20 ++++++++++++++++++++
 maven-invoker-plugin.spec           |  9 ++++++---
 pom-xml.patch                       | 11 -----------
 sources                             |  2 +-
 5 files changed, 28 insertions(+), 15 deletions(-)
---
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<String, Object> 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<String, Object> 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 <mizdebsk at redhat.com> - 1.9-1
+- Update to upstream version 1.9
+
 * Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8-13
 - Remove legacy Obsoletes/Provides for maven2 plugin
 
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


More information about the scm-commits mailing list