maven-bundle-plugin/0002-Fix-for-new-maven-archiver.patch

26 lines
1.3 KiB
Diff
Raw Normal View History

2018-01-08 11:37:58 +00:00
From 17a505c7c7924540f9636e3cd2700cc25a59447e Mon Sep 17 00:00:00 2001
2016-05-27 10:43:25 +00:00
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 14 Apr 2016 17:00:23 +0100
Subject: [PATCH 2/4] Fix for new maven archiver
2016-05-27 10:43:25 +00:00
---
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
2018-01-08 11:37:58 +00:00
index 3e4384e..a42d6ef 100644
2016-05-27 10:43:25 +00:00
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
2018-01-02 13:31:49 +00:00
@@ -1101,7 +1101,7 @@ public class BundlePlugin extends AbstractMojo
2018-01-08 11:37:58 +00:00
* Grab customized manifest entries from the maven-jar-plugin configuration
*/
MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
- String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig ).toString();
2016-05-27 10:43:25 +00:00
+ String mavenManifestText = new MavenArchiver().getManifest( m_mavenSession, currentProject, archiveConfig ).toString();
2018-01-08 11:37:58 +00:00
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
Manifest mavenManifest = new Manifest();
2016-05-27 10:43:25 +00:00
--
2018-01-02 13:31:49 +00:00
2.14.3
2016-05-27 10:43:25 +00:00