2016-07-19 13:05:29 +00:00
|
|
|
From 0110a0dc8c3559b4a0a5c88c9883a07bef605233 Mon Sep 17 00:00:00 2001
|
2016-05-12 07:26:58 +00:00
|
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
|
Date: Thu, 12 May 2016 09:24:36 +0200
|
2016-05-27 10:43:25 +00:00
|
|
|
Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
|
2016-05-12 07:26:58 +00:00
|
|
|
|
|
|
|
---
|
|
|
|
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
|
2016-07-19 13:05:29 +00:00
|
|
|
index dcf3978..8ddf111 100644
|
2016-05-12 07:26:58 +00:00
|
|
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
|
|
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
2016-07-19 13:05:29 +00:00
|
|
|
@@ -1803,7 +1803,14 @@ public class BundlePlugin extends AbstractMojo
|
2016-05-12 07:26:58 +00:00
|
|
|
File filterFile = new File( i.next() );
|
|
|
|
if ( filterFile.isFile() )
|
|
|
|
{
|
|
|
|
- properties.putAll( PropertyUtils.loadProperties( filterFile ) );
|
|
|
|
+ try
|
|
|
|
+ {
|
|
|
|
+ properties.putAll( PropertyUtils.loadProperties( filterFile ) );
|
|
|
|
+ }
|
|
|
|
+ catch ( IOException exc )
|
|
|
|
+ {
|
|
|
|
+ // Ignore
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2016-07-19 13:05:29 +00:00
|
|
|
2.7.4
|
2016-05-12 07:26:58 +00:00
|
|
|
|