mizdebsk pushed to maven-invoker (master). "Update to upstream version 2.2"

[notifications at fedoraproject.org]

>From 6aec6cebd8e029009f1cff84bc412b2bc7972ed0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 25 Mar 2015 06:13:19 +0100
Subject: Update to upstream version 2.2


diff --git a/.gitignore b/.gitignore
index 1eda9b1..fbfc47a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /maven-invoker-2.1.1-source-release.zip
+/maven-invoker-2.2-source-release.zip
diff --git a/maven-invoker-MSHARED-278.patch b/maven-invoker-MSHARED-278.patch
deleted file mode 100644
index ff23678..0000000
--- a/maven-invoker-MSHARED-278.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fb1bfb61d31abcdfaac0256648f42257520ce3c9 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk at redhat.com>
-Date: Wed, 13 Mar 2013 13:35:39 +0100
-Subject: [PATCH 1/2] Fix MSHARED-278
-
-See: http://jira.codehaus.org/browse/MSHARED-278
----
- .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
-index f8a22a5..35ab16b 100644
---- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
-+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
-@@ -542,7 +542,7 @@ public class MavenCommandLineBuilder
-                 if ( !mavenHome.isDirectory() )
-                 {
-                     File binDir = mavenHome.getParentFile();
--                    if ( "bin".equals( binDir.getName() ) )
-+                    if ( binDir != null && "bin".equals( binDir.getName() ) )
-                     {
-                         // ah, they specified the mvn
-                         // executable instead...
--- 
-1.8.1.4
-
diff --git a/maven-invoker.spec b/maven-invoker.spec
index 01c120f..abb16e4 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -1,12 +1,10 @@
 Name:           maven-invoker
-Version:        2.1.1
-Release:        11%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        Fires a maven build in a clean environment
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-invoker/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-# Patch accepted upstream
-Patch0:         %{name}-MSHARED-278.patch
 # Patch rejected upstream
 Patch1:         %{name}-MSHARED-279.patch
 
@@ -43,7 +41,6 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -60,6 +57,9 @@ API documentation for %{name}.
 
 
 %changelog
+* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-1
+- Update to upstream version 2.2
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d4675e1..a0e6f44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90adef79015411c856da0bb829a23a0f  maven-invoker-2.1.1-source-release.zip
+97968ee7d5fade09753fd448a41c1e4d  maven-invoker-2.2-source-release.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/maven-invoker.git/commit/?h=master&id=6aec6cebd8e029009f1cff84bc412b2bc7972ed0

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390