SONAR-11487 Update OkHttp to 3.14.0

diff --git a/build.gradle b/build.gradle
index f442ce1f62aa95fd97021fbb717313dc4b94141e..7cb1c69d5d8db52bbb1a67f67e6b3c2cc9cb6c8e 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -140,7 +140,7 @@ subprojects {
       dependency 'com.ibm.icu:icu4j:3.4.4'
       dependency 'com.microsoft.sqlserver:mssql-jdbc:6.2.2.jre8'
       dependency 'com.oracle.jdbc:ojdbc8:12.2.0.1.0'
-      dependencySet(group: 'com.squareup.okhttp3', version: '3.7.0') {
+      dependencySet(group: 'com.squareup.okhttp3', version: '3.14.0') {
         entry 'okhttp'
         entry 'mockwebserver'
       }

diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
index 8d18e5ef95a54211e51e7e8907f3304ad5b0b94c..32ed25b0663931f27aa08d1a70ab3fe1cd0676a4 100644 (file)
--- a/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
@@ -66,7 +66,8 @@ public class OkHttpClientProviderTest {
     settings.setProperty("http.proxyPassword", "the-password");
 
     OkHttpClient client = underTest.provide(settings.asConfig(), runtime);
-    Response response = new Response.Builder().protocol(Protocol.HTTP_1_1).request(new Request.Builder().url("http://foo").build()).code(407).build();
+    Response response = new Response.Builder().protocol(Protocol.HTTP_1_1).request(new Request.Builder().url("http://foo").build()).code(407)
+      .message("").build();
     Request request = client.proxyAuthenticator().authenticate(null, response);
 
     assertThat(request.header("Proxy-Authorization")).isEqualTo("Basic " + Base64.getEncoder().encodeToString("the-login:the-password".getBytes()));