Skip to content

Upgrade Commons Lang from 2 to 3 #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2025
Merged

Upgrade Commons Lang from 2 to 3 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/jenkinsci/plugins/badge/action/BadgeSummaryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this is deprecated:

Deprecated.
As of 3.6, use Apache Commons Text StringEscapeUtils instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, deprecation notice did not pop up in my IDE. Will update in a separate PR. Thanks for letting me know!

import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;

/**
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractAddBadgeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AbstractRemoveBadgesStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AddBadgeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AddErrorBadgeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AddInfoBadgeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/AddWarningBadgeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jenkinsci/plugins/badge/dsl/CreateSummaryStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/jenkinsci/plugins/badge/dsl/UITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading