From dd215d5223fa61f31ac6305f5f8ba949d244ce8c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Aug 08 2019 09:38:48 +0000 Subject: Update to upstream version 3.0.1 --- diff --git a/.gitignore b/.gitignore index fbfc47a..3d201a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /maven-invoker-2.1.1-source-release.zip /maven-invoker-2.2-source-release.zip +/maven-invoker-3.0.1-source-release.zip diff --git a/maven-invoker-MSHARED-279.patch b/maven-invoker-MSHARED-279.patch index e3e1eae..61c7537 100644 --- a/maven-invoker-MSHARED-279.patch +++ b/maven-invoker-MSHARED-279.patch @@ -13,14 +13,14 @@ index 35ab16b..082c988 100644 --- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java @@ -536,7 +536,7 @@ public class MavenCommandLineBuilder - if ( mavenHome == null ) - { - String mavenHomeProperty = System.getProperty( "maven.home" ); -- if ( mavenHomeProperty != null ) -+ if ( StringUtils.isNotEmpty( mavenHomeProperty ) ) - { - mavenHome = new File( mavenHomeProperty ); - if ( !mavenHome.isDirectory() ) + if ( mavenHome == null ) + { + String mavenHomeProperty = System.getProperty( "maven.home" ); +- if ( mavenHomeProperty != null ) ++ if ( StringUtils.isNotEmpty( mavenHomeProperty ) ) + { + mavenHome = new File( mavenHomeProperty ); + if ( !mavenHome.isDirectory() ) -- 1.8.1.4 diff --git a/maven-invoker.spec b/maven-invoker.spec index 582ced6..3387ff3 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -1,6 +1,6 @@ Name: maven-invoker -Version: 2.2 -Release: 10%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Fires a maven build in a clean environment License: ASL 2.0 URL: http://maven.apache.org/shared/maven-invoker/ @@ -38,7 +38,6 @@ Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q %patch1 -p1 @@ -57,6 +56,9 @@ API documentation for %{name}. %changelog +* Thu Aug 08 2019 Marian Koncek - 3.0.1-1 +- Update to upstream version 3.0.1 + * Thu Jul 25 2019 Fedora Release Engineering - 2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a0e6f44..a2dd793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97968ee7d5fade09753fd448a41c1e4d maven-invoker-2.2-source-release.zip +SHA512 (maven-invoker-3.0.1-source-release.zip) = 9465a2aa2750bd3e158fa65d1541637b99883ef74157c1ce975ad08928d15364d3289aebcecd05e28b4d4f7072aab506964255e0a51b9e9a0ea8f8768159dc2c