From 4a5def55d21a33026d3964f5902a9b7e6bf19fff Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 15 Jan 2024 13:14:04 -0700 Subject: [PATCH 1/3] Suppress warnings for spotbugs 4.8.3 https://github.com/jenkinsci/plugin-pom/pull/869 or a subsequent pull request that updates to 4.8.3 will need this change in the plugin to resolve new spotbugs warnings that will be reported by spotbugs 4.8.2 and later. Plugin pom 4.77 is likely to include that new version of spotbugs. --- .../plugins/workflow/support/actions/LogStorageAction.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java index 77703499..3467f158 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java @@ -24,6 +24,7 @@ package org.jenkinsci.plugins.workflow.support.actions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.console.AnnotatedLargeText; import hudson.model.TaskListener; import java.io.IOException; @@ -47,6 +48,7 @@ @Restricted(NoExternalUse.class) // for use from DefaultStepContext only public class LogStorageAction extends LogAction implements FlowNodeAction, PersistentAction { + @SuppressFBWarnings(value="PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification="Retain API compatibility.") public transient FlowNode node; private LogStorageAction(FlowNode node) { From 92af117dd89f9734f57ce00f1c0e16a59d35f285 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 16 Jan 2024 12:55:49 -0700 Subject: [PATCH 2/3] Change justification into a TODO Co-authored-by: Jesse Glick --- .../plugins/workflow/support/actions/LogStorageAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java index 3467f158..5944a4de 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogStorageAction.java @@ -48,7 +48,7 @@ @Restricted(NoExternalUse.class) // for use from DefaultStepContext only public class LogStorageAction extends LogAction implements FlowNodeAction, PersistentAction { - @SuppressFBWarnings(value="PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification="Retain API compatibility.") + @SuppressFBWarnings(value="PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification="TODO clean up") public transient FlowNode node; private LogStorageAction(FlowNode node) { From 6aa94caf707cf78caca796ec30888057835d4d65 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 16 Jan 2024 12:58:55 -0700 Subject: [PATCH 3/3] Use parent pomt 4.76 https://github.com/jenkinsci/plugin-pom/releases/tag/plugin-4.77 describes the changes in the 4.77 release of the parent pom. Those changes include: * https://github.com/jenkinsci/plugin-pom/pull/880 - test harness update * https://github.com/jenkinsci/plugin-pom/pull/884 - spotbugs plugin update Several other dependency updates are also included --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d724e592..03378d73 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.76 + 4.77 org.jenkins-ci.plugins.workflow