Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-11-30 23:01:15 -0500
committerslewis2014-11-30 23:01:15 -0500
commitcb28ea9483ca52fab7cee054b042348b3c7daf61 (patch)
tree32b87ecffbadd497975b5473c92ecea06f2d5f8d
parent1ffee62cc74adac82f7c8bd77a113d0367e67724 (diff)
downloadorg.eclipse.ecf-cb28ea9483ca52fab7cee054b042348b3c7daf61.tar.gz
org.eclipse.ecf-cb28ea9483ca52fab7cee054b042348b3c7daf61.tar.xz
org.eclipse.ecf-cb28ea9483ca52fab7cee054b042348b3c7daf61.zip
Changes to support using httpclient 4.3.6 and httpcore 4.3.3 in
preparation for Mars M4 platform build. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=448916 Change-Id: I3edf6a0ca751743ab4b8a73bbd54039c975bd4ae
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF24
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF4
-rw-r--r--releng/org.eclipse.ecf.releng.bm/ecf.rmap6
3 files changed, 17 insertions, 17 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF
index ff1d95b16..cb3cbb55d 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF
@@ -14,18 +14,18 @@ Export-Package: org.eclipse.ecf.internal.remoteservice.rest;x-internal:=true,
org.eclipse.ecf.remoteservice.rest.client;version="2.2.300",
org.eclipse.ecf.remoteservice.rest.identity;version="2.2.200",
org.eclipse.ecf.remoteservice.rest.util;version="2.2.200"
-Import-Package: org.apache.http;version="4.1.2",
- org.apache.http.auth;version="4.1.2",
- org.apache.http.client;version="4.1.2",
- org.apache.http.client.entity;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.utils;version="4.3.4",
- org.apache.http.entity;version="4.1.2",
- org.apache.http.impl.auth;version="4.1.2",
- org.apache.http.impl.client;version="4.1.2",
- org.apache.http.message;version="4.1.2",
- org.apache.http.params;version="4.1.2",
+Import-Package: org.apache.http;version="4.3",
+ org.apache.http.auth;version="4.3",
+ org.apache.http.client;version="4.3",
+ org.apache.http.client.entity;version="4.3",
+ org.apache.http.client.methods;version="4.3",
+ org.apache.http.client.params;version="4.3",
+ org.apache.http.client.utils;version="4.3",
+ org.apache.http.entity;version="4.3",
+ org.apache.http.impl.auth;version="4.3",
+ org.apache.http.impl.client;version="4.3",
+ org.apache.http.message;version="4.3",
+ org.apache.http.params;version="4.3",
org.apache.http.util,
org.eclipse.ecf.remoteservice;version="6.0.0",
org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
index e407ac09c..6f0dac7f9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.equinox.common,
org.eclipse.ecf.provider.filetransfer,
org.eclipse.ecf,
org.eclipse.ecf.filetransfer,
- org.apache.httpcomponents.httpclient;bundle-version="[4.1.2.v201203221030,4.4)",
- org.apache.httpcomponents.httpcore;bundle-version="[4.1.4.v201203221030,4.4)"
+ org.apache.httpcomponents.httpclient;bundle-version="[4.3,4.4)",
+ org.apache.httpcomponents.httpcore;bundle-version="[4.3,4.4)"
Eclipse-LazyStart: true
Import-Package: org.apache.http;version="4.1.0",
org.apache.http.auth;version="4.1.0",
diff --git a/releng/org.eclipse.ecf.releng.bm/ecf.rmap b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
index c303dfed9..f12eeef36 100644
--- a/releng/org.eclipse.ecf.releng.bm/ecf.rmap
+++ b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
@@ -134,12 +134,12 @@
</rm:provider>
</rm:searchPath>
<rm:searchPath name="default">
- <!-- Added to allow creation of httpclient 4.3.x based version of ECF filetransfer. See -->
- <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=426382 -->
+ <!-- Changed to allow creation of httpclient 4.3.x based version of ECF filetransfer for Mars M4. See -->
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=448916 -->
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="http://build.eclipse.org/orbit/committers/orbit-I/20140918055458/I20140918055458/repository/"/>
+ <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/I20141129202728/repository/"/>
</rm:provider>
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">

Back to the top