Update to upstream version 1.10
This commit is contained in:
parent
a84e31e709
commit
135aa90705
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ maven-invoker-plugin-1.5.tgz
|
||||
/maven-invoker-plugin-1.7-source-release.zip
|
||||
/maven-invoker-plugin-1.8-source-release.zip
|
||||
/maven-invoker-plugin-1.9-source-release.zip
|
||||
/maven-invoker-plugin-1.10-source-release.zip
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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
|
||||
@ -1,12 +1,12 @@
|
||||
Name: maven-invoker-plugin
|
||||
Version: 1.9
|
||||
Version: 1.10
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Invoker Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-invoker-plugin/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Patch0: %{name}-generics.patch
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
@ -34,10 +34,9 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
|
||||
%description
|
||||
The Maven Invoker Plugin is used to run a set of Maven projects. The plugin
|
||||
can determine whether each project execution is successful, and optionally
|
||||
The Maven Invoker Plugin is used to run a set of Maven projects. The plugin
|
||||
can determine whether each project execution is successful, and optionally
|
||||
can verify the output generated from a given project execution.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
@ -47,7 +46,6 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
|
||||
%build
|
||||
%mvn_build -f
|
||||
@ -56,12 +54,15 @@ API documentation for %{name}.
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE NOTICE
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE NOTICE
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10-1
|
||||
- Update to upstream version 1.10
|
||||
|
||||
* Wed Mar 11 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-1
|
||||
- Update to upstream version 1.9
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user