Adapt to jenkinsci/pom#350

jenkinsci · Nov 19, 2022 · d86f14a · d86f14a
1 parent 829a347
commit d86f14a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 44 deletions.
diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
@@ -71,6 +71,7 @@
 /**
  * CLI entry point to Jenkins.
  */
+@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS", justification = "We don't care about this behavior")
 public class CLI {
 
     private CLI() {}

diff --git a/cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java b/cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java
@@ -1,5 +1,6 @@
 package hudson.cli;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.PrintWriter;
 import java.io.StreamCorruptedException;
 import java.io.StringWriter;
@@ -36,6 +37,7 @@ public byte[] getReadAhead() {
     }
 
     @Override
+    @SuppressFBWarnings(value = "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE", justification = "Jenkins handles this issue differently or doesn't care about it")
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append(super.toString()).append("\n");

diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
@@ -30,6 +30,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.BulkChange;
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionList;
@@ -755,6 +756,7 @@ public String getHelpFile(final String fieldName) {
         return getHelpFile(getKlass(), fieldName);
     }
 
+    @SuppressFBWarnings(value = "SBSC_USE_STRINGBUFFER_CONCATENATION", justification = "no big deal")
     public String getHelpFile(Klass<?> clazz, String fieldName) {
         HelpRedirect r = helpRedirect.get(fieldName);
         if (r != null)    return r.resolve();

diff --git a/src/spotbugs/excludesFilter.xml → core/src/spotbugs/excludesFilter.xml b/src/spotbugs/excludesFilter.xml → core/src/spotbugs/excludesFilter.xml
@@ -353,45 +353,6 @@
         <Bug pattern="THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION"/>
         <Or>
           <Class name="hudson.ClassicPluginStrategy"/>
-          <Class name="hudson.cli.AbstractBuildRangeCommand"/>
-          <Class name="hudson.cli.AddJobToViewCommand"/>
-          <Class name="hudson.cli.BuildCommand"/>
-          <Class name="hudson.cli.CancelQuietDownCommand"/>
-          <Class name="hudson.cli.ClearQueueCommand"/>
-          <Class name="hudson.cli.CLI"/>
-          <Class name="hudson.cli.CLICommand"/>
-          <Class name="hudson.cli.ConnectNodeCommand"/>
-          <Class name="hudson.cli.ConsoleCommand"/>
-          <Class name="hudson.cli.CopyJobCommand"/>
-          <Class name="hudson.cli.CreateJobCommand"/>
-          <Class name="hudson.cli.CreateNodeCommand"/>
-          <Class name="hudson.cli.CreateViewCommand"/>
-          <Class name="hudson.cli.declarative.MethodBinder"/>
-          <Class name="hudson.cli.DeleteJobCommand"/>
-          <Class name="hudson.cli.DeleteNodeCommand"/>
-          <Class name="hudson.cli.DeleteViewCommand"/>
-          <Class name="hudson.cli.DisablePluginCommand"/>
-          <Class name="hudson.cli.DisconnectNodeCommand"/>
-          <Class name="hudson.cli.EnablePluginCommand"/>
-          <Class name="hudson.cli.GetJobCommand"/>
-          <Class name="hudson.cli.GetViewCommand"/>
-          <Class name="hudson.cli.GroovyCommand"/>
-          <Class name="hudson.cli.HelpCommand"/>
-          <Class name="hudson.cli.InstallPluginCommand"/>
-          <Class name="hudson.cli.ListJobsCommand"/>
-          <Class name="hudson.cli.OfflineNodeCommand"/>
-          <Class name="hudson.cli.OnlineNodeCommand"/>
-          <Class name="hudson.cli.QuietDownCommand"/>
-          <Class name="hudson.cli.ReloadConfigurationCommand"/>
-          <Class name="hudson.cli.ReloadJobCommand"/>
-          <Class name="hudson.cli.RemoveJobFromViewCommand"/>
-          <Class name="hudson.cli.RunRangeCommand"/>
-          <Class name="hudson.cli.SetBuildDescriptionCommand"/>
-          <Class name="hudson.cli.SetBuildDisplayNameCommand"/>
-          <Class name="hudson.cli.UpdateJobCommand"/>
-          <Class name="hudson.cli.UpdateViewCommand"/>
-          <Class name="hudson.cli.WaitNodeOfflineCommand"/>
-          <Class name="hudson.cli.WaitNodeOnlineCommand"/>
           <Class name="hudson.Functions"/>
           <Class name="hudson.logging.LogRecorderManager"/>
           <Class name="hudson.Main"/>
@@ -417,7 +378,6 @@
           <Class name="hudson.util.Retrier"/>
           <Class name="jenkins.agents.WebSocketAgents$Session"/>
           <Class name="jenkins.ClassLoaderReflectionToolkit"/>
-          <Class name="jenkins.cli.StopBuildsCommand"/>
           <Class name="jenkins.management.AsynchronousAdministrativeMonitor"/>
           <Class name="jenkins.model.ModelObjectWithChildren"/>
           <Class name="jenkins.model.ModelObjectWithContextMenu"/>
@@ -504,10 +464,6 @@
       <And>
         <Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
         <Or>
-          <Class name="hudson.cli.CLICommand"/>
-          <Class name="hudson.cli.GroovyshCommand"/>
-          <Class name="hudson.cli.ListChangesCommand"/>
-          <Class name="hudson.cli.ReloadConfigurationCommand"/>
           <Class name="hudson.ExtensionFinder$GuiceFinder$SezpozModule"/>
           <Class name="hudson.lifecycle.Lifecycle"/>
           <Class name="hudson.model.queue.Executables"/>