Blob Blame History Raw
From ea37cbea181c548280c758aa6962d0d06f664c30 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

---
 .../java/org/apache/felix/bundleplugin/BundlePlugin.java   |  1 +
 .../java/org/apache/felix/bundleplugin/ManifestPlugin.java | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 6ceb4c0..07a36fe 100644
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -330,6 +330,7 @@ public class BundlePlugin extends AbstractMojo
         {
             ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
             request.setProject(mavenProject);
+            request.setRepositorySession(session.getRepositorySession());
             dependencyGraph = m_dependencyGraphBuilder.buildDependencyGraph( request, null );
         }
         catch ( DependencyGraphBuilderException e )
diff --git a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index 1e1d025..add2cd4 100644
--- a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -120,14 +120,14 @@ public class ManifestPlugin extends BundlePlugin
         }
         finally
         {
-            try 
-            {
+//            try 
+//            {
                 analyzer.close();
-            }
-            catch ( IOException e )
-            {
-                throw new MojoExecutionException( "Error trying to write Manifest to file " + outputFile, e );
-            }
+//            }
+//            catch ( IOException e )
+//            {
+//                throw new MojoExecutionException( "Error trying to write Manifest to file " + outputFile, e );
+//            }
         }
     }
 
-- 
2.5.0