Skip to content

Commit a18de54

Browse files
Bump parent POM from 1.91 to 1.92 (jenkinsci#7422)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 43a4daf commit a18de54

File tree

5 files changed

+6
-45
lines changed

5 files changed

+6
-45
lines changed

cli/src/main/java/hudson/cli/CLI.java

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
/**
7272
* CLI entry point to Jenkins.
7373
*/
74+
@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS", justification = "We don't care about this behavior")
7475
public class CLI {
7576

7677
private CLI() {}

cli/src/main/java/hudson/cli/DiagnosedStreamCorruptionException.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package hudson.cli;
22

3+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
34
import java.io.PrintWriter;
45
import java.io.StreamCorruptedException;
56
import java.io.StringWriter;
@@ -36,6 +37,7 @@ public byte[] getReadAhead() {
3637
}
3738

3839
@Override
40+
@SuppressFBWarnings(value = "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE", justification = "Jenkins handles this issue differently or doesn't care about it")
3941
public String toString() {
4042
StringBuilder buf = new StringBuilder();
4143
buf.append(super.toString()).append("\n");

core/src/main/java/hudson/model/Descriptor.java

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import edu.umd.cs.findbugs.annotations.CheckForNull;
3131
import edu.umd.cs.findbugs.annotations.NonNull;
3232
import edu.umd.cs.findbugs.annotations.Nullable;
33+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3334
import hudson.BulkChange;
3435
import hudson.DescriptorExtensionList;
3536
import hudson.ExtensionList;
@@ -755,6 +756,7 @@ public String getHelpFile(final String fieldName) {
755756
return getHelpFile(getKlass(), fieldName);
756757
}
757758

759+
@SuppressFBWarnings(value = "SBSC_USE_STRINGBUFFER_CONCATENATION", justification = "no big deal")
758760
public String getHelpFile(Klass<?> clazz, String fieldName) {
759761
HelpRedirect r = helpRedirect.get(fieldName);
760762
if (r != null) return r.resolve();

src/spotbugs/excludesFilter.xml core/src/spotbugs/excludesFilter.xml

-44
Original file line numberDiff line numberDiff line change
@@ -353,45 +353,6 @@
353353
<Bug pattern="THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION"/>
354354
<Or>
355355
<Class name="hudson.ClassicPluginStrategy"/>
356-
<Class name="hudson.cli.AbstractBuildRangeCommand"/>
357-
<Class name="hudson.cli.AddJobToViewCommand"/>
358-
<Class name="hudson.cli.BuildCommand"/>
359-
<Class name="hudson.cli.CancelQuietDownCommand"/>
360-
<Class name="hudson.cli.ClearQueueCommand"/>
361-
<Class name="hudson.cli.CLI"/>
362-
<Class name="hudson.cli.CLICommand"/>
363-
<Class name="hudson.cli.ConnectNodeCommand"/>
364-
<Class name="hudson.cli.ConsoleCommand"/>
365-
<Class name="hudson.cli.CopyJobCommand"/>
366-
<Class name="hudson.cli.CreateJobCommand"/>
367-
<Class name="hudson.cli.CreateNodeCommand"/>
368-
<Class name="hudson.cli.CreateViewCommand"/>
369-
<Class name="hudson.cli.declarative.MethodBinder"/>
370-
<Class name="hudson.cli.DeleteJobCommand"/>
371-
<Class name="hudson.cli.DeleteNodeCommand"/>
372-
<Class name="hudson.cli.DeleteViewCommand"/>
373-
<Class name="hudson.cli.DisablePluginCommand"/>
374-
<Class name="hudson.cli.DisconnectNodeCommand"/>
375-
<Class name="hudson.cli.EnablePluginCommand"/>
376-
<Class name="hudson.cli.GetJobCommand"/>
377-
<Class name="hudson.cli.GetViewCommand"/>
378-
<Class name="hudson.cli.GroovyCommand"/>
379-
<Class name="hudson.cli.HelpCommand"/>
380-
<Class name="hudson.cli.InstallPluginCommand"/>
381-
<Class name="hudson.cli.ListJobsCommand"/>
382-
<Class name="hudson.cli.OfflineNodeCommand"/>
383-
<Class name="hudson.cli.OnlineNodeCommand"/>
384-
<Class name="hudson.cli.QuietDownCommand"/>
385-
<Class name="hudson.cli.ReloadConfigurationCommand"/>
386-
<Class name="hudson.cli.ReloadJobCommand"/>
387-
<Class name="hudson.cli.RemoveJobFromViewCommand"/>
388-
<Class name="hudson.cli.RunRangeCommand"/>
389-
<Class name="hudson.cli.SetBuildDescriptionCommand"/>
390-
<Class name="hudson.cli.SetBuildDisplayNameCommand"/>
391-
<Class name="hudson.cli.UpdateJobCommand"/>
392-
<Class name="hudson.cli.UpdateViewCommand"/>
393-
<Class name="hudson.cli.WaitNodeOfflineCommand"/>
394-
<Class name="hudson.cli.WaitNodeOnlineCommand"/>
395356
<Class name="hudson.Functions"/>
396357
<Class name="hudson.logging.LogRecorderManager"/>
397358
<Class name="hudson.Main"/>
@@ -417,7 +378,6 @@
417378
<Class name="hudson.util.Retrier"/>
418379
<Class name="jenkins.agents.WebSocketAgents$Session"/>
419380
<Class name="jenkins.ClassLoaderReflectionToolkit"/>
420-
<Class name="jenkins.cli.StopBuildsCommand"/>
421381
<Class name="jenkins.management.AsynchronousAdministrativeMonitor"/>
422382
<Class name="jenkins.model.ModelObjectWithChildren"/>
423383
<Class name="jenkins.model.ModelObjectWithContextMenu"/>
@@ -504,10 +464,6 @@
504464
<And>
505465
<Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
506466
<Or>
507-
<Class name="hudson.cli.CLICommand"/>
508-
<Class name="hudson.cli.GroovyshCommand"/>
509-
<Class name="hudson.cli.ListChangesCommand"/>
510-
<Class name="hudson.cli.ReloadConfigurationCommand"/>
511467
<Class name="hudson.ExtensionFinder$GuiceFinder$SezpozModule"/>
512468
<Class name="hudson.lifecycle.Lifecycle"/>
513469
<Class name="hudson.model.queue.Executables"/>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828
<parent>
2929
<groupId>org.jenkins-ci</groupId>
3030
<artifactId>jenkins</artifactId>
31-
<version>1.91</version>
31+
<version>1.92</version>
3232
<relativePath />
3333
</parent>
3434

0 commit comments

Comments
 (0)