Skip to content

Commit 56eb783

Browse files
authored
Ban Commons Lang 2 (#1213)
* Ban Commons Lang 2 This is an undeclared library, coming from core, which we need to remove * Uses Commons Lang 3, with dependency declaration
1 parent 72f1a71 commit 56eb783

17 files changed

+22
-17
lines changed

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.jenkins-ci.plugins</groupId>
1010
<artifactId>plugin</artifactId>
11-
<version>5.25</version>
11+
<version>6.2116.v7501b_67dc517</version>
1212
<relativePath />
1313
</parent>
1414
<groupId>io.jenkins.plugins</groupId>
@@ -71,6 +71,7 @@
7171
<useBeta>true</useBeta>
7272
<elasticstack.version>9.1.4</elasticstack.version>
7373
<error-prone.version>2.41.0</error-prone.version>
74+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
7475
</properties>
7576

7677
<dependencyManagement>
@@ -152,6 +153,10 @@
152153
</dependencies>
153154
</dependencyManagement>
154155
<dependencies>
156+
<dependency>
157+
<groupId>io.jenkins.plugins</groupId>
158+
<artifactId>commons-lang3-api</artifactId>
159+
</dependency>
155160
<dependency>
156161
<groupId>co.elastic.clients</groupId>
157162
<artifactId>elasticsearch-java</artifactId>

src/main/java/io/jenkins/plugins/opentelemetry/OpenTelemetryConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Objects;
2323
import java.util.Optional;
2424
import java.util.function.BiFunction;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626

2727
public class OpenTelemetryConfiguration {
2828

src/main/java/io/jenkins/plugins/opentelemetry/OtelUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import jenkins.scm.api.mixin.ChangeRequestSCMHead;
4343
import jenkins.scm.api.mixin.TagSCMHead;
4444
import org.apache.commons.codec.net.URLCodec;
45-
import org.apache.commons.lang.StringUtils;
45+
import org.apache.commons.lang3.StringUtils;
4646
import org.jenkinsci.plugins.workflow.graph.FlowNode;
4747
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
4848
import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject;

src/main/java/io/jenkins/plugins/opentelemetry/administrativemonitor/ElasticBackendDashboardNotEnabledAdministrativeMonitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.jenkins.plugins.opentelemetry.backend.ElasticBackend;
1212
import java.io.IOException;
1313
import javax.inject.Inject;
14-
import org.apache.commons.lang.StringUtils;
14+
import org.apache.commons.lang3.StringUtils;
1515
import org.kohsuke.stapler.HttpResponse;
1616
import org.kohsuke.stapler.HttpResponses;
1717
import org.kohsuke.stapler.StaplerRequest2;

src/main/java/io/jenkins/plugins/opentelemetry/administrativemonitor/ElasticBackendKibanaBaseUrlNotSetAdministrativeMonitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.jenkins.plugins.opentelemetry.backend.ElasticBackend;
1212
import java.io.IOException;
1313
import javax.inject.Inject;
14-
import org.apache.commons.lang.StringUtils;
14+
import org.apache.commons.lang3.StringUtils;
1515
import org.kohsuke.stapler.HttpResponse;
1616
import org.kohsuke.stapler.HttpResponses;
1717
import org.kohsuke.stapler.StaplerRequest2;

src/main/java/io/jenkins/plugins/opentelemetry/administrativemonitor/ObservabilityBackendCheckAdministrativeMonitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.jenkins.plugins.opentelemetry.JenkinsOpenTelemetryPluginConfiguration;
1111
import java.io.IOException;
1212
import javax.inject.Inject;
13-
import org.apache.commons.lang.StringUtils;
13+
import org.apache.commons.lang3.StringUtils;
1414
import org.kohsuke.stapler.HttpResponse;
1515
import org.kohsuke.stapler.HttpResponses;
1616
import org.kohsuke.stapler.StaplerRequest2;

src/main/java/io/jenkins/plugins/opentelemetry/backend/ElasticBackend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.Objects;
2727
import java.util.Optional;
2828
import jenkins.model.GlobalConfiguration;
29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.jenkins.ui.icon.Icon;
3131
import org.jenkins.ui.icon.IconSet;
3232
import org.jenkinsci.Symbol;

src/main/java/io/jenkins/plugins/opentelemetry/backend/GrafanaBackend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Map;
2323
import java.util.Objects;
2424
import java.util.Optional;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.jenkins.ui.icon.Icon;
2727
import org.jenkins.ui.icon.IconSet;
2828
import org.jenkinsci.Symbol;

src/main/java/io/jenkins/plugins/opentelemetry/backend/elastic/ElasticLogsBackendWithJenkinsVisualization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Objects;
2929
import java.util.logging.Logger;
3030
import jenkins.model.Jenkins;
31-
import org.apache.commons.lang.StringUtils;
31+
import org.apache.commons.lang3.StringUtils;
3232
import org.kohsuke.stapler.DataBoundConstructor;
3333
import org.kohsuke.stapler.DataBoundSetter;
3434
import org.kohsuke.stapler.QueryParameter;

src/main/java/io/jenkins/plugins/opentelemetry/backend/elastic/ElasticsearchLogStorageRetriever.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import java.util.logging.Level;
5454
import java.util.logging.Logger;
5555
import javax.net.ssl.SSLContext;
56-
import org.apache.commons.lang.StringUtils;
56+
import org.apache.commons.lang3.StringUtils;
5757
import org.apache.hc.client5.http.config.RequestConfig;
5858
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
5959
import org.apache.hc.client5.http.impl.async.HttpAsyncClients;

0 commit comments

Comments
 (0)