Skip to content

Commit c7d4630

Browse files
Merge pull request #131 from okta/ak_bump_okhttp3
upgrade okhttp3 and auto-service deps
2 parents d73f6e4 + 4a52a4d commit c7d4630

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

THIRD-PARTY-NOTICES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ This project includes:
2828
Guava ListenableFuture only under The Apache Software License, Version 2.0
2929
Guava: Google Core Libraries for Java under Apache License, Version 2.0
3030
IntelliJ IDEA Annotations under The Apache Software License, Version 2.0
31-
J2ObjC Annotations under The Apache Software License, Version 2.0
31+
J2ObjC Annotations under Apache License, Version 2.0
3232
Kotlin Stdlib under The Apache License, Version 2.0
3333
Kotlin Stdlib Common under The Apache License, Version 2.0
3434
Kotlin Stdlib Jdk7 under The Apache License, Version 2.0
3535
Kotlin Stdlib Jdk8 under The Apache License, Version 2.0
3636
okhttp under The Apache Software License, Version 2.0
37-
OkHttp Logging Interceptor under Apache 2.0
37+
okhttp-logging-interceptor under The Apache Software License, Version 2.0
3838
okio under The Apache Software License, Version 2.0
3939

4040

http/okhttp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
<dependency>
5050
<groupId>com.squareup.okhttp3</groupId>
5151
<artifactId>okhttp</artifactId>
52-
<version>4.10.0</version>
52+
<version>4.11.0</version>
5353
</dependency>
5454

5555
<dependency>
5656
<groupId>com.squareup.okhttp3</groupId>
5757
<artifactId>logging-interceptor</artifactId>
58-
<version>3.14.4</version>
58+
<version>4.10.0</version>
5959
</dependency>
6060

6161
<dependency>

http/okhttp/src/main/java/com/okta/commons/http/okhttp/OkHttpRequestExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static OkHttpClient configureOkHttpClient(HttpClientConfiguration httpClientConf
104104
clientBuilder.writeTimeout(httpClientConfiguration.getConnectionTimeout(), TimeUnit.SECONDS);
105105

106106
clientBuilder.cookieJar(CookieJar.NO_COOKIES);
107-
clientBuilder.retryOnConnectionFailure(false); // handled by SDK
107+
clientBuilder.retryOnConnectionFailure(true); // fix for https://github.com/square/okhttp/issues/2738
108108

109109
final Proxy sdkProxy = httpClientConfiguration.getProxy();
110110
if (sdkProxy != null) {

http/okhttp/src/test/groovy/com/okta/commons/http/okhttp/OkHttpRequestExecutorFactoryTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class OkHttpRequestExecutorFactoryTest {
6969
assertThat okHttpClient.cookieJar(), is(cookieJar)
7070
assertThat client.cookieJar(), is(CookieJar.NO_COOKIES)
7171
assertThat okHttpClient.retryOnConnectionFailure(), is(true)
72-
assertThat client.retryOnConnectionFailure(), is(false)
72+
assertThat client.retryOnConnectionFailure(), is(true)
7373
}
7474

7575
private static OkHttpClient okHttpClientFromExecutor(RequestExecutor executor) {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
<dependency>
9393
<groupId>com.squareup.okio</groupId>
9494
<artifactId>okio-jvm</artifactId>
95-
<version>3.2.0</version>
95+
<version>3.4.0</version>
9696
</dependency>
9797

9898
<dependency>
9999
<!-- compile time annotation processor -->
100100
<groupId>com.google.auto.service</groupId>
101101
<artifactId>auto-service</artifactId>
102-
<version>1.0.1</version>
102+
<version>1.1.1</version>
103103
<optional>true</optional>
104104
</dependency>
105105

0 commit comments

Comments
 (0)