[Git][java-team/libapache-poi-java][master] 4 commits: d/p/17_commons-compress-upgrade.patch: apply upstream patch to resolve ftbfs (Closes: 1065455).

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / libapache-poi-java


Commits:
1d91b14d by Vladimir Petko at 2024-03-07T15:21:04+13:00
d/p/17_commons-compress-upgrade.patch: apply upstream patch to resolve ftbfs (Closes: 1065455).

- - - - -
71c6f877 by Vladimir Petko at 2024-03-07T15:27:00+13:00
changelog

- - - - -
8948a3e2 by Tony Mancill at 2024-03-07T04:35:36+00:00
Merge branch 'master' into 'master'

# Conflicts:
#   debian/changelog
- - - - -
c54a5c39 by Tony Mancill at 2024-03-07T04:36:36+00:00
Merge branch 'master' into 'master'

resolve ftbfs due to commons-compress upgrade

See merge request java-team/libapache-poi-java!2
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/17_commons-compress-upgrade.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libapache-poi-java (4.0.1-6) UNRELEASED; urgency=medium
+
+  [ Vladimir Petko ]
+  * d/p/17_commons-compress-upgrade.patch: apply upstream patch to resolve ftbfs
+    (Closes: #1065455).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 07 Mar 2024 15:21:27 +1300
+
 libapache-poi-java (4.0.1-5) unstable; urgency=medium
 
   [ Pierre Gruet ]
@@ -18,6 +26,7 @@ libapache-poi-java (4.0.1-5) unstable; urgency=medium
 
  -- tony mancill <tmancill at debian.org>  Wed, 13 Dec 2023 13:42:30 -0800
 
+
 libapache-poi-java (4.0.1-4) unstable; urgency=medium
 
   * Compatibility with XMLBeans 4.0


=====================================
debian/patches/17_commons-compress-upgrade.patch
=====================================
@@ -0,0 +1,33 @@
+Description: fix compile issue due to commons-compress upgrade
+ commons-compress 1.25 has a different signature for
+ ZipArchiveOutputStream.putArchiveEntry(). This causes a build failure. 
+Author: PJ Fanning <fanningpj at apache.org>
+Origin: upstream, https://github.com/apache/poi/commit/386b2fcc7898533ef047d9b52e86d370d2cc9ee2
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065455
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libapache-poi-java/+bug/2056384
+Forwarded: not-needed
+Applied-Upstream: commit, 386b2fcc7898533ef047d9b52e86d370d2cc9ee2
+Last-Update: 2024-03-07
+
+diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
+index 30fabfc1..dc986b24 100644
+--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
++++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
+@@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ import java.io.OutputStream;
+ 
+-import org.apache.commons.compress.archivers.ArchiveEntry;
++import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+ import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
+ import org.apache.poi.openxml4j.opc.PackagingURIHelper;
+@@ -58,7 +58,7 @@ public class TestZipPackagePropertiesMarshaller {
+         marshaller.marshall(new PackagePropertiesPart(null, PackagingURIHelper.createPartName(PACKAGE_RELATIONSHIPS_ROOT_URI)),
+                 new ZipArchiveOutputStream(new ByteArrayOutputStream()) {
+                     @Override
+-                    public void putArchiveEntry(final ArchiveEntry archiveEntry) throws IOException {
++                    public void putArchiveEntry(final ZipArchiveEntry archiveEntry) throws IOException {
+                         throw new IOException("TestException");
+                     }
+                 });


=====================================
debian/patches/series
=====================================
@@ -10,3 +10,4 @@ bug-62996.patch
 14_language-level.patch
 15_xmlbeans-compatibility.patch
 16_bouncycastle-1.77.patch
+17_commons-compress-upgrade.patch
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/-/compare/176279e904ecb471cc5d571e5b81bfcbb4e1d9fe...c54a5c39d9e292b1729cba64e503ce7740418674

-- 
View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/-/compare/176279e904ecb471cc5d571e5b81bfcbb4e1d9fe...c54a5c39d9e292b1729cba64e503ce7740418674
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/20240307/c9a11dcc/attachment.htm>