Upgrade Commons Lang from 2 to 3

strangelookingnerd · strangelookingnerd · commit bf2caf510ba9 · 2025-07-31T16:01:21.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -77,6 +77,10 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>emoji-symbols-api</artifactId>
diff --git a/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java b/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java
@@ -34,7 +34,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/src/main/java/com/jenkinsci/plugins/badge/action/BadgeSummaryAction.java b/src/main/java/com/jenkinsci/plugins/badge/action/BadgeSummaryAction.java
@@ -24,8 +24,8 @@
 package com.jenkinsci.plugins.badge.action;
 
 import java.io.Serial;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;
 
 /**
@@ -64,7 +64,7 @@ public void appendText(String text) {
     @Deprecated(since = "2.0", forRemoval = true)
     public void appendText(String text, boolean escapeHtml) {
         if (escapeHtml) {
-            text = StringEscapeUtils.escapeHtml(text);
+            text = StringEscapeUtils.escapeHtml4(text);
         }
         setText(StringUtils.defaultString(getText()) + text);
     }
@@ -83,11 +83,11 @@ public void appendText(String text, boolean escapeHtml, boolean bold, boolean it
             closeTags += "</i>";
         }
         if (color != null) {
-            startTags += "<font color=\"" + StringEscapeUtils.escapeHtml(color) + "\">";
+            startTags += "<font color=\"" + StringEscapeUtils.escapeHtml4(color) + "\">";
             closeTags += "</font>";
         }
         if (escapeHtml) {
-            text = StringEscapeUtils.escapeHtml(text);
+            text = StringEscapeUtils.escapeHtml4(text);
         }
         setText(StringUtils.defaultString(getText()) + startTags + text + closeTags);
     }
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractAddBadgeStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractAddBadgeStep.java
@@ -28,7 +28,7 @@
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.SynchronousStepExecution;
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractRemoveBadgesStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractRemoveBadgesStep.java
@@ -29,7 +29,7 @@
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AddBadgeStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AddBadgeStep.java
@@ -27,7 +27,7 @@
 import com.jenkinsci.plugins.badge.action.BadgeAction;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AddErrorBadgeStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AddErrorBadgeStep.java
@@ -28,7 +28,7 @@
 import io.jenkins.plugins.ionicons.Ionicons;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AddInfoBadgeStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AddInfoBadgeStep.java
@@ -28,7 +28,7 @@
 import io.jenkins.plugins.ionicons.Ionicons;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/AddWarningBadgeStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/AddWarningBadgeStep.java
@@ -28,7 +28,7 @@
 import io.jenkins.plugins.ionicons.Ionicons;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
diff --git a/src/main/java/com/jenkinsci/plugins/badge/dsl/CreateSummaryStep.java b/src/main/java/com/jenkinsci/plugins/badge/dsl/CreateSummaryStep.java
@@ -30,7 +30,7 @@
 import hudson.model.TaskListener;
 import java.io.PrintStream;
 import java.io.Serial;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
diff --git a/src/test/java/com/jenkinsci/plugins/badge/dsl/UITest.java b/src/test/java/com/jenkinsci/plugins/badge/dsl/UITest.java
@@ -8,7 +8,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.HtmlPage;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`package com.jenkinsci.plugins.badge.action;`
`25`	`25`
`26`	`26`	`import java.io.Serial;`
`27`		`-import org.apache.commons.lang.StringEscapeUtils;`
`28`		`-import org.apache.commons.lang.StringUtils;`
	`27`	`+import org.apache.commons.lang3.StringEscapeUtils;`
	`28`	`+import org.apache.commons.lang3.StringUtils;`
`29`	`29`	`import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;`
`30`	`30`
`31`	`31`	`/**`
`@@ -64,7 +64,7 @@ public void appendText(String text) {`
`64`	`64`	`@Deprecated(since = "2.0", forRemoval = true)`
`65`	`65`	`public void appendText(String text, boolean escapeHtml) {`
`66`	`66`	`if (escapeHtml) {`
`67`		`- text = StringEscapeUtils.escapeHtml(text);`
	`67`	`+ text = StringEscapeUtils.escapeHtml4(text);`
`68`	`68`	`}`
`69`	`69`	`setText(StringUtils.defaultString(getText()) + text);`
`70`	`70`	`}`
`@@ -83,11 +83,11 @@ public void appendText(String text, boolean escapeHtml, boolean bold, boolean it`
`83`	`83`	`closeTags += "</i>";`
`84`	`84`	`}`
`85`	`85`	`if (color != null) {`
`86`		`- startTags += "<font color=\"" + StringEscapeUtils.escapeHtml(color) + "\">";`
	`86`	`+ startTags += "<font color=\"" + StringEscapeUtils.escapeHtml4(color) + "\">";`
`87`	`87`	`closeTags += "</font>";`
`88`	`88`	`}`
`89`	`89`	`if (escapeHtml) {`
`90`		`- text = StringEscapeUtils.escapeHtml(text);`
	`90`	`+ text = StringEscapeUtils.escapeHtml4(text);`
`91`	`91`	`}`
`92`	`92`	`setText(StringUtils.defaultString(getText()) + startTags + text + closeTags);`
`93`	`93`	`}`