Browse Source

Revert "SONAR-11487 Update OKHttp to 3.11.0"

This reverts commit 8c4f5e460f.
tags/7.5
Julien HENRY 5 years ago
parent
commit
364678884b

+ 1
- 1
build.gradle View File

@@ -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.11.0') {
dependencySet(group: 'com.squareup.okhttp3', version: '3.7.0') {
entry 'okhttp'
entry 'mockwebserver'
}

+ 1
- 2
server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java View File

@@ -66,8 +66,7 @@ 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)
.message("").build();
Response response = new Response.Builder().protocol(Protocol.HTTP_1_1).request(new Request.Builder().url("http://foo").build()).code(407).build();
Request request = client.proxyAuthenticator().authenticate(null, response);

assertThat(request.header("Proxy-Authorization")).isEqualTo("Basic " + Base64.getEncoder().encodeToString("the-login:the-password".getBytes()));

+ 0
- 2
sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java View File

@@ -46,7 +46,6 @@ import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.internal.tls.OkHostnameVerifier;

import static com.google.common.base.Strings.nullToEmpty;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -193,7 +192,6 @@ public class OkHttpClientBuilder {
X509TrustManager trustManager = sslTrustManager != null ? sslTrustManager : systemDefaultTrustManager();
SSLSocketFactory sslFactory = sslSocketFactory != null ? sslSocketFactory : systemDefaultSslSocketFactory(trustManager);
builder.sslSocketFactory(sslFactory, trustManager);
builder.hostnameVerifier(OkHostnameVerifier.INSTANCE);

return builder.build();
}

Loading…
Cancel
Save