summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-02-23 09:25:57 (EST)
committer Steffen Pingel2012-02-23 09:25:57 (EST)
commite82a90e5564b69b03d32a5de303c913fe7da8b50 (patch)
tree827913af1750dfd44da739eca6669f23cb321a0c
parent9196304288e70af2110da4af830da57e09e0c460 (diff)
downloadorg.eclipse.mylyn.commons-e82a90e5564b69b03d32a5de303c913fe7da8b50.zip
org.eclipse.mylyn.commons-e82a90e5564b69b03d32a5de303c913fe7da8b50.tar.gz
org.eclipse.mylyn.commons-e82a90e5564b69b03d32a5de303c913fe7da8b50.tar.bz2
NEW - bug 371747: consume latest version of HttpCore and HttpClient
https://bugs.eclipse.org/bugs/show_bug.cgi?id=371747 Change-Id: I7e839eb4ae8362660501657627beca6ad7d28ead
-rw-r--r--org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF36
-rw-r--r--org.eclipse.mylyn.commons.repositories.http.core/src/org/eclipse/mylyn/commons/repositories/http/core/CommonHttpClient.java5
-rw-r--r--org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF34
3 files changed, 38 insertions, 37 deletions
diff --git a/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
index 09badac..2893642 100644
--- a/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
@@ -15,21 +15,21 @@ Export-Package: org.eclipse.mylyn.commons.repositories.http.core;x-internal:=tru
org.eclipse.mylyn.internal.commons.repositories.http.core;x-internal:=true
Bundle-Localization: plugin
Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)",
- org.apache.http;version="4.1.0",
- org.apache.http.impl;version="4.1.0",
- org.apache.http.auth;version="4.1.0",
- org.apache.http.auth.params;version="4.1.0",
- org.apache.http.impl.auth;version="4.1.0",
- org.apache.http.util;version="4.1.0",
- org.apache.http.client;version="4.1.0",
- org.apache.http.client.methods;version="4.1.0",
- org.apache.http.client.params;version="4.1.0",
- org.apache.http.client.protocol;version="4.1.0",
- org.apache.http.conn;version="4.1.0",
- org.apache.http.conn.params;version="4.1.0",
- org.apache.http.conn.scheme;version="4.1.0",
- org.apache.http.impl.client;version="4.1.0",
- org.apache.http.impl.conn.tsccm;version="4.1.0",
- org.apache.http.message;version="4.1.0",
- org.apache.http.params;version="4.1.0",
- org.apache.http.protocol;version="4.1.0"
+ org.apache.http;version="4.1.4",
+ org.apache.http.message;version="4.1.4",
+ org.apache.http.params;version="4.1.4",
+ org.apache.http.protocol;version="4.1.4",
+ org.apache.http.util;version="4.1.4",
+ org.apache.http.impl;version="4.1.4",
+ org.apache.http.auth;version="4.1.2",
+ org.apache.http.auth.params;version="4.1.2",
+ org.apache.http.client;version="4.1.2",
+ org.apache.http.client.methods;version="4.1.2",
+ org.apache.http.client.params;version="4.1.2",
+ org.apache.http.client.protocol;version="4.1.2",
+ org.apache.http.conn;version="4.1.2",
+ org.apache.http.conn.params;version="4.1.2",
+ org.apache.http.conn.scheme;version="4.1.2",
+ org.apache.http.impl.auth;version="4.1.2",
+ org.apache.http.impl.conn.tsccm;version="4.1.2",
+ org.apache.http.impl.client;version="4.1.2"
diff --git a/org.eclipse.mylyn.commons.repositories.http.core/src/org/eclipse/mylyn/commons/repositories/http/core/CommonHttpClient.java b/org.eclipse.mylyn.commons.repositories.http.core/src/org/eclipse/mylyn/commons/repositories/http/core/CommonHttpClient.java
index c070178..7b8093b 100644
--- a/org.eclipse.mylyn.commons.repositories.http.core/src/org/eclipse/mylyn/commons/repositories/http/core/CommonHttpClient.java
+++ b/org.eclipse.mylyn.commons.repositories.http.core/src/org/eclipse/mylyn/commons/repositories/http/core/CommonHttpClient.java
@@ -25,7 +25,7 @@ import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.AbstractHttpClient;
import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.ContentEncodingHttpClient;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.SyncBasicHttpContext;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -158,8 +158,7 @@ public class CommonHttpClient {
}
protected AbstractHttpClient createHttpClient(String userAgent) {
- // disabled due to https://issues.apache.org/jira/browse/HTTPCORE-257: new ContentEncodingHttpClient() {
- AbstractHttpClient client = new DefaultHttpClient() {
+ AbstractHttpClient client = new ContentEncodingHttpClient() {
@Override
protected ClientConnectionManager createClientConnectionManager() {
return CommonHttpClient.this.createHttpClientConnectionManager();
diff --git a/org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF
index dac284a..7ce61fc 100644
--- a/org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF
@@ -14,19 +14,21 @@ Require-Bundle: org.eclipse.core.runtime,
Export-Package: org.eclipse.mylyn.commons.repositories.http.tests;x-internal:=true
Bundle-Vendor: Eclipse Mylyn
Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)",
- org.apache.http;version="4.1.0",
- org.apache.http.auth;version="4.1.0",
- org.apache.http.auth.params;version="4.1.0",
- org.apache.http.client;version="4.1.0",
- org.apache.http.client.methods;version="4.1.0",
- org.apache.http.client.params;version="4.1.0",
- org.apache.http.conn;version="4.1.0",
- org.apache.http.conn.params;version="4.1.0",
- org.apache.http.conn.scheme;version="4.1.0",
- org.apache.http.impl.client;version="4.1.0",
- org.apache.http.impl.conn;version="4.1.0",
- org.apache.http.impl.conn.tsccm;version="4.1.0",
- org.apache.http.message;version="4.1.0",
- org.apache.http.params;version="4.1.0",
- org.apache.http.protocol;version="4.1.0",
- org.apache.http.util;version="4.1.0"
+ org.apache.http;version="4.1.4",
+ org.apache.http.message;version="4.1.4",
+ org.apache.http.params;version="4.1.4",
+ org.apache.http.protocol;version="4.1.4",
+ org.apache.http.util;version="4.1.4",
+ org.apache.http.impl;version="4.1.4",
+ org.apache.http.auth;version="4.1.2",
+ org.apache.http.auth.params;version="4.1.2",
+ org.apache.http.client;version="4.1.2",
+ org.apache.http.client.methods;version="4.1.2",
+ org.apache.http.client.params;version="4.1.2",
+ org.apache.http.client.protocol;version="4.1.2",
+ org.apache.http.conn;version="4.1.2",
+ org.apache.http.conn.params;version="4.1.2",
+ org.apache.http.conn.scheme;version="4.1.2",
+ org.apache.http.impl.auth;version="4.1.2",
+ org.apache.http.impl.conn.tsccm;version="4.1.2",
+ org.apache.http.impl.client;version="4.1.2"