Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Reckord2015-03-25 19:36:14 +0000
committerCarsten Reckord2015-03-25 19:39:41 +0000
commitcb979f332043646af8d1ae0f30e4de0e4aaf526d (patch)
tree194f917de633e1dbbf4464e07272f80261175542
parentffe112479333df64afb1f003e1397c4819bc5e84 (diff)
downloadorg.eclipse.epp.mpc-cb979f332043646af8d1ae0f30e4de0e4aaf526d.tar.gz
org.eclipse.epp.mpc-cb979f332043646af8d1ae0f30e4de0e4aaf526d.tar.xz
org.eclipse.epp.mpc-cb979f332043646af8d1ae0f30e4de0e4aaf526d.zip
435777: Explicitly require current Apache HTTP Client version
Bug: 435777 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=435777
-rw-r--r--org.eclipse.epp.mpc-parent/feature/pom.xml2
-rw-r--r--org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF20
-rw-r--r--org.eclipse.epp.mpc.feature/feature.xml15
3 files changed, 27 insertions, 10 deletions
diff --git a/org.eclipse.epp.mpc-parent/feature/pom.xml b/org.eclipse.epp.mpc-parent/feature/pom.xml
index 40b3257c..a674cebc 100644
--- a/org.eclipse.epp.mpc-parent/feature/pom.xml
+++ b/org.eclipse.epp.mpc-parent/feature/pom.xml
@@ -21,6 +21,8 @@
<configuration>
<excludes>
<plugin id="org.eclipse.epp.mpc.help.ui" />
+ <plugin id="org.apache.httpcomponents.httpclient"/>
+ <plugin id="org.apache.httpcomponents.httpcore"/>
</excludes>
</configuration>
</plugin>
diff --git a/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
index 5dab4418..25a78472 100644
--- a/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
@@ -19,16 +19,16 @@ Export-Package: org.eclipse.epp.internal.mpc.core;x-friends:="org.eclipse.epp.mp
org.eclipse.epp.internal.mpc.core.util;x-friends:="org.eclipse.epp.mpc.ui",
org.eclipse.epp.mpc.core.model,
org.eclipse.epp.mpc.core.service
-Import-Package: org.apache.http;version="4.1.0",
- org.apache.http.auth;version="4.1.0",
- org.apache.http.client;version="4.1.0",
- org.apache.http.client.entity;version="4.1.0",
- org.apache.http.client.methods;version="4.1.0",
- org.apache.http.conn;version="4.1.0",
- org.apache.http.conn.params;version="4.1.0",
- org.apache.http.impl.client;version="4.1.0",
- org.apache.http.message;version="4.1.0",
- org.apache.http.params;version="4.1.0",
+Import-Package: org.apache.http;version="4.3.0",
+ org.apache.http.auth;version="4.3.0",
+ org.apache.http.client;version="4.3.0",
+ org.apache.http.client.entity;version="4.3.0",
+ org.apache.http.client.methods;version="4.3.0",
+ org.apache.http.conn;version="4.3.0",
+ org.apache.http.conn.params;version="4.3.0",
+ org.apache.http.impl.client;version="4.3.0",
+ org.apache.http.message;version="4.3.0",
+ org.apache.http.params;version="4.3.0",
org.eclipse.equinox.p2.core;version="2.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.epp.internal.mpc.core.MarketplaceClientCorePlugin
diff --git a/org.eclipse.epp.mpc.feature/feature.xml b/org.eclipse.epp.mpc.feature/feature.xml
index 86809f9b..dd338291 100644
--- a/org.eclipse.epp.mpc.feature/feature.xml
+++ b/org.eclipse.epp.mpc.feature/feature.xml
@@ -44,4 +44,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>

Back to the top