Skip to content

Replace Apache Commons Lang 2 with Java APIs due to removal from core and security issue #196

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
jonesbusy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace Apache Commons Lang 2 with Java APIs due to removal from core and security issue #196

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
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>5.2099.v68c2f5e27299</version>
<version>6.2116.v7501b_67dc517</version>
</parent>

<name>Naginator</name>
Expand Down Expand Up @@ -33,6 +33,7 @@
<jenkins.baseline>2.492</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
</properties>

<licenses>
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/chikli/hudson/plugin/naginator/NaginatorListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import hudson.tasks.BuildWrapperDescriptor;
import hudson.tasks.Builder;
import hudson.tasks.Publisher;
import org.apache.commons.lang.StringUtils;

import org.bouncycastle.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -451,7 +451,7 @@ public String getDisplayName() {
@Test
@Issue("JENKINS-34900")
void testMavenModuleSetWithoutNaginator() throws Exception {
final String SIMPLE_POM = StringUtils.join(new String[]{
final String SIMPLE_POM = String.join("\n", new String[]{
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">",
" <modelVersion>4.0.0</modelVersion>",
Expand All @@ -472,7 +472,7 @@ void testMavenModuleSetWithoutNaginator() throws Exception {
" </pluginRepository>",
" </pluginRepositories>",
"</project>"
}, "\n");
});

ToolInstallations.configureMaven35();
MavenModuleSet p = j.createProject(MavenModuleSet.class, createUniqueProjectName());
Expand Down
Loading