Skip to content

Migrate StringEscapeUtils to Commons Text and remove Commons Lang 2 #46

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

Open
timja-bot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate StringEscapeUtils to Commons Text and remove Commons Lang 2 #46

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 @@ -53,6 +53,10 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-text-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jsch</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.Iterator;
import java.util.Objects;
import java.util.logging.Logger;
import javax.servlet.ServletException;
import jenkins.plugins.ssh2easy.gssh.client.SshClient;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
Expand Down Expand Up @@ -123,7 +123,7 @@
}

private void log(final PrintStream logger, final String message) {
logger.println(StringUtils.defaultString(DESCRIPTOR.getShortName()) + message);
logger.println(Objects.toString(DESCRIPTOR.getShortName(), "") + message);

Check warning on line 126 in src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 126 is not covered by tests
}

public boolean isDisable() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import jenkins.plugins.ssh2easy.gssh.GsshPluginException;
import jenkins.plugins.ssh2easy.gssh.GsshUserInfo;
import jenkins.plugins.ssh2easy.gssh.ServerGroup;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

/**
* This is Ssh handler , user for handling SSH related event and requirments
Expand Down Expand Up @@ -266,7 +266,7 @@
* @return
*/
private String fixIEIssue(String input) {
return StringEscapeUtils.unescapeHtml(input);
return StringEscapeUtils.unescapeHtml4(input);

Check warning on line 269 in src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 269 is not covered by tests
}

public String getIp() {
Expand Down