From 7b91c4b907b4e5234fcfe86d0c27aa2805d3cd81 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Fri, 7 Aug 2026 11:30:59 +0100 Subject: [PATCH] Migrate from Commons Lang 2 to Commons Lang 3 --- pom.xml | 1 + src/main/java/hudson/plugins/plot/AbstractPlotPublisher.java | 2 +- src/main/java/hudson/plugins/plot/CSVSeries.java | 4 ++-- src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java | 2 +- src/main/java/hudson/plugins/plot/Plot.java | 2 +- src/main/java/hudson/plugins/plot/PlotReport.java | 2 +- src/main/java/hudson/plugins/plot/PropertiesSeries.java | 2 +- src/main/java/hudson/plugins/plot/XMLSeries.java | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b7e5c184..56d8626f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ true 2.479 + false ${jenkins.baseline}.3 false false diff --git a/src/main/java/hudson/plugins/plot/AbstractPlotPublisher.java b/src/main/java/hudson/plugins/plot/AbstractPlotPublisher.java index f7edb1a8..b4d2d41a 100644 --- a/src/main/java/hudson/plugins/plot/AbstractPlotPublisher.java +++ b/src/main/java/hudson/plugins/plot/AbstractPlotPublisher.java @@ -3,7 +3,7 @@ import hudson.Util; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Recorder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author lucinka diff --git a/src/main/java/hudson/plugins/plot/CSVSeries.java b/src/main/java/hudson/plugins/plot/CSVSeries.java index a4b89da0..5595c875 100644 --- a/src/main/java/hudson/plugins/plot/CSVSeries.java +++ b/src/main/java/hudson/plugins/plot/CSVSeries.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest2; diff --git a/src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java b/src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java index 4f1df14c..e2aa4763 100644 --- a/src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java +++ b/src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import net.sf.json.JSONObject; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest2; diff --git a/src/main/java/hudson/plugins/plot/Plot.java b/src/main/java/hudson/plugins/plot/Plot.java index d283686f..bbdf5cbb 100644 --- a/src/main/java/hudson/plugins/plot/Plot.java +++ b/src/main/java/hudson/plugins/plot/Plot.java @@ -37,7 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.ChartUtilities; diff --git a/src/main/java/hudson/plugins/plot/PlotReport.java b/src/main/java/hudson/plugins/plot/PlotReport.java index b0ca61be..7aa2249a 100644 --- a/src/main/java/hudson/plugins/plot/PlotReport.java +++ b/src/main/java/hudson/plugins/plot/PlotReport.java @@ -20,7 +20,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.StaplerRequest2; import org.kohsuke.stapler.StaplerResponse2; diff --git a/src/main/java/hudson/plugins/plot/PropertiesSeries.java b/src/main/java/hudson/plugins/plot/PropertiesSeries.java index 5cfc0523..26a7dd12 100644 --- a/src/main/java/hudson/plugins/plot/PropertiesSeries.java +++ b/src/main/java/hudson/plugins/plot/PropertiesSeries.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest2; diff --git a/src/main/java/hudson/plugins/plot/XMLSeries.java b/src/main/java/hudson/plugins/plot/XMLSeries.java index ec81f0f9..96adb243 100644 --- a/src/main/java/hudson/plugins/plot/XMLSeries.java +++ b/src/main/java/hudson/plugins/plot/XMLSeries.java @@ -29,7 +29,7 @@ import jenkins.util.xml.XMLUtils; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest2; import org.w3c.dom.NamedNodeMap;