diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-11-07 13:56:36 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-11-07 13:56:36 +0100 |
| commit | b0cb1c07338bb755a11e06c5782d404f0a007b47 (patch) | |
| tree | 8fa8121c22a22a8fbeb6ac9dc2ede08b74467e1d | |
| parent | 7a140990e36f5199ea04f188ea19dea6de59be24 (diff) | |
Use httpclient version from parent pom
| -rw-r--r-- | vespa-athenz/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index e38475e65c8..ea3c28bbcc3 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -109,13 +109,11 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5</version> <scope>compile</scope> </dependency> diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java index c99e40732bb..dba29841952 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java @@ -101,7 +101,7 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient { HostnameVerifier hostnameVerifier) { return HttpClientBuilder.create() .setRetryHandler(new DefaultHttpRequestRetryHandler(3, /*requestSentRetryEnabled*/true)) - .setSSLContext(sslContext) + .setSslcontext(sslContext) .setSSLHostnameVerifier(hostnameVerifier) .setUserAgent("default-identity-document-client") .setDefaultRequestConfig(RequestConfig.custom() |