diff --git a/fix-for-new-maven-archiver.patch b/fix-for-new-maven-archiver.patch new file mode 100644 index 0000000..dff4fce --- /dev/null +++ b/fix-for-new-maven-archiver.patch @@ -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(); diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec index e41f6e4..a011be6 100644 --- a/maven-plugin-bundle.spec +++ b/maven-plugin-bundle.spec @@ -2,7 +2,7 @@ Name: maven-plugin-bundle Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Bundle Plugin License: ASL 2.0 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 # It doesn't really need new aqute-bnd 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: mvn(biz.aQute.bnd:biz.aQute.bndlib) @@ -55,6 +57,7 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 +%patch2 -p1 find -name '*.jar' -delete @@ -84,6 +87,10 @@ rm -r src/main/java/org/apache/maven/shared/dependency %doc LICENSE NOTICE %changelog +* Thu Apr 14 2016 Mat Booth - 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 - 3.0.1-1 - Update to upstream version 3.0.1