Skip to content

Commit fdf5320

Browse files
ebariauxebariaux
authored
Update apache commons-lang (2) to current commons-lang3 (#580)
1 parent d7a88a9 commit fdf5320

File tree

142 files changed

+160
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+160
-161
lines changed

‎build-info-api/src/main/java/org/jfrog/build/api/Agent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
import java.io.Serializable;
2323

‎build-info-api/src/main/java/org/jfrog/build/api/Artifact.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
/**
2323
* Contains the build deployed artifact information

‎build-info-api/src/main/java/org/jfrog/build/api/Build.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121
import org.jfrog.build.api.dependency.BuildDependency;
2222
import org.jfrog.build.api.release.PromotionStatus;
2323

‎build-info-api/src/main/java/org/jfrog/build/api/BuildAgent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
import java.io.Serializable;
2323

‎build-info-api/src/main/java/org/jfrog/build/api/Dependency.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.ArrayUtils;
21-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.ArrayUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222

2323
import java.util.Arrays;
2424
import java.util.Objects;

‎build-info-api/src/main/java/org/jfrog/build/api/Issues.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.api;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import org.apache.commons.lang.StringUtils;
4+
import org.apache.commons.lang3.StringUtils;
55

66
import java.io.Serializable;
77
import java.util.HashSet;

‎build-info-api/src/main/java/org/jfrog/build/api/IssuesCollectionConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.api;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44

55
import java.io.IOException;
66
import java.io.Serializable;

‎build-info-api/src/main/java/org/jfrog/build/api/LicenseControl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
import java.io.Serializable;
2323

‎build-info-api/src/main/java/org/jfrog/build/api/Module.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.jfrog.build.api;
1818

1919
import com.thoughtworks.xstream.annotations.XStreamAlias;
20-
import org.apache.commons.lang.ArrayUtils;
21-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.ArrayUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222

2323
import java.util.*;
2424
import java.util.stream.Collectors;

‎build-info-api/src/main/java/org/jfrog/build/api/Vcs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.thoughtworks.xstream.annotations.XStreamAlias;
5-
import org.apache.commons.lang.StringUtils;
5+
import org.apache.commons.lang3.StringUtils;
66

77
import java.io.Serializable;
88
import java.util.Objects;

‎build-info-api/src/main/java/org/jfrog/build/api/builder/ArtifactBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.builder;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.jfrog.build.api.Artifact;
2121

2222
import java.util.Map;

‎build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.builder;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.jfrog.build.api.*;
2121
import org.jfrog.build.api.release.PromotionStatus;
2222

‎build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoMavenBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.builder;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.jfrog.build.api.*;
2121
import org.jfrog.build.api.release.PromotionStatus;
2222
import org.jfrog.build.api.util.CommonUtils;

‎build-info-api/src/main/java/org/jfrog/build/api/builder/DependencyBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.builder;
1818

19-
import org.apache.commons.lang.ArrayUtils;
19+
import org.apache.commons.lang3.ArrayUtils;
2020
import org.jfrog.build.api.Dependency;
2121

2222
import java.util.HashSet;

‎build-info-api/src/main/java/org/jfrog/build/api/dependency/BuildPatternArtifactsRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.dependency;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020

2121
import java.io.Serializable;
2222
import java.util.ArrayList;

‎build-info-api/src/main/java/org/jfrog/build/api/dependency/DownloadableArtifact.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.api.dependency;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.jfrog.build.api.dependency.pattern.PatternType;
55

66
import java.io.Serializable;

‎build-info-api/src/main/java/org/jfrog/build/api/dependency/PropertySearchResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.api.dependency;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44

55
import java.util.ArrayList;
66
import java.util.List;

‎build-info-api/src/main/java/org/jfrog/build/api/release/BintrayUploadInfoOverride.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonProperty;
6-
import org.apache.commons.lang.StringUtils;
6+
import org.apache.commons.lang3.StringUtils;
77

88
import java.util.List;
99

‎build-info-api/src/main/java/org/jfrog/build/api/search/AqlSearchResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.api.search;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.StringUtils;
4+
import org.apache.commons.lang3.StringUtils;
55
import org.jfrog.build.api.BuildInfoFields;
66

77
import java.util.ArrayList;

‎build-info-api/src/main/java/org/jfrog/build/api/util/CommonUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.jfrog.build.api.util;
22

33
import org.apache.commons.io.FileUtils;
4-
import org.apache.commons.lang.StringUtils;
5-
import org.apache.commons.lang.SystemUtils;
4+
import org.apache.commons.lang3.StringUtils;
5+
import org.apache.commons.lang3.SystemUtils;
66

77
import java.io.BufferedWriter;
88
import java.io.File;

‎build-info-api/src/main/java/org/jfrog/build/api/util/ZipUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
88
import org.apache.commons.io.FilenameUtils;
99
import org.apache.commons.io.IOUtils;
10-
import org.apache.commons.lang.StringUtils;
10+
import org.apache.commons.lang3.StringUtils;
1111

1212
import java.io.*;
1313
import java.util.Date;

‎build-info-api/src/test/java/org/jfrog/build/api/DependencyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api;
1818

19-
import org.apache.commons.lang.ArrayUtils;
19+
import org.apache.commons.lang3.ArrayUtils;
2020
import org.jfrog.build.api.util.CommonUtils;
2121
import org.testng.annotations.Test;
2222

‎build-info-api/src/test/java/org/jfrog/build/api/builder/DependencyBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.api.builder;
1818

19-
import org.apache.commons.lang.ArrayUtils;
19+
import org.apache.commons.lang3.ArrayUtils;
2020
import org.jfrog.build.api.Dependency;
2121
import org.jfrog.build.api.util.CommonUtils;
2222
import org.testng.annotations.Test;

‎build-info-api/src/test/java/org/jfrog/build/api/util/CreateTempDirTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.api.util;
22

3-
import org.apache.commons.lang.SystemUtils;
4-
import org.apache.commons.lang.exception.ExceptionUtils;
3+
import org.apache.commons.lang3.SystemUtils;
4+
import org.apache.commons.lang3.exception.ExceptionUtils;
55
import org.testng.annotations.AfterMethod;
66
import org.testng.annotations.Test;
77

‎build-info-client/src/main/java/org/jfrog/build/client/JFrogHttpClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.client;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.apache.http.client.methods.CloseableHttpResponse;
2121
import org.apache.http.client.methods.HttpRequestBase;
2222
import org.jfrog.build.api.util.Log;

‎build-info-client/src/main/java/org/jfrog/build/client/PreemptiveHttpClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.build.client;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.apache.http.*;
2121
import org.apache.http.auth.AuthScope;
2222
import org.apache.http.auth.AuthState;

‎build-info-client/src/main/java/org/jfrog/build/client/PreemptiveHttpClientBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.client;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.apache.http.HttpHost;
55
import org.apache.http.auth.AuthScope;
66
import org.apache.http.auth.UsernamePasswordCredentials;

‎build-info-client/src/main/java/org/jfrog/build/client/Version.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.client;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44

55
import java.io.Serializable;
66

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/Alert.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringBuilder;
55

66
import java.io.Serializable;
77
import java.util.List;

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/ImpactedArtifact.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringBuilder;
55

66
import java.io.Serializable;
77
import java.util.List;

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/InfectedFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringBuilder;
55

66
import java.io.Serializable;
77

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/Issue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.StringUtils;
5-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.StringUtils;
5+
import org.apache.commons.lang3.builder.ToStringBuilder;
66

77
import java.io.Serializable;
88
import java.util.List;

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/License.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringBuilder;
55

66
import java.io.Serializable;
77
import java.util.List;

‎build-info-client/src/main/java/org/jfrog/build/client/artifactoryXrayResponse/Summary.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.client.artifactoryXrayResponse;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import org.apache.commons.lang.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringBuilder;
55

66
import java.io.Serializable;
77

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.github.dockerjava.core.command.PullImageResultCallback;
1212
import com.github.dockerjava.core.command.PushImageResultCallback;
1313
import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
14-
import org.apache.commons.lang.StringUtils;
14+
import org.apache.commons.lang3.StringUtils;
1515
import org.apache.commons.lang3.tuple.Pair;
1616
import org.jfrog.build.api.util.Log;
1717

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public static List<String> getArtManifestPath(String imagePath, String repo, Com
269269
// Assuming proxy-less e.g. orgab.jfrog.team/docker-local.
270270
paths.add(imagePath);
271271

272-
int totalSlash = org.apache.commons.lang.StringUtils.countMatches(imagePath, "/");
272+
int totalSlash = org.apache.commons.lang3.StringUtils.countMatches(imagePath, "/");
273273
if (cmd == CommandType.Push || totalSlash > 3) {
274274
return paths;
275275
}

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/extractor/DockerPull.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.extractor.docker.extractor;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.apache.commons.lang3.exception.ExceptionUtils;
55
import org.apache.commons.lang3.tuple.Pair;
66
import org.jfrog.build.api.Build;

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/extractor/DockerPush.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jfrog.build.extractor.docker.extractor;
22

33
import com.google.common.collect.ArrayListMultimap;
4-
import org.apache.commons.lang.StringUtils;
4+
import org.apache.commons.lang3.StringUtils;
55
import org.apache.commons.lang3.exception.ExceptionUtils;
66
import org.jfrog.build.api.Build;
77
import org.jfrog.build.api.Module;

‎build-info-extractor-go/src/main/java/org/jfrog/build/extractor/go/GoDriver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.extractor.go;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.jfrog.build.api.util.Log;
55
import org.jfrog.build.extractor.executor.CommandExecutor;
66
import org.jfrog.build.extractor.executor.CommandResults;

‎build-info-extractor-go/src/main/java/org/jfrog/build/extractor/go/extractor/GoCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.extractor.go.extractor;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import org.jfrog.build.api.util.Log;
55
import org.jfrog.build.client.ArtifactoryVersion;
66
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryManagerBuilder;

‎build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/GradleArtifactoryClientConfigUpdater.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.gradle.plugin.artifactory.extractor;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.gradle.StartParameter;
2121
import org.gradle.api.Project;
2222
import org.jfrog.build.api.Build;

‎build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/GradleBuildInfoExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jfrog.gradle.plugin.artifactory.extractor;
1818

19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.gradle.api.Project;
2121
import org.gradle.api.logging.Logger;
2222
import org.gradle.api.logging.Logging;

‎build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/listener/ArtifactoryDependencyResolutionListener.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.gradle.plugin.artifactory.extractor.listener
22

3-
import org.apache.commons.lang.ArrayUtils
3+
import org.apache.commons.lang3.ArrayUtils
44
import org.gradle.api.artifacts.DependencyResolutionListener
55
import org.gradle.api.artifacts.ModuleVersionIdentifier
66
import org.gradle.api.artifacts.ResolvableDependencies

‎build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/listener/ProjectsEvaluatedBuildListener.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.gradle.plugin.artifactory.extractor.listener
22

3-
import org.apache.commons.lang.StringUtils
3+
import org.apache.commons.lang3.StringUtils
44
import org.gradle.BuildAdapter
55
import org.gradle.StartParameter
66
import org.gradle.api.Project

0 commit comments

Comments
 (0)