From 9956c891db74ebed508d46164e0e17bb3f9e9f2e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 12 May 2016 09:26:58 +0200
Subject: [PATCH] Port to plexus-utils 3.0.24

---
 ...ort-to-current-maven-dependency-tree.patch |  6 ++--
 0002-Downgrade-aqute-bnd.patch                |  6 ++--
 0004-Port-to-plexus-utils-3.0.24.patch        | 32 +++++++++++++++++++
 maven-plugin-bundle.spec                      |  8 ++++-
 4 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 0004-Port-to-plexus-utils-3.0.24.patch

diff --git a/0001-Port-to-current-maven-dependency-tree.patch b/0001-Port-to-current-maven-dependency-tree.patch
index 744c703..551e9a4 100644
--- a/0001-Port-to-current-maven-dependency-tree.patch
+++ b/0001-Port-to-current-maven-dependency-tree.patch
@@ -1,7 +1,7 @@
-From db734c96a85f9f323e5533a3a9d41260efa8f0e2 Mon Sep 17 00:00:00 2001
+From 78dd71f9db048bf6d361a40f2d00d189c3911c76 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Fri, 12 Feb 2016 09:45:20 +0100
-Subject: [PATCH 1/2] Port to current maven-dependency-tree
+Subject: [PATCH 1/4] Port to current maven-dependency-tree
 
 ---
  .../apache/felix/bundleplugin/BundleAllPlugin.java | 54 ++++++++++++----------
@@ -236,5 +236,5 @@ index f15a34a..6ceb4c0 100644
                      //check if it really isn't in the list of original dependencies.  Maven
                      //prior to 2.0.8 may grab versions from transients instead of
 -- 
-2.5.0
+2.5.5
 
diff --git a/0002-Downgrade-aqute-bnd.patch b/0002-Downgrade-aqute-bnd.patch
index 4b79955..a898e07 100644
--- a/0002-Downgrade-aqute-bnd.patch
+++ b/0002-Downgrade-aqute-bnd.patch
@@ -1,7 +1,7 @@
-From ea37cbea181c548280c758aa6962d0d06f664c30 Mon Sep 17 00:00:00 2001
+From 55810ef684583532c340a5ec585bf509b6712383 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Fri, 12 Feb 2016 11:17:02 +0100
-Subject: [PATCH 2/2] Downgrade aqute-bnd
+Subject: [PATCH 2/4] Downgrade aqute-bnd
 
 ---
  .../java/org/apache/felix/bundleplugin/BundlePlugin.java   |  1 +
@@ -47,5 +47,5 @@ index 1e1d025..add2cd4 100644
      }
  
 -- 
-2.5.0
+2.5.5
 
diff --git a/0004-Port-to-plexus-utils-3.0.24.patch b/0004-Port-to-plexus-utils-3.0.24.patch
new file mode 100644
index 0000000..48c3e3d
--- /dev/null
+++ b/0004-Port-to-plexus-utils-3.0.24.patch
@@ -0,0 +1,32 @@
+From 9923aa8e2f1bbbe86253c5c63e6aa97f1dcad2ee Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 12 May 2016 09:24:36 +0200
+Subject: [PATCH 4/4] Port to plexus-utils 3.0.24
+
+---
+ src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+index 8c0b6f0..02e53fe 100644
+--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+@@ -1784,7 +1784,14 @@ public class BundlePlugin extends AbstractMojo
+             File filterFile = new File( i.next() );
+             if ( filterFile.isFile() )
+             {
+-                properties.putAll( PropertyUtils.loadProperties( filterFile ) );
++                try
++                {
++                    properties.putAll( PropertyUtils.loadProperties( filterFile ) );
++                }
++                catch ( IOException exc )
++                {
++                    // Ignore
++                }
+             }
+         }
+ 
+-- 
+2.5.5
+
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index a011be6..d447fd9 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-plugin-bundle
 Version:        3.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Bundle Plugin
 License:        ASL 2.0
 URL:            http://felix.apache.org
@@ -16,6 +16,8 @@ Patch0:         0001-Port-to-current-maven-dependency-tree.patch
 Patch1:         0002-Downgrade-aqute-bnd.patch
 # New maven-archiver removed some deprecated methods we were using
 Patch2:         fix-for-new-maven-archiver.patch
+# Port to newer Plexus utils
+Patch3:         0004-Port-to-plexus-utils-3.0.24.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
@@ -58,6 +60,7 @@ API documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 find -name '*.jar' -delete
 
@@ -87,6 +90,9 @@ rm -r src/main/java/org/apache/maven/shared/dependency
 %doc LICENSE NOTICE
 
 %changelog
+* Thu May 12 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-3
+- Port to plexus-utils 3.0.24
+
 * Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 3.0.1-2
 - Fix build against new maven-archiver, which removed some deprecated methods
   that this plugin was using