From b8dd52c5d5e6ced5fd5968447995645e1a392200 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jul 2025 04:49:19 +0000 Subject: [PATCH 1/2] Bump org.jvnet.hudson.plugins:analysis-pom from 10.11.0 to 10.14.0 Bumps [org.jvnet.hudson.plugins:analysis-pom](https://github.com/jenkinsci/analysis-pom-plugin) from 10.11.0 to 10.14.0. - [Release notes](https://github.com/jenkinsci/analysis-pom-plugin/releases) - [Changelog](https://github.com/jenkinsci/analysis-pom-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/analysis-pom-plugin/compare/v10.11.0...v10.14.0) --- updated-dependencies: - dependency-name: org.jvnet.hudson.plugins:analysis-pom dependency-version: 10.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc2bfbc5..cf6bb1f3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.plugins analysis-pom - 10.11.0 + 10.14.0 From 23905922f9eacb5307cbc8dd87a24f3f505dda3d Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 7 Jul 2025 09:55:29 +0200 Subject: [PATCH 2/2] Removed unused PMD suppressions --- pom.xml | 4 +-- .../plugins/util/GlobalConfigurationItem.java | 2 -- .../jenkins/plugins/util/JenkinsFacade.java | 15 +++++------ .../io/jenkins/plugins/util/LogHandler.java | 5 ++-- .../plugins/util/FormValidationAssert.java | 6 ++--- .../jenkins/plugins/util/IntegrationTest.java | 26 +++++++++---------- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index cf6bb1f3..0bed1c50 100644 --- a/pom.xml +++ b/pom.xml @@ -291,8 +291,8 @@ true true - java.class.nonPublicPartOfAPI - (one.util.streamex.Joining.*|j2html.utils.JSMin.*) + java.* + (one.util.*|j2html.utils.JSMin.*) These libraries are part of the API diff --git a/src/main/java/io/jenkins/plugins/util/GlobalConfigurationItem.java b/src/main/java/io/jenkins/plugins/util/GlobalConfigurationItem.java index 9a3c34cd..a15c43b3 100644 --- a/src/main/java/io/jenkins/plugins/util/GlobalConfigurationItem.java +++ b/src/main/java/io/jenkins/plugins/util/GlobalConfigurationItem.java @@ -15,9 +15,7 @@ */ @SuppressFBWarnings("IS2_INCONSISTENT_SYNC") public class GlobalConfigurationItem extends GlobalConfiguration { - @SuppressWarnings("PMD.DoNotUseThreads") private transient Runnable actualSave; - @SuppressWarnings("PMD.DoNotUseThreads") private transient Runnable actualLoad; /** diff --git a/src/main/java/io/jenkins/plugins/util/JenkinsFacade.java b/src/main/java/io/jenkins/plugins/util/JenkinsFacade.java index f91cf62c..2cc6d512 100644 --- a/src/main/java/io/jenkins/plugins/util/JenkinsFacade.java +++ b/src/main/java/io/jenkins/plugins/util/JenkinsFacade.java @@ -1,12 +1,5 @@ package io.jenkins.plugins.util; -import java.io.Serial; -import java.io.Serializable; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.commons.lang3.StringUtils; import org.jenkins.ui.symbol.Symbol; import org.jenkins.ui.symbol.SymbolRequest; @@ -14,6 +7,13 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.io.Serial; +import java.io.Serializable; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest2; import hudson.DescriptorExtensionList; @@ -36,7 +36,6 @@ * * @author Ullrich Hafner */ -@SuppressWarnings("PMD.ExcessiveImports") public class JenkinsFacade implements Serializable { @Serial private static final long serialVersionUID = 1904631270145841113L; diff --git a/src/main/java/io/jenkins/plugins/util/LogHandler.java b/src/main/java/io/jenkins/plugins/util/LogHandler.java index 7014f157..9005c3b1 100644 --- a/src/main/java/io/jenkins/plugins/util/LogHandler.java +++ b/src/main/java/io/jenkins/plugins/util/LogHandler.java @@ -1,11 +1,11 @@ package io.jenkins.plugins.util; -import java.util.List; - import com.google.errorprone.annotations.FormatMethod; import edu.hm.hafner.util.FilteredLog; +import java.util.List; + import hudson.model.TaskListener; /** @@ -13,7 +13,6 @@ * * @author Ullrich Hafner */ -@SuppressWarnings("PMD.LoggerIsNotStaticFinal") public class LogHandler { private final PluginLogger errorLogger; private final PluginLogger infoLogger; diff --git a/src/test/java/io/jenkins/plugins/util/FormValidationAssert.java b/src/test/java/io/jenkins/plugins/util/FormValidationAssert.java index 79e64e70..03022fb9 100644 --- a/src/test/java/io/jenkins/plugins/util/FormValidationAssert.java +++ b/src/test/java/io/jenkins/plugins/util/FormValidationAssert.java @@ -1,11 +1,11 @@ package io.jenkins.plugins.util; -import java.util.Objects; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.assertj.core.api.AbstractAssert; +import java.util.Objects; + import hudson.util.FormValidation; import hudson.util.FormValidation.Kind; @@ -14,7 +14,7 @@ * * @author Ullrich Hafner */ -@SuppressWarnings({"NonBooleanMethodNameMayNotStartWithQuestion", "PMD.LinguisticNaming"}) +@SuppressWarnings("NonBooleanMethodNameMayNotStartWithQuestion") public class FormValidationAssert extends AbstractAssert { private static final String EXPECTED_BUT_WAS_MESSAGE = "%nExpecting %s of:%n <%s>%nto be:%n <%s>%nbut was:%n <%s>."; diff --git a/src/test/java/io/jenkins/plugins/util/IntegrationTest.java b/src/test/java/io/jenkins/plugins/util/IntegrationTest.java index bedad98b..e76813a7 100644 --- a/src/test/java/io/jenkins/plugins/util/IntegrationTest.java +++ b/src/test/java/io/jenkins/plugins/util/IntegrationTest.java @@ -1,17 +1,5 @@ package io.jenkins.plugins.util; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.Collections; -import java.util.Objects; -import java.util.function.Function; - import org.junit.jupiter.api.Tag; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.JSONWebResponse; @@ -28,6 +16,18 @@ import edu.hm.hafner.util.PathUtil; import edu.hm.hafner.util.ResourceTest; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.Objects; +import java.util.function.Function; + import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.flow.FlowDefinition; import org.jenkinsci.plugins.workflow.job.WorkflowJob; @@ -62,7 +62,7 @@ * @author Ullrich Hafner */ @Tag("IntegrationTest") -@SuppressWarnings({"ClassDataAbstractionCoupling", "ClassFanOutComplexity", "SameParameterValue", "PMD.SystemPrintln", "PMD.GodClass", "PMD.ExcessiveClassLength", "PMD.ExcessiveImports", "PMD.CouplingBetweenObjects", "PMD.CyclomaticComplexity", "unused"}) +@SuppressWarnings({"ClassDataAbstractionCoupling", "ClassFanOutComplexity", "SameParameterValue", "PMD.SystemPrintln", "PMD.CouplingBetweenObjects", "PMD.CyclomaticComplexity", "unused"}) public abstract class IntegrationTest extends ResourceTest { private static final Charset UTF_8 = StandardCharsets.UTF_8;