Switch to commons-lang3

jenkinsci · Sep 27, 2022 · 00a2081 · 00a2081
1 parent 49a8ef1
commit 00a2081
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 17 deletions.
diff --git a/src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java b/src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java
@@ -21,7 +21,7 @@
 import com.browserup.bup.BrowserUpProxy;
 import com.browserup.bup.client.ClientUtil;
 import org.apache.commons.exec.OS;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.DefaultArtifact;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/controller/WinstoneController.java b/src/main/java/org/jenkinsci/test/acceptance/controller/WinstoneController.java
@@ -15,7 +15,7 @@
 import java.util.logging.Logger;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.test.acceptance.utils.IOUtil;
 import org.jenkinsci.utils.process.CommandBuilder;
 import org.jenkinsci.utils.process.ProcessInputStream;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/junit/Native.java b/src/main/java/org/jenkinsci/test/acceptance/junit/Native.java
@@ -1,6 +1,6 @@
 package org.jenkinsci.test.acceptance.junit;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.utils.process.CommandBuilder;
 import org.junit.AssumptionViolatedException;
 import org.junit.rules.TestRule;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/junit/WithOS.java b/src/main/java/org/jenkinsci/test/acceptance/junit/WithOS.java
@@ -10,7 +10,7 @@
 import java.lang.annotation.Target;
 import java.util.Arrays;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.controller.JenkinsController;
 import org.jenkinsci.test.acceptance.controller.LocalController;
 import org.junit.AssumptionViolatedException;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/job_dsl/JobDslBuildStep.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/job_dsl/JobDslBuildStep.java
@@ -1,9 +1,7 @@
 package org.jenkinsci.test.acceptance.plugins.job_dsl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.test.acceptance.po.*;
-import org.jenkinsci.test.acceptance.selenium.Scroller;
-import org.openqa.selenium.By;
 
 /**
  * Encapsulates the PageArea of the Job DSL plugin.

diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/mstestrunner/MSTestRunnerBuildStep.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/mstestrunner/MSTestRunnerBuildStep.java
@@ -24,7 +24,7 @@
 package org.jenkinsci.test.acceptance.plugins.mstestrunner;
 
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.test.acceptance.po.AbstractStep;
 import org.jenkinsci.test.acceptance.po.BuildStep;
 import org.jenkinsci.test.acceptance.po.Control;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/DumbSlave.java b/src/main/java/org/jenkinsci/test/acceptance/po/DumbSlave.java
@@ -3,7 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.slave.SlaveController;
 import org.jenkinsci.test.acceptance.update_center.PluginSpec;
 import org.jenkinsci.utils.process.CommandBuilder;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java
@@ -21,7 +21,7 @@
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.codehaus.plexus.util.Base64;
 import org.jenkinsci.test.acceptance.controller.JenkinsController;
 import org.jenkinsci.test.acceptance.controller.LocalController;

diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java b/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java
@@ -31,8 +31,7 @@
 
 import hudson.util.VersionNumber;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
-import org.jenkinsci.test.acceptance.Matchers;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.utils.process.CommandBuilder;
 import org.openqa.selenium.NoSuchElementException;
 

diff --git a/src/test/java/core/ArtifactsTest.java b/src/test/java/core/ArtifactsTest.java
@@ -2,7 +2,7 @@
 
 import com.google.inject.Inject;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
 import org.jenkinsci.test.acceptance.junit.WithPlugins;
 import org.jenkinsci.test.acceptance.po.*;

diff --git a/src/test/java/core/PublisherOrderTest.java b/src/test/java/core/PublisherOrderTest.java
@@ -1,6 +1,6 @@
 package core;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
 import org.jenkinsci.test.acceptance.junit.WithPlugins;
 import org.jenkinsci.test.acceptance.po.AggregateDownstreamTestResults;

diff --git a/src/test/java/plugins/CompressArtifactsPluginTest.java b/src/test/java/plugins/CompressArtifactsPluginTest.java
@@ -32,7 +32,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.Matcher;
 import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
 import org.jvnet.hudson.test.Issue;

diff --git a/src/test/java/plugins/DeployPluginTest.java b/src/test/java/plugins/DeployPluginTest.java
@@ -1,7 +1,7 @@
 package plugins;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.docker.DockerContainerHolder;
 import org.jenkinsci.test.acceptance.docker.fixtures.Tomcat7Container;
 import org.jenkinsci.test.acceptance.junit.*;

diff --git a/src/test/java/plugins/NodeLabelParameterPluginTest.java b/src/test/java/plugins/NodeLabelParameterPluginTest.java
@@ -2,7 +2,7 @@
 
 import com.google.inject.Inject;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.Matcher;
 import org.jenkinsci.test.acceptance.Matchers;
 import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;