diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index f0c40534cc..74331a522f 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -665,7 +665,7 @@ public final class FilePath implements Serializable { private static final long serialVersionUID = 1L; }); } finally { - IOUtils.closeQuietly(_in); + org.apache.commons.io.IOUtils.closeQuietly(_in); } } @@ -815,7 +815,7 @@ public final class FilePath implements Serializable { public void copyFrom(InputStream in) throws IOException, InterruptedException { OutputStream os = write(); try { - IOUtils.copy(in, os); + org.apache.commons.io.IOUtils.copy(in, os); } finally { os.close(); } @@ -846,7 +846,7 @@ public final class FilePath implements Serializable { InputStream i = file.getInputStream(); OutputStream o = write(); try { - IOUtils.copy(i,o); + org.apache.commons.io.IOUtils.copy(i,o); } finally { try { o.close(); @@ -1640,8 +1640,8 @@ public final class FilePath implements Serializable { Util.copyStream(fis,p.getOut()); return null; } finally { - IOUtils.closeQuietly(fis); - IOUtils.closeQuietly(p.getOut()); + org.apache.commons.io.IOUtils.closeQuietly(fis); + org.apache.commons.io.IOUtils.closeQuietly(p.getOut()); } } }); @@ -1655,7 +1655,7 @@ public final class FilePath implements Serializable { public String readToString() throws IOException { InputStream in = read(); try { - return IOUtils.toString(in); + return org.apache.commons.io.IOUtils.toString(in); } finally { in.close(); } @@ -1815,8 +1815,8 @@ public final class FilePath implements Serializable { Util.copyStream(fis,out); return null; } finally { - IOUtils.closeQuietly(fis); - IOUtils.closeQuietly(out); + org.apache.commons.io.IOUtils.closeQuietly(fis); + org.apache.commons.io.IOUtils.closeQuietly(out); } } }); diff --git a/core/src/main/java/hudson/cli/ConsoleCommand.java b/core/src/main/java/hudson/cli/ConsoleCommand.java index 2f95da4fe2..6064cfd6ea 100644 --- a/core/src/main/java/hudson/cli/ConsoleCommand.java +++ b/core/src/main/java/hudson/cli/ConsoleCommand.java @@ -77,7 +77,7 @@ public class ConsoleCommand extends CLICommand { } else { InputStream in = run.getLogInputStream(); IOUtils.skip(in,pos); - IOUtils.copy(new InputStreamReader(in,run.getCharset()),w); + org.apache.commons.io.IOUtils.copy(new InputStreamReader(in,run.getCharset()),w); } } finally { w.flush(); // this pointless flush needed to work around SSHD-154 @@ -134,7 +134,7 @@ public class ConsoleCommand extends CLICommand { return rb.get(); } finally { - IOUtils.closeQuietly(in); + org.apache.commons.io.IOUtils.closeQuietly(in); } } diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index a349139bdf..efb3025359 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -29,7 +29,6 @@ import hudson.ExtensionPoint; import hudson.ProxyConfiguration; import hudson.util.FormValidation; import hudson.util.FormValidation.Kind; -import hudson.util.IOUtils; import hudson.util.QuotedStringTokenizer; import hudson.util.TextFile; import static hudson.util.TimeUnit2.DAYS; @@ -44,6 +43,7 @@ import jenkins.model.Jenkins; import jenkins.util.JSONSignatureValidator; import net.sf.json.JSONException; import net.sf.json.JSONObject; +import org.apache.commons.io.IOUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index eba2db0ee3..60ddd94452 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -32,7 +32,6 @@ import hudson.model.UpdateCenter.UpdateCenterJob; import hudson.util.FormValidation; import hudson.util.FormValidation.Kind; import hudson.util.HttpResponses; -import hudson.util.IOUtils; import hudson.util.TextFile; import static hudson.util.TimeUnit2.*; import hudson.util.VersionNumber; @@ -60,6 +59,7 @@ import jenkins.security.DownloadSettings; import jenkins.util.JSONSignatureValidator; import net.sf.json.JSONException; import net.sf.json.JSONObject; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 8b60a71b73..80b4fee51c 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -24,7 +24,6 @@ package hudson.slaves; import hudson.model.*; -import hudson.util.IOUtils; import hudson.util.io.ReopenableRotatingFileOutputStream; import jenkins.model.Jenkins.MasterComputer; import hudson.remoting.Channel; @@ -82,6 +81,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponseWrapper; import org.acegisecurity.context.SecurityContext; import org.acegisecurity.context.SecurityContextHolder; +import org.apache.commons.io.IOUtils; import org.kohsuke.stapler.ResponseImpl; import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.compression.FilterServletOutputStream; diff --git a/core/src/main/java/hudson/util/TextFile.java b/core/src/main/java/hudson/util/TextFile.java index f010f12e1a..9af7976ee1 100644 --- a/core/src/main/java/hudson/util/TextFile.java +++ b/core/src/main/java/hudson/util/TextFile.java @@ -108,7 +108,7 @@ public class TextFile { return new String(buf,0,read); } finally { - IOUtils.closeQuietly(r); + org.apache.commons.io.IOUtils.closeQuietly(r); } } diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java index 00ddebc782..00c8af5d06 100644 --- a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java +++ b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java @@ -5,7 +5,6 @@ import hudson.Extension; import hudson.Functions; import hudson.Util; import hudson.model.AdministrativeMonitor; -import hudson.util.IOUtils; import hudson.util.jna.Kernel32Utils; import jenkins.model.Jenkins; import org.apache.tools.ant.DirectoryScanner; @@ -24,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.io.IOUtils; /** * Finds crash dump reports and show them in the UI. diff --git a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java index 4a4667de6d..88eb84fc1c 100644 --- a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java +++ b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java @@ -2,7 +2,6 @@ package jenkins.security; import hudson.FilePath; import hudson.Util; -import hudson.util.IOUtils; import hudson.util.Secret; import hudson.util.TextFile; import jenkins.model.Jenkins; @@ -17,6 +16,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.security.GeneralSecurityException; import java.security.SecureRandom; +import org.apache.commons.io.IOUtils; /** * Default portable implementation of {@link ConfidentialStore} that uses diff --git a/core/src/main/resources/META-INF/upgrade/IOUtils.hint b/core/src/main/resources/META-INF/upgrade/IOUtils.hint index b088ed1dde..bfbaf27a94 100644 --- a/core/src/main/resources/META-INF/upgrade/IOUtils.hint +++ b/core/src/main/resources/META-INF/upgrade/IOUtils.hint @@ -1,25 +1,25 @@ -hudson.util.IOUtils.DIR_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.DIR_SEPARATOR_UNIX; -hudson.util.IOUtils.DIR_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.DIR_SEPARATOR_WINDOWS; -hudson.util.IOUtils.DIR_SEPARATOR => org.apache.commons.io.IOUtils.DIR_SEPARATOR; -hudson.util.IOUtils.LINE_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.LINE_SEPARATOR_UNIX; -hudson.util.IOUtils.LINE_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.LINE_SEPARATOR_WINDOWS; -hudson.util.IOUtils.LINE_SEPARATOR => org.apache.commons.io.IOUtils.LINE_SEPARATOR; -hudson.util.IOUtils.closeQuietly($args$) => org.apache.commons.io.IOUtils.closeQuietly($args$); -hudson.util.IOUtils.toByteArray($args$) => org.apache.commons.io.IOUtils.toByteArray($args$); -hudson.util.IOUtils.toCharArray($args$) => org.apache.commons.io.IOUtils.toCharArray($args$); -hudson.util.IOUtils.toString($args$) => org.apache.commons.io.IOUtils.toString($args$); -hudson.util.IOUtils.readLines($args$) => org.apache.commons.io.IOUtils.readLines($args$); -hudson.util.IOUtils.lineIterator($args$) => org.apache.commons.io.IOUtils.lineIterator($args$); -hudson.util.IOUtils.toInputStream($args$) => org.apache.commons.io.IOUtils.toInputStream($args$); -hudson.util.IOUtils.write($args$) => org.apache.commons.io.IOUtils.write($args$); -hudson.util.IOUtils.writeLines($args$) => org.apache.commons.io.IOUtils.writeLines($args$); +hudson.util.IOUtils.DIR_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.DIR_SEPARATOR_UNIX;; +hudson.util.IOUtils.DIR_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.DIR_SEPARATOR_WINDOWS;; +hudson.util.IOUtils.DIR_SEPARATOR => org.apache.commons.io.IOUtils.DIR_SEPARATOR;; +hudson.util.IOUtils.LINE_SEPARATOR_UNIX => org.apache.commons.io.IOUtils.LINE_SEPARATOR_UNIX;; +hudson.util.IOUtils.LINE_SEPARATOR_WINDOWS => org.apache.commons.io.IOUtils.LINE_SEPARATOR_WINDOWS;; +hudson.util.IOUtils.LINE_SEPARATOR => org.apache.commons.io.IOUtils.LINE_SEPARATOR;; +hudson.util.IOUtils.closeQuietly($args$) => org.apache.commons.io.IOUtils.closeQuietly($args$);; +hudson.util.IOUtils.toByteArray($args$) => org.apache.commons.io.IOUtils.toByteArray($args$);; +hudson.util.IOUtils.toCharArray($args$) => org.apache.commons.io.IOUtils.toCharArray($args$);; +hudson.util.IOUtils.toString($args$) => org.apache.commons.io.IOUtils.toString($args$);; +hudson.util.IOUtils.readLines($args$) => org.apache.commons.io.IOUtils.readLines($args$);; +hudson.util.IOUtils.lineIterator($args$) => org.apache.commons.io.IOUtils.lineIterator($args$);; +hudson.util.IOUtils.toInputStream($args$) => org.apache.commons.io.IOUtils.toInputStream($args$);; +hudson.util.IOUtils.write($args$) => org.apache.commons.io.IOUtils.write($args$);; +hudson.util.IOUtils.writeLines($args$) => org.apache.commons.io.IOUtils.writeLines($args$);; // Cannot use $args$ wildcard for copy since there are two non-deprecated overloads: -hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.InputStream && $output instanceof java.io.OutputStream => org.apache.commons.io.IOUtils.copy($input, $output); -hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.InputStream && $output instanceof java.io.Writer => org.apache.commons.io.IOUtils.copy($input, $output); -hudson.util.IOUtils.copy($input, $output, $encoding) :: $input instanceof java.io.InputStream && $output instanceof java.io.Writer && $encoding instanceof java.lang.String => org.apache.commons.io.IOUtils.copy($input, $output, $encoding); -hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.Reader && $output instanceof java.io.Writer => org.apache.commons.io.IOUtils.copy($input, $output); -hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.Reader && $output instanceof java.io.OutputStream => org.apache.commons.io.IOUtils.copy($input, $output); -hudson.util.IOUtils.copy($input, $output, $encoding) :: $input instanceof java.io.Reader && $output instanceof java.io.OutputStream && $encoding instanceof java.lang.String => org.apache.commons.io.IOUtils.copy($input, $output, $encoding); -hudson.util.IOUtils.copyLarge($args$) => org.apache.commons.io.IOUtils.copyLarge($args$); -hudson.util.IOUtils.contentEquals($args$) => org.apache.commons.io.IOUtils.contentEquals($args$); +hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.InputStream && $output instanceof java.io.OutputStream => org.apache.commons.io.IOUtils.copy($input, $output);; +hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.InputStream && $output instanceof java.io.Writer => org.apache.commons.io.IOUtils.copy($input, $output);; +hudson.util.IOUtils.copy($input, $output, $encoding) :: $input instanceof java.io.InputStream && $output instanceof java.io.Writer && $encoding instanceof java.lang.String => org.apache.commons.io.IOUtils.copy($input, $output, $encoding);; +hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.Reader && $output instanceof java.io.Writer => org.apache.commons.io.IOUtils.copy($input, $output);; +hudson.util.IOUtils.copy($input, $output) :: $input instanceof java.io.Reader && $output instanceof java.io.OutputStream => org.apache.commons.io.IOUtils.copy($input, $output);; +hudson.util.IOUtils.copy($input, $output, $encoding) :: $input instanceof java.io.Reader && $output instanceof java.io.OutputStream && $encoding instanceof java.lang.String => org.apache.commons.io.IOUtils.copy($input, $output, $encoding);; +hudson.util.IOUtils.copyLarge($args$) => org.apache.commons.io.IOUtils.copyLarge($args$);; +hudson.util.IOUtils.contentEquals($args$) => org.apache.commons.io.IOUtils.contentEquals($args$);; diff --git a/core/src/test/java/jenkins/RemotingJarSignatureTest.java b/core/src/test/java/jenkins/RemotingJarSignatureTest.java index 091d9a8831..b64b8d278f 100644 --- a/core/src/test/java/jenkins/RemotingJarSignatureTest.java +++ b/core/src/test/java/jenkins/RemotingJarSignatureTest.java @@ -2,7 +2,6 @@ package jenkins; import hudson.remoting.Channel; import hudson.remoting.Which; -import hudson.util.IOUtils; import org.apache.commons.io.output.NullOutputStream; import org.junit.Assert; import org.junit.Test; @@ -11,6 +10,7 @@ import java.io.File; import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import org.apache.commons.io.IOUtils; /** * @author Kohsuke Kawaguchi