[Git][java-team/plexus-archiver][experimental] 2 commits: Add patch to restore method signatures present in 3.6.0

[Tony Mancill]

Tony Mancill pushed to branch experimental at Debian Java Maintainers / plexus-archiver


Commits:
e3cef37a by tony mancill at 2020-04-09T21:26:14-07:00
Add patch to restore method signatures present in 3.6.0

- - - - -
d46f823a by tony mancill at 2020-04-09T21:29:37-07:00
interim changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/06-plexus-archiver-3.6.0.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+plexus-archiver (4.2.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to restore method signatures present in 3.6.0
+    that were removed in 4.2.2.
+
+ -- tony mancill <tmancill at debian.org>  Thu, 09 Apr 2020 21:26:48 -0700
+
 plexus-archiver (4.2.2-1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/patches/06-plexus-archiver-3.6.0.patch
=====================================
@@ -0,0 +1,41 @@
+Description: Restore method signatures present in plexus-archiver 3.6.0
+Author: tony mancill <tmancill at debian.org>
+
+diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
+index 41f6c8c..52e353a 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
+@@ -384,4 +384,15 @@ else if ( isDirectory )
+         }
+     }
+ 
++    // restore method signature as present in plexus-archiver 3.6.0
++    protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
++                                final String entryName, final Date entryDate, final boolean isDirectory,
++                                final Integer mode, String symlinkDestination )
++        throws IOException, ArchiverException
++    {
++        extractFile(srcF, dir, compressedInputStream,
++                    entryName, entryDate, isDirectory,
++                    mode, symlinkDestination, null );
++    }
++
+ }
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+index f2a941a..4a6921c 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+@@ -125,6 +125,13 @@ protected void execute( File sourceFile, File destDirectory, FileMapper[] fileMa
+         }
+     }
+ 
++    // restore method signature as present in plexus-archiver 3.6.0
++    protected void execute( File sourceFile, File destDirectory )
++        throws ArchiverException
++    {
++        execute( sourceFile, destDirectory, null );
++    }
++
+     /**
+      * This method wraps the input stream with the
+      * corresponding decompression method


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 03-plexus-utils-compatibility.patch
 04-ignore-utf8-unzip-test.patch
 05-plexus-containers-compatibility.patch
+06-plexus-archiver-3.6.0.patch



View it on GitLab: https://salsa.debian.org/java-team/plexus-archiver/-/compare/8fa6fb4b977c4cff35bc295f5bd7c7ac67ad29fd...d46f823a03c81f617d5f3cf2d947b85a96b542ca

-- 
View it on GitLab: https://salsa.debian.org/java-team/plexus-archiver/-/compare/8fa6fb4b977c4cff35bc295f5bd7c7ac67ad29fd...d46f823a03c81f617d5f3cf2d947b85a96b542ca
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200410/1c018e42/attachment.html>