Skip to content

Commit 0295d86

Browse files
committed
Merge remote-tracking branch 'origin/DEVX-658-Update-dependency-com.squareup.okhttp-to-v5' into DEVX-658-Update-dependency-com.squareup.okhttp-to-v5
2 parents b0ddf41 + c3b382e commit 0295d86

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

commercetools/commercetools-okhttp-client5/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
strictly '[5.0,5.99999]'
1616
prefer "5.3.0"
1717
}
18-
implementation "com.squareup.okio:okio:3.14.0"
18+
implementation "com.squareup.okio:okio:3.16.2"
1919

2020
implementation javax.validation
2121
}

commercetools/commercetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp5/CtOkHttp5Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public CtOkHttp5Client(final ExecutorService executor, final BuilderOptions opti
6767
.build();
6868
}
6969

70-
public CtOkHtt54Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost) {
70+
public CtOkHttp5Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost) {
7171
super(executor);
7272
okHttpClient = clientBuilder.get()
7373
.dispatcher(createDispatcher(executor, maxRequests, maxRequestsPerHost))

commercetools/commercetools-okhttp-client5/src/test/java/com/commercetools/http/okhttp5/SolutionInfoTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class SolutionInfoTest {
1111
public void version() {
1212
String version = new OkHttpClientSolutionInfo().getVersion();
1313

14-
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("4.12.0")))
14+
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("5.3.0")))
1515
.isGreaterThanOrEqualTo(0);
16-
Assertions.assertThat(version).startsWith("4.");
16+
Assertions.assertThat(version).startsWith("5.");
1717
}
1818
}

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ includeBuild 'common-plugins'
33
include 'rmf:rmf-java-base'
44
include 'commercetools:commercetools-okhttp-client3'
55
include 'commercetools:commercetools-okhttp-client4'
6+
include 'commercetools:commercetools-okhttp-client5'
67
include 'commercetools:commercetools-http-client'
78
include 'commercetools:commercetools-javanet-client'
89
include 'commercetools:commercetools-monitoring-newrelic'

0 commit comments

Comments
 (0)