[maven-hpi-plugin] 01/05: Fixed the compatibility with plexus-archiver >= 2.1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-hpi-plugin.

commit d53b7246860b69c585915229478c2953de7661d6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 3 23:36:10 2015 +0200

    Fixed the compatibility with plexus-archiver >= 2.1
---
 debian/changelog                                   |  7 +++
 .../0004-maven-archiver-compatibility.patch        | 63 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 71 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c5cbc2..7bf8a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-hpi-plugin (1.93-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with plexus-archiver >= 2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jul 2015 23:35:06 +0200
+
 maven-hpi-plugin (1.93-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0004-maven-archiver-compatibility.patch b/debian/patches/0004-maven-archiver-compatibility.patch
new file mode 100644
index 0000000..fe47485
--- /dev/null
+++ b/debian/patches/0004-maven-archiver-compatibility.patch
@@ -0,0 +1,63 @@
+Description: Fixes the compatibility with plexus-archiver >= 2.1 (used by maven-archiver >= 2.5)
+Author: Emmanuel Bourg <ebourg at pache.org>
+Forwarded: no
+--- a/src/main/java/org/jenkinsci/maven/plugins/hpi/HplMojo.java
++++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/HplMojo.java
+@@ -6,7 +6,7 @@
+ import org.apache.maven.plugin.MojoFailureException;
+ import org.codehaus.plexus.archiver.jar.Manifest;
+ import org.codehaus.plexus.archiver.jar.Manifest.Attribute;
+-import org.codehaus.plexus.archiver.jar.Manifest.Section;
++import org.codehaus.plexus.archiver.jar.Manifest.ExistingSection;
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.codehaus.plexus.util.IOUtil;
+ 
+@@ -47,7 +47,7 @@
+         PrintWriter printWriter = null;
+         try {
+             Manifest mf = new Manifest();
+-            Section mainSection = mf.getMainSection();
++            ExistingSection mainSection = mf.getMainSection();
+             setAttributes(mainSection);
+ 
+             // compute Libraries entry
+--- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
++++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
+@@ -31,7 +31,7 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.UnArchiver;
+ import org.codehaus.plexus.archiver.jar.Manifest.Attribute;
+-import org.codehaus.plexus.archiver.jar.Manifest.Section;
++import org.codehaus.plexus.archiver.jar.Manifest.ExistingSection;
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.codehaus.plexus.archiver.manager.ArchiverManager;
+ import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+@@ -897,7 +897,7 @@
+     }
+ 
+ 
+-    protected void setAttributes(Section mainSection) throws MojoExecutionException, ManifestException, IOException {
++    protected void setAttributes(ExistingSection mainSection) throws MojoExecutionException, ManifestException, IOException {
+         File pluginImpl = new File(project.getBuild().getOutputDirectory(), "META-INF/services/hudson.Plugin");
+         if(pluginImpl.exists()) {
+             BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pluginImpl),"UTF-8"));
+--- a/src/main/java/org/jenkinsci/maven/plugins/hpi/HpiMojo.java
++++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/HpiMojo.java
+@@ -24,7 +24,7 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.jar.JarArchiver;
+ import org.codehaus.plexus.archiver.jar.Manifest;
+-import org.codehaus.plexus.archiver.jar.Manifest.Section;
++import org.codehaus.plexus.archiver.jar.Manifest.ExistingSection;
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.codehaus.plexus.util.IOUtil;
+ 
+@@ -180,7 +180,7 @@
+         PrintWriter printWriter = null;
+         try {
+             Manifest mf = ma.getManifest(project, archive.getManifest());
+-            Section mainSection = mf.getMainSection();
++            ExistingSection mainSection = mf.getMainSection();
+             setAttributes(mainSection);
+ 
+             printWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(manifestFile),"UTF-8"));
diff --git a/debian/patches/series b/debian/patches/series
index b541ed1..83aecc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-build-tools.patch
 0002-disable-jetty-archetype.patch
 0003-openjdk6-fixup.patch
+0004-maven-archiver-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-hpi-plugin.git