[jruby-maven-plugins] 13/15: Add plexus-archiver.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jruby-maven-plugins.

commit 08ce005e335e219b241de18c07860b3225fcc21d
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 28 21:04:46 2016 +0100

    Add plexus-archiver.patch
---
 debian/changelog                     |  2 ++
 debian/patches/plexus-archiver.patch | 42 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6a7988a..1f1fc1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ jruby-maven-plugins (1.1.5+ds1-1) unstable; urgency=medium
   * Declare compliance with Debian Policy 3.9.8.
   * Vcs-fields: Use https and cgit.
   * Add snakeyaml.patch fix FTBFS with SnakeYaml 1.17. (Closes: #844841)
+  * Add plexus-archiver.patch and fix another FTBFS since Debian still uses
+    version 2 of plexus archiver.
 
  -- Miguel Landaeta <nomadium at debian.org>  Wed, 28 Dec 2016 20:19:08 +0100
 
diff --git a/debian/patches/plexus-archiver.patch b/debian/patches/plexus-archiver.patch
new file mode 100644
index 0000000..b44213f
--- /dev/null
+++ b/debian/patches/plexus-archiver.patch
@@ -0,0 +1,42 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 28 Dec 2016 21:02:43 +0100
+Subject: plexus archiver
+
+Debian still uses plexus archiver 2. This patch can be dropped when version 3
+was packaged.
+
+Forwarded: not-needed
+---
+ .../src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java  | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java b/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
+index 8e4450f..6b817c5 100644
+--- a/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
++++ b/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
+@@ -88,12 +88,14 @@ public class DefaultGemPackager implements GemPackager {
+                         final Throwable throwable) {
+                 }
+             });
++            final TarCompressionMethod compression = new TarCompressionMethod();
+ 
+             File dataTarGz = null;
+             if (!gem.getGemFiles().isEmpty()) {
+                 // tar.gz the content into data.tar.gz
+                 dataTarGz = new File(gemWorkdir, "data.tar.gz");
+-                tar.setCompression(TarCompressionMethod.gzip);
++                compression.setValue("gzip");
++                tar.setCompression(compression);
+                 tar.setDestFile(dataTarGz);
+                 for (final GemFileEntry entry : gem.getGemFiles()) {
+                     if (entry.getSource().isFile()) {
+@@ -110,7 +112,8 @@ public class DefaultGemPackager implements GemPackager {
+             // and finally create gem by tar.gz-ing data.tar.gz and metadata.gz
+             final File gemFile = new File(target, gem.getGemFilename());
+             tar.setDestFile(gemFile);
+-            tar.setCompression(TarCompressionMethod.none);
++            compression.setValue("none");
++            tar.setCompression(compression);
+             if (dataTarGz != null) {
+                 tar.addFile(dataTarGz, dataTarGz.getName());
+             }
diff --git a/debian/patches/series b/debian/patches/series
index 755b9bd..d1bfdc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-rubygems-repo.diff
 snakeyaml.patch
+plexus-archiver.patch

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