From 77f024ae6bf6ac9e26b71d93e6ca2eeda5ebfdc1 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 16 Jun 2023 00:43:50 -0700 Subject: [PATCH] Remove usages of `org.apache.commons.io.output.ByteArrayOutputStream` (#8146) --- core/src/main/java/hudson/console/AnnotatedLargeText.java | 2 +- core/src/main/java/hudson/console/ConsoleNote.java | 2 +- .../main/java/hudson/lifecycle/WindowsInstallerLink.java | 2 +- .../main/java/hudson/lifecycle/WindowsServiceLifecycle.java | 2 +- core/src/main/java/hudson/model/UsageStatistics.java | 2 +- core/src/main/java/hudson/util/HeadBufferingStream.java | 2 +- core/src/spotbugs/excludesFilter.xml | 6 +++++- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index e074044e80..8e0a59bee2 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -34,6 +34,7 @@ import edu.umd.cs.findbugs.annotations.CheckReturnValue; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.remoting.ObjectInputStreamEx; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; @@ -49,7 +50,6 @@ import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; import jenkins.model.Jenkins; import jenkins.security.CryptoConfidentialKey; -import org.apache.commons.io.output.ByteArrayOutputStream; import org.jenkinsci.remoting.util.AnonymousClassWarnings; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java index 559424d26c..20ded06e98 100644 --- a/core/src/main/java/hudson/console/ConsoleNote.java +++ b/core/src/main/java/hudson/console/ConsoleNote.java @@ -35,6 +35,7 @@ import hudson.model.Run; import hudson.remoting.ClassFilter; import hudson.remoting.ObjectInputStreamEx; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -54,7 +55,6 @@ import jenkins.security.HMACConfidentialKey; import jenkins.util.JenkinsJVM; import jenkins.util.SystemProperties; import org.apache.commons.io.IOUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.tools.ant.BuildListener; import org.jenkinsci.remoting.util.AnonymousClassWarnings; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java index acfa1c7867..875a3e4ef7 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java +++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java @@ -35,6 +35,7 @@ import hudson.model.ManagementLink; import hudson.model.TaskListener; import hudson.util.StreamTaskListener; import hudson.util.jna.DotNet; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.net.URL; @@ -46,7 +47,6 @@ import javax.servlet.ServletException; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.tools.ant.DefaultLogger; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Move; diff --git a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java index 961cf1358b..2cf936679a 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java @@ -32,6 +32,7 @@ import hudson.Launcher.LocalLauncher; import hudson.Util; import hudson.util.StreamTaskListener; import hudson.util.jna.Kernel32; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -43,7 +44,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; /** * {@link Lifecycle} for Hudson installed as Windows service. diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java index 0a13c0983b..cbc356aa3b 100644 --- a/core/src/main/java/hudson/model/UsageStatistics.java +++ b/core/src/main/java/hudson/model/UsageStatistics.java @@ -35,6 +35,7 @@ import hudson.Util; import hudson.node_monitors.ArchitectureMonitor; import hudson.security.Permission; import hudson.util.Secret; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.FilterInputStream; import java.io.FilterOutputStream; @@ -65,7 +66,6 @@ import javax.crypto.spec.SecretKeySpec; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import net.sf.json.JSONObject; -import org.apache.commons.io.output.ByteArrayOutputStream; import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/hudson/util/HeadBufferingStream.java b/core/src/main/java/hudson/util/HeadBufferingStream.java index e5a2de574e..491ef6e56b 100644 --- a/core/src/main/java/hudson/util/HeadBufferingStream.java +++ b/core/src/main/java/hudson/util/HeadBufferingStream.java @@ -24,10 +24,10 @@ package hudson.util; +import java.io.ByteArrayOutputStream; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.io.output.ByteArrayOutputStream; /** * {@link FilterInputStream} that buffers the first N bytes to a byte array on the side. diff --git a/core/src/spotbugs/excludesFilter.xml b/core/src/spotbugs/excludesFilter.xml index 3f10eb5fc0..af99fff505 100644 --- a/core/src/spotbugs/excludesFilter.xml +++ b/core/src/spotbugs/excludesFilter.xml @@ -64,7 +64,11 @@ - + + + + +