This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository maven-bundle-plugin.
commit e995e20a44249baed09a4838e34e16c5bd5be035 Author: tony mancill <[email protected]> Date: Sat Jul 22 18:22:44 2017 -0700 Address FTBFS with maven-archiver 3.1 (Closes: #869361) --- debian/patches/maven-archiver3-869361.patch | 11 +++++++++++ debian/patches/series | 1 + 2 files changed, 12 insertions(+) diff --git a/debian/patches/maven-archiver3-869361.patch b/debian/patches/maven-archiver3-869361.patch new file mode 100644 index 0000000..a69018f --- /dev/null +++ b/debian/patches/maven-archiver3-869361.patch @@ -0,0 +1,11 @@ +--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java ++++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +@@ -757,7 +757,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/debian/patches/series b/debian/patches/series index 4924a42..a40539f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ support_plexus_utils_1_5.diff backward-compatibility.patch use-changelog-date-as-pom.properties-timestamp.patch FELIX-4882.patch +maven-archiver3-869361.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-bundle-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
