You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2016/03/04 23:59:40 UTC
knox git commit: [KNOX-680] - Update Knox's HttpClient dependency to
latest version
Repository: knox
Updated Branches:
refs/heads/master 7806a411a -> 5f0bfdf87
[KNOX-680] - Update Knox's HttpClient dependency to latest version
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/5f0bfdf8
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/5f0bfdf8
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/5f0bfdf8
Branch: refs/heads/master
Commit: 5f0bfdf8791c28b8ed804bc81ad48c2e1223ea15
Parents: 7806a41
Author: Kevin Minder <km...@apache.org>
Authored: Fri Mar 4 17:59:29 2016 -0500
Committer: Kevin Minder <km...@apache.org>
Committed: Fri Mar 4 17:59:29 2016 -0500
----------------------------------------------------------------------
CHANGES | 1 +
.../hadoop/gateway/GatewayMultiFuncTest.java | 1 -
.../hadoop/gateway/GatewaySslFuncTest.java | 31 ++------------------
pom.xml | 2 +-
4 files changed, 5 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/5f0bfdf8/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2877e83..06efd2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Release Notes - Apache Knox - Version 0.9.0
* [KNOX-677] - Upgrade to latest Groovy
* [KNOX-675] - Upgrade Knox's Jetty dependency to latest 9.x
* [KNOX-678] - Malformed UTF-8 characters in JSON Response
+ * [KNOX-680] - Update Knox's HttpClient dependency to latest version
** Bug
------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/5f0bfdf8/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayMultiFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayMultiFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayMultiFuncTest.java
index 47fe9bd..8c29ce5 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayMultiFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayMultiFuncTest.java
@@ -81,7 +81,6 @@ public class GatewayMultiFuncTest {
@BeforeClass
public static void setupSuite() throws Exception {
LOG_ENTER();
- RestAssured.config = newConfig().connectionConfig(connectionConfig().closeIdleConnectionsAfterEachResponse());
//appenders = NoOpAppender.setUp();
setupLdap();
setupGateway();
http://git-wip-us.apache.org/repos/asf/knox/blob/5f0bfdf8/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySslFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySslFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySslFuncTest.java
index b419231..7032236 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySslFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySslFuncTest.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.gateway;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@@ -33,11 +32,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.ServiceLoader;
import java.util.UUID;
+import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import javax.xml.transform.stream.StreamSource;
@@ -62,7 +60,6 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
@@ -236,14 +233,11 @@ public class GatewaySslFuncTest {
context.setAuthCache( authCache );
CloseableHttpClient client = HttpClients.custom()
- .setHostnameVerifier( new TrustAllHosts() )
- .setSslcontext( createInsecureSslContext() )
.setSSLSocketFactory(
new SSLConnectionSocketFactory(
createInsecureSslContext(),
new String[]{"TLSv1.2"},
new String[]{"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"},
-
new TrustAllHosts() ) )
.build();
HttpGet request = new HttpGet( serviceUrl );
@@ -261,8 +255,6 @@ public class GatewaySslFuncTest {
try {
client = HttpClients.custom()
- .setHostnameVerifier( new TrustAllHosts() )
- .setSslcontext( createInsecureSslContext() )
.setSSLSocketFactory(
new SSLConnectionSocketFactory(
createInsecureSslContext(),
@@ -278,8 +270,6 @@ public class GatewaySslFuncTest {
}
client = HttpClients.custom()
- .setHostnameVerifier( new TrustAllHosts() )
- .setSslcontext( createInsecureSslContext() )
.setSSLSocketFactory(
new SSLConnectionSocketFactory(
createInsecureSslContext(),
@@ -295,26 +285,11 @@ public class GatewaySslFuncTest {
LOG_EXIT();
}
- public static class TrustAllHosts implements X509HostnameVerifier {
- @Override
- public void verify( String host, SSLSocket ssl ) throws IOException {
- // Trust all hostnames.
- }
-
- @Override
- public void verify( String host, X509Certificate cert ) throws SSLException {
- // Trust all hostnames.
- }
-
- @Override
- public void verify( String host, String[] cns, String[] subjectAlts ) throws SSLException {
- // Trust all hostnames.
- }
-
+ public static class TrustAllHosts implements HostnameVerifier {
@Override
public boolean verify( String host, SSLSession sslSession ) {
// Trust all hostnames.
- return false;
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/5f0bfdf8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f185dac..b1eb6c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,7 +739,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.6</version>
+ <version>4.5.2</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>