diff options
| author | gjoranv <gv@oath.com> | 2018-07-18 14:20:52 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-07-18 14:20:52 +0200 |
| commit | 110332d121490fd9794344d0406459d1d59e0295 (patch) | |
| tree | 615733044e1bf92b11cf9b73f946160fc1144250 | |
| parent | f11a96bb8d0b600bc2b54e184c010129f7ecf1ba (diff) | |
Upgrade apache httpclient to 4.4.
| -rw-r--r-- | container-dependency-versions/pom.xml | 4 | ||||
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index ec4e9eae5fb..10ccf7a7161 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -238,12 +238,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3.6</version> + <version>4.4.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.3.3</version> + <version>4.4.1</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java index 79a2dc5a2fb..e9c73c68e25 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java @@ -12,6 +12,7 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.StringEntity; @@ -59,7 +60,7 @@ public class SimpleHttpClient { if (sslContext != null) { SSLConnectionSocketFactory sslConnectionFactory = new SSLConnectionSocketFactory( sslContext, - SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + NoopHostnameVerifier.INSTANCE); builder.setSSLSocketFactory(sslConnectionFactory); Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create() |