diff --git a/cli/pom.xml b/cli/pom.xml
index 4a8150f132537c74f2faf82c1497d3cc9acf1641..7628a16e94013cf85252248649be4c9649a77308 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
pom
org.jenkins-ci.main
- 1.513
+ 1.513.JENKINS-14362-jzlib
cli
diff --git a/core/pom.xml b/core/pom.xml
index 9bc3bf8525eb12069eb61e7ed37cbcdc8ef11e94..387384593974851dcccb08fa1b8aa1cf04fe2a6c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.513
+ 1.513.JENKINS-14362-jzlib
../pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
true
- 1.207
+ 1.207.JENKINS-14362-jzlib
2.5.6.SEC03
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 3dabd481081f2d263acb9551e41ea3b03bbd1828..225f42ed343c92a05cea2e6e25f94014213285e5 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -92,8 +92,8 @@ import java.util.regex.Pattern;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.util.zip.GZIPOutputStream;
-import java.util.zip.GZIPInputStream;
+import com.jcraft.jzlib.GZIPInputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
import com.sun.jna.Native;
import hudson.os.PosixException;
@@ -619,7 +619,7 @@ public final class FilePath implements Serializable {
public InputStream extract(InputStream _in) throws IOException {
HeadBufferingStream in = new HeadBufferingStream(_in,SIDE_BUFFER_SIZE);
try {
- return new GZIPInputStream(in,8192);
+ return new GZIPInputStream(in, 8192, true);
} catch (IOException e) {
// various people reported "java.io.IOException: Not in GZIP format" here, so diagnose this problem better
in.fillSide();
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 1fe28f84e87fec3fc049e08b65e73da6b2d4376c..298e034bf15ebf31a8f728b5c6bb9e7a6a82946b 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -51,8 +51,8 @@ import java.io.OutputStream;
import java.io.Writer;
import java.nio.charset.Charset;
import java.security.GeneralSecurityException;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+import com.jcraft.jzlib.GZIPInputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
import static java.lang.Math.abs;
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index 4660193f8cee75b0b6aaa8bf256035edac6acd99..c8ea004643309d73af2d5638bab3bf3f225d50d2 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -50,8 +50,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+import com.jcraft.jzlib.GZIPInputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
/**
* Data that hangs off from a console output.
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 502726382871953a8c216dfa12b9b34f6a22a5ee..e1d944f92bc0cb1b0f79faef915b9f60953021b6 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -91,7 +91,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
+import com.jcraft.jzlib.GZIPInputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index 34382a3f447f56779bd7d8845e129128acbec66c..2d153486704f6d04ff6cc09e3776044220e2c002 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -59,7 +59,7 @@ import java.security.interfaces.RSAPublicKey;
import java.security.spec.X509EncodedKeySpec;
import java.util.ArrayList;
import java.util.List;
-import java.util.zip.GZIPOutputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
/**
* @author Kohsuke Kawaguchi
diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
index 6a3c21efec6270101c2b487d4dab3c892fe0a4cf..f79037f4f77f5d26ebd08b67a7dd8c397074d643 100644
--- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
+++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
@@ -42,7 +42,6 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.URLEncoder;
import java.text.MessageFormat;
-import java.util.zip.GZIPOutputStream;
/**
* For anonymous requests to pages that require authentication,
diff --git a/core/src/main/java/hudson/util/CompressedFile.java b/core/src/main/java/hudson/util/CompressedFile.java
index ce5afe2cb9be2f32283ee0bb4c81e78b68f3bc9d..93c79a4d8c62b02ed927385e1d044f0bc061bd40 100644
--- a/core/src/main/java/hudson/util/CompressedFile.java
+++ b/core/src/main/java/hudson/util/CompressedFile.java
@@ -40,8 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+import com.jcraft.jzlib.GZIPInputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
/**
* Represents write-once read-many file that can be optiionally compressed
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 63e703b332bc26dc4a91777300495e87b5807f1c..6b49c05f7ad37f1a9ca975c2e7d449b03c069157 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.513
+ 1.513.JENKINS-14362-jzlib
maven-plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 09ec82b8cadeb2d398d09f3ee29e23b15cbbe04d..a28b25d780c033260c1d8429a0021c1939b72585 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -38,7 +38,7 @@
org.jenkins-ci.main
maven-plugin
- 1.513
+ 1.513.JENKINS-14362-jzlib
@@ -48,25 +48,25 @@
org.jenkins-ci.main
jenkins-war
war
- 1.513
+ 1.513.JENKINS-14362-jzlib
test
org.jenkins-ci.main
jenkins-core
- 1.513
+ 1.513.JENKINS-14362-jzlib
provided
org.jenkins-ci.main
jenkins-test-harness
- 1.513
+ 1.513.JENKINS-14362-jzlib
test
org.jenkins-ci.main
ui-samples-plugin
- 1.513
+ 1.513.JENKINS-14362-jzlib
test