Blame SOURCES/0003-Port-to-plexus-utils-3.0.24.patch

ad18db
From 15dd54ee8552138a46719db7560a7e71871c5ee3 Mon Sep 17 00:00:00 2001
ad18db
From: Mikolaj Izdebski <mizdebsk@redhat.com>
ad18db
Date: Thu, 12 May 2016 09:24:36 +0200
ad18db
Subject: [PATCH 3/4] Port to plexus-utils 3.0.24
ad18db
ad18db
---
ad18db
 pom.xml                                                       | 2 +-
ad18db
 src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-
ad18db
 2 files changed, 9 insertions(+), 2 deletions(-)
ad18db
ad18db
diff --git a/pom.xml b/pom.xml
ad18db
index 8231d7c..ca63d8d 100644
ad18db
--- a/pom.xml
ad18db
+++ b/pom.xml
ad18db
@@ -192,7 +192,7 @@
ad18db
   <dependency>
ad18db
    <groupId>org.codehaus.plexus</groupId>
ad18db
    <artifactId>plexus-utils</artifactId>
ad18db
-   <version>3.0.10</version>
ad18db
+   <version>3.0.24</version>
ad18db
   </dependency>
ad18db
   <dependency>
ad18db
    <groupId>org.sonatype.plexus</groupId>
ad18db
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
ad18db
index 15abd0e..9ebd1a4 100644
ad18db
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
ad18db
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
ad18db
@@ -1803,7 +1803,14 @@ public class BundlePlugin extends AbstractMojo
ad18db
             File filterFile = new File( i.next() );
ad18db
             if ( filterFile.isFile() )
ad18db
             {
ad18db
-                properties.putAll( PropertyUtils.loadProperties( filterFile ) );
ad18db
+                try
ad18db
+                {
ad18db
+                    properties.putAll( PropertyUtils.loadProperties( filterFile ) );
ad18db
+                }
ad18db
+                catch ( IOException exc )
ad18db
+                {
ad18db
+                    // Ignore
ad18db
+                }
ad18db
             }
ad18db
         }
ad18db
 
ad18db
-- 
ad18db
2.9.3
ad18db