diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2012-07-23 23:42:13 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2012-07-23 23:42:13 +0000 |
| commit | 691bd278f6f49b4bb0ec7457715b57793cdea663 (patch) | |
| tree | 83163c2b43066334e2992e00117c723e5b43afc1 /sca-java-2.x/trunk/modules | |
| parent | 9454a826a6b61f6304e92fe2ca239a05ed1d274b (diff) | |
Upgrade http client version to handle https://issues.apache.org/jira/browse/HTTPCLIENT-1138
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1364844 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules')
6 files changed, 9 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml index 31476104b5..51bf52532b 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml index 31398c2c1e..28a9f35f07 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml index fd042f5b11..46dafac285 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml @@ -81,7 +81,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml index 1f2528e12c..b06e2b9204 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml @@ -184,7 +184,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/host-http/pom.xml b/sca-java-2.x/trunk/modules/host-http/pom.xml index 2c1460aaa2..fd920692ad 100644 --- a/sca-java-2.x/trunk/modules/host-http/pom.xml +++ b/sca-java-2.x/trunk/modules/host-http/pom.xml @@ -46,14 +46,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.1.3</version> + <version>4.2.1</version> <optional>true</optional> </dependency> diff --git a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java index fe9fd49b56..8c9b1f3774 100644 --- a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java +++ b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java @@ -64,9 +64,10 @@ public class HttpClientFactory implements LifeCycleListener { HttpConnectionParams.setConnectionTimeout(defaultParameters, 60000); HttpConnectionParams.setSoTimeout(defaultParameters, 60000); + // See https://issues.apache.org/jira/browse/HTTPCLIENT-1138 SchemeRegistry supportedSchemes = new SchemeRegistry(); - supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, PlainSocketFactory.getSocketFactory(), 80)); - supportedSchemes.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443)); + supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, 80, PlainSocketFactory.getSocketFactory())); + supportedSchemes.register(new Scheme("https", 443, SSLSocketFactory.getSocketFactory())); ClientConnectionManager connectionManager = new ThreadSafeClientConnManager(defaultParameters, supportedSchemes); |