You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2020/03/15 10:53:15 UTC
[felix-dev] branch master updated: FELIX-6193 - Update
maven-archiver + plexus-utils (#8)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 12bac91 FELIX-6193 - Update maven-archiver + plexus-utils (#8)
12bac91 is described below
commit 12bac911c49ffb1897f6c963484f890bcc1b9615
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Sun Mar 15 10:53:05 2020 +0000
FELIX-6193 - Update maven-archiver + plexus-utils (#8)
---
tools/maven-bundle-plugin/pom.xml | 2 +-
.../src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/maven-bundle-plugin/pom.xml b/tools/maven-bundle-plugin/pom.xml
index d2e59ce..804a3f8 100644
--- a/tools/maven-bundle-plugin/pom.xml
+++ b/tools/maven-bundle-plugin/pom.xml
@@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.6</version>
+ <version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 5a31003..8d0e570 100644
--- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -1070,7 +1070,7 @@ public class BundlePlugin extends AbstractMojo
* Grab customized manifest entries from the maven-jar-plugin configuration
*/
MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
- String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig ).toString();
+ String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig.getManifest() ).toString();
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
Manifest mavenManifest = new Manifest();