mvn spotless apply

Author: nevingeorgesunny

src/main/java/com/cloudbees/jenkins/support/SupportAction.java

@@ -71,7 +71,6 @@
 import net.sf.json.JSON;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -373,7 +372,8 @@ public HttpRedirect doGenerateBundleAsync(StaplerRequest2 req, StaplerResponse2
                     throw new IOException("Failed to create directory: " + outputDir.toAbsolutePath(), e);
                 }
             }
-            try (FileOutputStream fileOutputStream = new FileOutputStream(new File(outputDir.toString(), SYNC_SUPPORT_BUNDLE))) {
+            try (FileOutputStream fileOutputStream =
+                    new FileOutputStream(new File(outputDir.toString(), SYNC_SUPPORT_BUNDLE))) {
                 SupportPlugin.setRequesterAuthentication(Jenkins.getAuthentication2());
                 try {
                     SupportPlugin.writeBundleForSyncComponents(fileOutputStream, syncComponent);
@@ -552,7 +552,8 @@ protected void compute() throws Exception {
                 }
             }
 
-            try (FileOutputStream fileOutputStream = new FileOutputStream(new File(outputDir.toString(), supportBundleName))) {
+            try (FileOutputStream fileOutputStream =
+                    new FileOutputStream(new File(outputDir.toString(), supportBundleName))) {
                 SupportPlugin.setRequesterAuthentication(Jenkins.getAuthentication2());
                 try {
                     SupportPlugin.writeBundle(fileOutputStream, components, this::progress, outputDir);

src/main/java/com/cloudbees/jenkins/support/SupportPlugin.java

@@ -379,13 +379,8 @@ public <T extends Component> void visit(Container container, T component) {
      * @param components a list of synchronous {@link Component} to include in the bundle
      * @throws IOException if an error occurs while generating the bundle.
      */
-<<<<<<< Updated upstream
-    public static void writeBundleForSyncComponents(
-            OutputStream outputStream, final List<? extends Component> components) throws IOException {
-=======
     static void writeBundleForSyncComponents(OutputStream outputStream, final List<? extends Component> components)
             throws IOException {
->>>>>>> Stashed changes
         writeBundle(
                 outputStream,
                 components,

src/test/java/com/cloudbees/jenkins/support/SupportActionTest.java

@@ -34,7 +34,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;