Skip to content

Commit 0545c0e

Browse files
authored
Remove OkHttp transport (#5113)
* Remove OkHttp transport * Fix OkHttp dependencies
1 parent e450586 commit 0545c0e

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

core/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ dependencies {
7979
api "com.github.docker-java:docker-java-api"
8080

8181
shaded 'com.github.docker-java:docker-java-core'
82-
shaded 'com.github.docker-java:docker-java-transport-okhttp'
8382

8483
api 'com.github.docker-java:docker-java-transport-zerodep'
8584

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.github.dockerjava.core.DefaultDockerClientConfig;
77
import com.github.dockerjava.core.DockerClientImpl;
88
import com.github.dockerjava.core.RemoteApiVersion;
9-
import com.github.dockerjava.okhttp.OkDockerHttpClient;
109
import com.github.dockerjava.transport.DockerHttpClient;
1110
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
1211
import com.google.common.annotations.VisibleForTesting;
@@ -257,12 +256,6 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
257256

258257
String transportType = TestcontainersConfiguration.getInstance().getTransportType();
259258
switch (transportType) {
260-
case "okhttp":
261-
dockerHttpClient = new OkDockerHttpClient.Builder()
262-
.dockerHost(transportConfig.getDockerHost())
263-
.sslConfig(transportConfig.getSslConfig())
264-
.build();
265-
break;
266259
case "httpclient5":
267260
dockerHttpClient = new ZerodepDockerHttpClient.Builder()
268261
.dockerHost(transportConfig.getDockerHost())

modules/azure/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ description = "Testcontainers :: Azure"
22

33
dependencies {
44
api project(':testcontainers')
5+
// TODO use JDK's HTTP client and/or Apache HttpClient5
6+
shaded 'com.squareup.okhttp3:okhttp:3.14.9'
57

68
testImplementation 'org.assertj:assertj-core:3.22.0'
79
testImplementation 'com.azure:azure-cosmos:4.26.0'

modules/couchbase/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ description = "Testcontainers :: Couchbase"
22

33
dependencies {
44
api project(':testcontainers')
5+
// TODO use JDK's HTTP client and/or Apache HttpClient5
6+
shaded 'com.squareup.okhttp3:okhttp:3.14.9'
57

68
testImplementation 'com.couchbase.client:java-client:3.2.5'
79
testImplementation 'org.awaitility:awaitility:4.1.1'

modules/solr/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ description = "Testcontainers :: Solr"
22

33
dependencies {
44
api project(':testcontainers')
5+
// TODO use JDK's HTTP client and/or Apache HttpClient5
6+
shaded 'com.squareup.okhttp3:okhttp:3.14.9'
7+
58
testImplementation 'org.apache.solr:solr-solrj:8.11.1'
69

710
}

0 commit comments

Comments
 (0)