Skip to content

Commit 8e77a69

Browse files
authored
Update apache commons-lang (2) to current commons-lang3 (#1746)
1 parent c61da29 commit 8e77a69

35 files changed

+66
-66
lines changed

docker-java-core/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
</dependency>
4747

4848
<dependency>
49-
<groupId>commons-lang</groupId>
50-
<artifactId>commons-lang</artifactId>
51-
<version>${commons-lang.version}</version>
49+
<groupId>org.apache.commons</groupId>
50+
<artifactId>commons-lang3</artifactId>
51+
<version>${commons-lang3.version}</version>
5252
</dependency>
5353

5454
<dependency>

docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import com.github.dockerjava.api.model.AuthConfigurations;
66
import com.github.dockerjava.core.NameParser.HostnameReposName;
77
import com.github.dockerjava.core.NameParser.ReposTag;
8-
import org.apache.commons.lang.StringUtils;
9-
import org.apache.commons.lang.SystemUtils;
10-
import org.apache.commons.lang.builder.EqualsBuilder;
11-
import org.apache.commons.lang.builder.HashCodeBuilder;
12-
import org.apache.commons.lang.builder.ToStringBuilder;
13-
import org.apache.commons.lang.builder.ToStringStyle;
8+
import org.apache.commons.lang3.StringUtils;
9+
import org.apache.commons.lang3.SystemUtils;
10+
import org.apache.commons.lang3.builder.EqualsBuilder;
11+
import org.apache.commons.lang3.builder.HashCodeBuilder;
12+
import org.apache.commons.lang3.builder.ToStringBuilder;
13+
import org.apache.commons.lang3.builder.ToStringStyle;
1414

1515
import javax.annotation.CheckForNull;
1616
import javax.annotation.Nonnull;
@@ -26,7 +26,7 @@
2626
import java.util.Set;
2727

2828
import static com.google.common.base.Preconditions.checkNotNull;
29-
import static org.apache.commons.lang.BooleanUtils.isTrue;
29+
import static org.apache.commons.lang3.BooleanUtils.isTrue;
3030

3131
/**
3232
* Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables

docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.google.common.collect.SetMultimap;
1010
import com.google.common.escape.Escaper;
1111
import com.google.common.net.UrlEscapers;
12-
import org.apache.commons.lang.StringUtils;
12+
import org.apache.commons.lang3.StringUtils;
1313

1414
import java.io.IOException;
1515
import java.util.Map;

docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.github.dockerjava.api.model.AuthConfig;
77
import com.github.dockerjava.api.model.AuthConfigurations;
88
import org.apache.commons.io.FileUtils;
9-
import org.apache.commons.lang.StringUtils;
9+
import org.apache.commons.lang3.StringUtils;
1010

1111
import javax.annotation.CheckForNull;
1212
import javax.annotation.Nonnull;

docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.google.common.cache.CacheLoader;
1515
import com.google.common.cache.LoadingCache;
1616
import com.google.common.util.concurrent.UncheckedExecutionException;
17-
import org.apache.commons.lang.StringUtils;
17+
import org.apache.commons.lang3.StringUtils;
1818

1919
import com.github.dockerjava.core.exception.GoLangFileMatchException;
2020

docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import java.util.regex.Pattern;
77

8-
import org.apache.commons.lang.StringUtils;
9-
import org.apache.commons.lang.builder.EqualsBuilder;
10-
import org.apache.commons.lang.builder.ToStringBuilder;
11-
import org.apache.commons.lang.builder.ToStringStyle;
8+
import org.apache.commons.lang3.StringUtils;
9+
import org.apache.commons.lang3.builder.EqualsBuilder;
10+
import org.apache.commons.lang3.builder.ToStringBuilder;
11+
import org.apache.commons.lang3.builder.ToStringStyle;
1212

1313
import com.github.dockerjava.api.model.AuthConfig;
1414
import com.github.dockerjava.core.exception.InvalidRepositoryNameException;

docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.io.IOException;
66
import java.util.Base64;
77

8-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
9-
import org.apache.commons.lang.builder.ToStringStyle;
8+
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
9+
import org.apache.commons.lang3.builder.ToStringStyle;
1010
import org.slf4j.Logger;
1111
import org.slf4j.LoggerFactory;
1212

docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.nio.file.Path;
99
import java.nio.file.Paths;
1010

11-
import org.apache.commons.lang.StringUtils;
12-
import org.apache.commons.lang.builder.ToStringBuilder;
11+
import org.apache.commons.lang3.StringUtils;
12+
import org.apache.commons.lang3.builder.ToStringBuilder;
1313

1414
import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
1515
import com.github.dockerjava.api.exception.DockerClientException;

docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import com.github.dockerjava.api.model.HostConfig;
1515
import com.github.dockerjava.api.model.Volume;
1616
import com.github.dockerjava.api.model.Volumes;
17-
import org.apache.commons.lang.builder.EqualsBuilder;
18-
import org.apache.commons.lang.builder.HashCodeBuilder;
19-
import org.apache.commons.lang.builder.ToStringBuilder;
17+
import org.apache.commons.lang3.builder.EqualsBuilder;
18+
import org.apache.commons.lang3.builder.HashCodeBuilder;
19+
import org.apache.commons.lang3.builder.ToStringBuilder;
2020

2121
import javax.annotation.CheckForNull;
2222
import java.util.Arrays;

docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.fasterxml.jackson.annotation.JsonProperty;
55
import com.github.dockerjava.api.command.InitializeSwarmCmd;
66
import com.github.dockerjava.api.model.SwarmSpec;
7-
import org.apache.commons.lang.builder.EqualsBuilder;
8-
import org.apache.commons.lang.builder.HashCodeBuilder;
9-
import org.apache.commons.lang.builder.ToStringBuilder;
7+
import org.apache.commons.lang3.builder.EqualsBuilder;
8+
import org.apache.commons.lang3.builder.HashCodeBuilder;
9+
import org.apache.commons.lang3.builder.ToStringBuilder;
1010

1111
import javax.annotation.CheckForNull;
1212

0 commit comments

Comments
 (0)