Skip to content

Commit b840c5d

Browse files
dependabot[bot]bsideup
authored andcommitted
Bump okhttp from 3.10.0 to 3.12.1 in /core (#1080)
* Bump okhttp from 3.10.0 to 3.12.1 in /core Bumps [okhttp](https://github.com/square/okhttp) from 3.10.0 to 3.12.1. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-3.10.0...parent-3.12.1) Signed-off-by: dependabot[bot] <[email protected]> * Replace OkHttp's internal API usage with public * exclude `META-INF/proguard/` from the shaded JAR
1 parent bd0aff5 commit b840c5d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ shadowJar {
2828
'META-INF/LICENSE.txt',
2929
'META-INF/DEPENDENCIES',
3030
'META-INF/maven/',
31+
'META-INF/proguard/',
3132
'META-INF/services/README.md',
3233
'META-INF/services/com.fasterxml.jackson.core.*',
3334
'META-INF/services/com.github.dockerjava.api.command.*',
@@ -101,7 +102,7 @@ dependencies {
101102
exclude(group: 'com.google.code.findbug')
102103
exclude(group: 'com.kohlschutter.junixsocket')
103104
}
104-
shaded 'com.squareup.okhttp3:okhttp:3.10.0'
105+
shaded 'com.squareup.okhttp3:okhttp:3.12.1'
105106

106107
shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
107108

core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import okhttp3.Dns;
1515
import okhttp3.HttpUrl;
1616
import okhttp3.OkHttpClient;
17-
import okhttp3.internal.Internal;
1817
import org.apache.commons.io.IOUtils;
1918

2019
import javax.net.ssl.SSLContext;
@@ -98,7 +97,7 @@ public void init(DockerClientConfig dockerClientConfig) {
9897
.port(dockerHost.getPort());
9998
break;
10099
default:
101-
baseUrlBuilder = Internal.instance.getHttpUrlChecked(dockerHost.toString()).newBuilder();
100+
baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
102101
}
103102
baseUrl = baseUrlBuilder.build();
104103
}

0 commit comments

Comments
 (0)