From 82bf76df538a57f823499e613aba13876429d651 Mon Sep 17 00:00:00 2001

From: Mikolaj Izdebski <mizdebsk@redhat.com>

Date: Thu, 12 May 2016 09:24:36 +0200

Subject: [PATCH 3/4] Port to plexus-utils 3.0.24

---

 pom.xml                                                       | 2 +-

 src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-

 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml

index db1134f..8749fdd 100644

--- a/pom.xml

+++ b/pom.xml

@@ -192,7 +192,7 @@

   <dependency>

    <groupId>org.codehaus.plexus</groupId>

    <artifactId>plexus-utils</artifactId>

-   <version>3.0.10</version>

+   <version>3.0.24</version>

   </dependency>

   <dependency>

    <groupId>org.sonatype.plexus</groupId>

diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

index dcf3978..8ddf111 100644

--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

@@ -1803,7 +1803,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.7.4