This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jruby-maven-plugins.
commit 6b509360dd206d9148225171420232e262dd5134 Author: Emmanuel Bourg <[email protected]> Date: Tue Sep 5 23:11:10 2017 +0200 Removed plexus-archiver.patch and depend on libplexus-archiver-java (>= 3.5) --- debian/changelog | 1 + debian/control | 1 + debian/patches/plexus-archiver.patch | 42 ------------------------------------ debian/patches/series | 1 - 4 files changed, 2 insertions(+), 43 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9fbf19c..10ed9fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jruby-maven-plugins (1.1.5+ds1-2) UNRELEASED; urgency=medium * Team upload. + * Removed plexus-archiver.patch and depend on libplexus-archiver-java (>= 3.5) * Standards-Version updated to 4.1.0 -- Emmanuel Bourg <[email protected]> Wed, 30 Aug 2017 13:16:31 +0200 diff --git a/debian/control b/debian/control index 4e01830..a2c30f0 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: libmaven-exec-plugin-java, libmaven-install-plugin-java, libmaven-source-plugin-java, + libplexus-archiver-java (>= 3.5), libyaml-snake-java, maven-debian-helper (>= 2.0~), maven-repo-helper (>= 1.5) diff --git a/debian/patches/plexus-archiver.patch b/debian/patches/plexus-archiver.patch deleted file mode 100644 index b44213f..0000000 --- a/debian/patches/plexus-archiver.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Markus Koschany <[email protected]> -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 d1bfdc4..755b9bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
