Use Java 7 versions of GZIPInputStream and GZIPOutputStream (#203)

jenkinsci · May 25, 2024 · 48cc46e · 48cc46e
1 parent 3605a77
commit 48cc46e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -16,11 +16,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jzlib</artifactId>
-      <version>1.1.3-kohsuke-1</version>
-    </dependency>
     <!-- optional REST support -->
     <dependency>
       <groupId>com.sun.xml.txw2</groupId>

diff --git a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java
@@ -23,7 +23,6 @@
 
 package org.kohsuke.stapler;
 
-import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayOutputStream;
@@ -40,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.zip.GZIPOutputStream;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;

diff --git a/core/src/main/java/org/kohsuke/stapler/Stapler.java b/core/src/main/java/org/kohsuke/stapler/Stapler.java
@@ -927,7 +927,7 @@ public static boolean isSocketException(Throwable x) { // JENKINS-10524
             return true;
         }
         if (x instanceof IOException
-                && "finished".equals(x.getMessage())) { // com.jcraft.jzlib.DeflaterOutputStream.write
+                && "write beyond end of stream".equals(x.getMessage())) { // java.util.zip.DeflaterOutputStream.write
             return true;
         }
         return isSocketException(x.getCause());

diff --git a/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java b/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler.compression;
 
-import com.jcraft.jzlib.GZIPOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.util.zip.GZIPOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;

diff --git a/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java b/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java
@@ -25,7 +25,6 @@
 
 package org.kohsuke.stapler.framework.io;
 
-import com.jcraft.jzlib.GZIPInputStream;
 import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.EOFException;
@@ -40,6 +39,7 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
+import java.util.zip.GZIPInputStream;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.output.CountingOutputStream;
 import org.kohsuke.stapler.StaplerRequest;