svn commit: r1913865 - in /poi/trunk/poi-ooxml/src: main/java/org/apache/poi/xssf/streaming/ test/java/org/apache/poi/openxml4j/opc/internal/marshallers/ test/java/org/apache/poi/xssf/usermodel/

[fanningpj]

Author: fanningpj
Date: Thu Nov 16 22:15:24 2023
New Revision: 1913865

URL: http://svn.apache.org/viewvc?rev=1913865&view=rev
Log:
try to fix compile issues due to commons-compress upgrade

Modified:
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
    
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
    
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java?rev=1913865&r1=1913864&r2=1913865&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
 Thu Nov 16 22:15:24 2023
@@ -17,7 +17,7 @@
 
 package org.apache.poi.xssf.streaming;
 
-import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 
 import java.io.IOException;
@@ -36,9 +36,8 @@ class OpcZipArchiveOutputStream extends
         out.setLevel(level);
     }
 
-
     @Override
-    public void putArchiveEntry(ArchiveEntry archiveEntry) throws IOException {
+    public void putArchiveEntry(ZipArchiveEntry archiveEntry) throws 
IOException {
         out.putNextEntry(archiveEntry.getName());
     }
 

Modified: 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java?rev=1913865&r1=1913864&r2=1913865&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
 Thu Nov 16 22:15:24 2023
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Asse
 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.commons.io.output.NullOutputStream;
 import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
@@ -63,7 +63,7 @@ class TestZipPackagePropertiesMarshaller
     void ioException() {
         ZipArchiveOutputStream zos = new 
ZipArchiveOutputStream(UnsynchronizedByteArrayOutputStream.builder().get()) {
             @Override
-            public void putArchiveEntry(final ArchiveEntry archiveEntry) 
throws IOException {
+            public void putArchiveEntry(final ZipArchiveEntry archiveEntry) 
throws IOException {
                 throw new IOException("TestException");
             }
         };

Modified: 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1913865&r1=1913864&r2=1913865&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
 Thu Nov 16 22:15:24 2023
@@ -17,7 +17,6 @@
 
 package org.apache.poi.xssf.usermodel;
 
-import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -1480,13 +1479,13 @@ public final class TestXSSFWorkbook exte
             try (ZipArchiveOutputStream zos = new 
ZipArchiveOutputStream(tempFile)) {
                 File f1 = getSampleFile("github-321.xlsx");
                 File f2 = getSampleFile("48495.xlsx");
-                ArchiveEntry e1 = zos.createArchiveEntry(f1, 
"github-321.xlsx");
+                ZipArchiveEntry e1 = zos.createArchiveEntry(f1, 
"github-321.xlsx");
                 zos.putArchiveEntry(e1);
                 try (InputStream s = Files.newInputStream(f1.toPath())) {
                     IOUtils.copy(s, zos);
                 }
                 zos.closeArchiveEntry();
-                ArchiveEntry e2 = zos.createArchiveEntry(f2, "48495.xlsx");
+                ZipArchiveEntry e2 = zos.createArchiveEntry(f2, "48495.xlsx");
                 zos.putArchiveEntry(e2);
                 try (InputStream s = Files.newInputStream(f2.toPath())) {
                     IOUtils.copy(s, zos);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org