From 99704d4c265fb00e147b5fd08126fc4771766e2f Mon Sep 17 00:00:00 2001 From: Valentin Delaye Date: Tue, 5 Aug 2025 08:58:10 +0200 Subject: [PATCH] Remove usages of Commons Lang 2 --- .../main/java/org/sonar/plugins/abacus/chart/BarChart3D.java | 2 +- .../main/java/org/sonar/plugins/abacus/chart/PieChart3D.java | 2 +- .../test/java/com/sonar/it/jenkins/utility/JenkinsUtils.java | 2 +- src/main/java/hudson/plugins/sonar/MsBuildSQRunnerBegin.java | 2 +- src/main/java/hudson/plugins/sonar/MsBuildSQRunnerEnd.java | 2 +- src/main/java/hudson/plugins/sonar/SonarBuildWrapper.java | 2 +- .../java/hudson/plugins/sonar/SonarGlobalConfiguration.java | 4 ++-- src/main/java/hudson/plugins/sonar/SonarInstallation.java | 2 +- src/main/java/hudson/plugins/sonar/SonarPublisher.java | 2 +- src/main/java/hudson/plugins/sonar/SonarRunnerBuilder.java | 2 +- .../AbstractSonarPublisherSlicerSpec.java | 2 +- .../AbstractSonarRunnerBuilderSlicerSpec.java | 2 +- .../plugins/sonar/utils/ExtendedArgumentListBuilder.java | 2 +- .../hudson/plugins/sonar/utils/MaskPasswordsOutputStream.java | 2 +- src/main/java/hudson/plugins/sonar/utils/SonarMaven.java | 2 +- .../sonarsource/scanner/jenkins/pipeline/NetworkUtils.java | 2 +- .../scanner/jenkins/pipeline/WaitForQualityGateStepTest.java | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/BarChart3D.java b/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/BarChart3D.java index bdfe575ec..c54f98cd6 100644 --- a/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/BarChart3D.java +++ b/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/BarChart3D.java @@ -22,7 +22,7 @@ */ package org.sonar.plugins.abacus.chart; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jfree.chart.axis.CategoryAxis3D; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.NumberAxis3D; diff --git a/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/PieChart3D.java b/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/PieChart3D.java index 10e945faf..2b0d535d5 100644 --- a/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/PieChart3D.java +++ b/its/projects/abacus/src/main/java/org/sonar/plugins/abacus/chart/PieChart3D.java @@ -19,7 +19,7 @@ */ package org.sonar.plugins.abacus.chart; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jfree.chart.plot.PiePlot3D; import org.jfree.chart.plot.Plot; import org.jfree.data.general.DefaultPieDataset; diff --git a/its/src/test/java/com/sonar/it/jenkins/utility/JenkinsUtils.java b/its/src/test/java/com/sonar/it/jenkins/utility/JenkinsUtils.java index d5360c700..06df62e77 100644 --- a/its/src/test/java/com/sonar/it/jenkins/utility/JenkinsUtils.java +++ b/its/src/test/java/com/sonar/it/jenkins/utility/JenkinsUtils.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.time.Duration; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.jenkinsci.test.acceptance.plugins.credentials.CredentialsPage; import org.jenkinsci.test.acceptance.plugins.credentials.ManagedCredentials; diff --git a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerBegin.java b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerBegin.java index 5051635fe..e55a3c917 100644 --- a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerBegin.java +++ b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerBegin.java @@ -43,7 +43,7 @@ import java.util.LinkedHashMap; import java.util.Map; import jenkins.model.Jenkins; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; diff --git a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerEnd.java b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerEnd.java index b2c2cd9da..26d08cc39 100644 --- a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerEnd.java +++ b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerEnd.java @@ -41,7 +41,7 @@ import java.util.LinkedHashMap; import java.util.Map; import jenkins.model.Jenkins; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import static hudson.plugins.sonar.utils.SonarUtils.PROPERTY_SONAR_LOGIN; diff --git a/src/main/java/hudson/plugins/sonar/SonarBuildWrapper.java b/src/main/java/hudson/plugins/sonar/SonarBuildWrapper.java index c4ba4d06d..18ae620d9 100644 --- a/src/main/java/hudson/plugins/sonar/SonarBuildWrapper.java +++ b/src/main/java/hudson/plugins/sonar/SonarBuildWrapper.java @@ -65,7 +65,7 @@ import java.util.UUID; import jenkins.model.Jenkins; import jenkins.tasks.SimpleBuildWrapper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.Symbol; import org.jenkinsci.plugins.plaincredentials.StringCredentials; import org.kohsuke.stapler.AncestorInPath; diff --git a/src/main/java/hudson/plugins/sonar/SonarGlobalConfiguration.java b/src/main/java/hudson/plugins/sonar/SonarGlobalConfiguration.java index e34ba315a..a672b964a 100644 --- a/src/main/java/hudson/plugins/sonar/SonarGlobalConfiguration.java +++ b/src/main/java/hudson/plugins/sonar/SonarGlobalConfiguration.java @@ -41,8 +41,8 @@ import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; import net.sf.json.JSONObject; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.plugins.plaincredentials.StringCredentials; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest2; diff --git a/src/main/java/hudson/plugins/sonar/SonarInstallation.java b/src/main/java/hudson/plugins/sonar/SonarInstallation.java index ec8226703..13a4b4a89 100644 --- a/src/main/java/hudson/plugins/sonar/SonarInstallation.java +++ b/src/main/java/hudson/plugins/sonar/SonarInstallation.java @@ -29,7 +29,7 @@ import hudson.plugins.sonar.model.TriggersConfig; import hudson.util.Secret; import java.io.Serializable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.plugins.plaincredentials.StringCredentials; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/src/main/java/hudson/plugins/sonar/SonarPublisher.java b/src/main/java/hudson/plugins/sonar/SonarPublisher.java index 3e76e851a..57fca8c9c 100644 --- a/src/main/java/hudson/plugins/sonar/SonarPublisher.java +++ b/src/main/java/hudson/plugins/sonar/SonarPublisher.java @@ -51,7 +51,7 @@ import jenkins.mvn.DefaultSettingsProvider; import jenkins.mvn.GlobalSettingsProvider; import jenkins.mvn.SettingsProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; /** diff --git a/src/main/java/hudson/plugins/sonar/SonarRunnerBuilder.java b/src/main/java/hudson/plugins/sonar/SonarRunnerBuilder.java index 7035a5b58..c92f7a256 100644 --- a/src/main/java/hudson/plugins/sonar/SonarRunnerBuilder.java +++ b/src/main/java/hudson/plugins/sonar/SonarRunnerBuilder.java @@ -53,7 +53,7 @@ import java.util.Map.Entry; import java.util.Properties; import jenkins.model.Jenkins; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; diff --git a/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarPublisherSlicerSpec.java b/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarPublisherSlicerSpec.java index 7cf7579e6..c8d45d617 100644 --- a/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarPublisherSlicerSpec.java +++ b/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarPublisherSlicerSpec.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import jenkins.model.Jenkins; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public abstract class AbstractSonarPublisherSlicerSpec extends UnorderedStringSlicerSpec> { diff --git a/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarRunnerBuilderSlicerSpec.java b/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarRunnerBuilderSlicerSpec.java index e50c83b46..b0c286198 100644 --- a/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarRunnerBuilderSlicerSpec.java +++ b/src/main/java/hudson/plugins/sonar/configurationslicing/AbstractSonarRunnerBuilderSlicerSpec.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import jenkins.model.Jenkins; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public abstract class AbstractSonarRunnerBuilderSlicerSpec extends UnorderedStringSlicerSpec> { diff --git a/src/main/java/hudson/plugins/sonar/utils/ExtendedArgumentListBuilder.java b/src/main/java/hudson/plugins/sonar/utils/ExtendedArgumentListBuilder.java index fe460f6e6..2752c12cc 100644 --- a/src/main/java/hudson/plugins/sonar/utils/ExtendedArgumentListBuilder.java +++ b/src/main/java/hudson/plugins/sonar/utils/ExtendedArgumentListBuilder.java @@ -20,7 +20,7 @@ package hudson.plugins.sonar.utils; import hudson.util.ArgumentListBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Evgeny Mandrikov diff --git a/src/main/java/hudson/plugins/sonar/utils/MaskPasswordsOutputStream.java b/src/main/java/hudson/plugins/sonar/utils/MaskPasswordsOutputStream.java index 356a6090f..28fb825b5 100644 --- a/src/main/java/hudson/plugins/sonar/utils/MaskPasswordsOutputStream.java +++ b/src/main/java/hudson/plugins/sonar/utils/MaskPasswordsOutputStream.java @@ -26,7 +26,7 @@ import java.nio.charset.Charset; import java.util.Collection; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Class adapted from the mask-passwords plugin diff --git a/src/main/java/hudson/plugins/sonar/utils/SonarMaven.java b/src/main/java/hudson/plugins/sonar/utils/SonarMaven.java index 1615ca50f..28850a5ac 100644 --- a/src/main/java/hudson/plugins/sonar/utils/SonarMaven.java +++ b/src/main/java/hudson/plugins/sonar/utils/SonarMaven.java @@ -41,7 +41,7 @@ import jenkins.model.Jenkins; import jenkins.mvn.GlobalSettingsProvider; import jenkins.mvn.SettingsProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Evgeny Mandrikov diff --git a/src/test/java/org/sonarsource/scanner/jenkins/pipeline/NetworkUtils.java b/src/test/java/org/sonarsource/scanner/jenkins/pipeline/NetworkUtils.java index 33af09ae1..b6e5daa33 100644 --- a/src/test/java/org/sonarsource/scanner/jenkins/pipeline/NetworkUtils.java +++ b/src/test/java/org/sonarsource/scanner/jenkins/pipeline/NetworkUtils.java @@ -24,7 +24,7 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; /** * Copied from Orchestrator diff --git a/src/test/java/org/sonarsource/scanner/jenkins/pipeline/WaitForQualityGateStepTest.java b/src/test/java/org/sonarsource/scanner/jenkins/pipeline/WaitForQualityGateStepTest.java index 9dd605a22..7c539e5ae 100644 --- a/src/test/java/org/sonarsource/scanner/jenkins/pipeline/WaitForQualityGateStepTest.java +++ b/src/test/java/org/sonarsource/scanner/jenkins/pipeline/WaitForQualityGateStepTest.java @@ -39,7 +39,7 @@ import okhttp3.RequestBody; import org.apache.commons.codec.digest.HmacAlgorithms; import org.apache.commons.codec.digest.HmacUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl; import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.job.WorkflowJob;