rpms/maven-bundle-plugin
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build against new maven-archiver, which removed some deprecated methods

Browse Source 
that this plugin was using
This commit is contained in:
Mat Booth 2016-04-14 17:00:23 +01:00
parent e421ff0f97
commit 37f70ec813
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fix-for-new-maven-archiver.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java.orig 2016-04-14 16:51:28.771098909 +0100
+++ ./src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java 2016-04-14 16:53:32.364679338 +0100
@@ -1082,7 +1082,7 @@
* 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( m_mavenSession, currentProject, archiveConfig ).toString();
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
Manifest mavenManifest = new Manifest();

9
maven-plugin-bundle.spec
View File

@ -2,7 +2,7 @@
Name: maven-plugin-bundle Name: maven-plugin-bundle
Version: 3.0.1 Version: 3.0.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Maven Bundle Plugin Summary: Maven Bundle Plugin
License: ASL 2.0 License: ASL 2.0
URL: http://felix.apache.org URL: http://felix.apache.org
@ -14,6 +14,8 @@ Source0: http://archive.apache.org/dist/felix/%{site_name}-%{version}-sou
Patch0: 0001-Port-to-current-maven-dependency-tree.patch Patch0: 0001-Port-to-current-maven-dependency-tree.patch
# It doesn't really need new aqute-bnd # It doesn't really need new aqute-bnd
Patch1: 0002-Downgrade-aqute-bnd.patch Patch1: 0002-Downgrade-aqute-bnd.patch
# New maven-archiver removed some deprecated methods we were using
Patch2: fix-for-new-maven-archiver.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
@ -55,6 +57,7 @@ API documentation for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
find -name '*.jar' -delete find -name '*.jar' -delete
@ -84,6 +87,10 @@ rm -r src/main/java/org/apache/maven/shared/dependency
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 3.0.1-2
- Fix build against new maven-archiver, which removed some deprecated methods
that this plugin was using
* Fri Feb 12 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-1 * Fri Feb 12 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-1
- Update to upstream version 3.0.1 - Update to upstream version 3.0.1