target: update Orbit feature versions for compatibility with 2020-03 platform
diff --git a/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
index 267086f..b2c4063 100644
--- a/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.hawk.core,
- org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
- org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
- org.apache.httpcomponents.httpcore.nio;bundle-version="4.1.0"
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.10",
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
+ org.apache.httpcomponents.httpcore-nio;bundle-version="4.4.5"
Export-Package: org.eclipse.hawk.http
Automatic-Module-Name: org.eclipse.hawk.http
diff --git a/core/releng/org.eclipse.hawk.targetplatform/org.eclipse.hawk.targetplatform.target b/core/releng/org.eclipse.hawk.targetplatform/org.eclipse.hawk.targetplatform.target
index 66cc2f4..15d3e69 100644
--- a/core/releng/org.eclipse.hawk.targetplatform/org.eclipse.hawk.targetplatform.target
+++ b/core/releng/org.eclipse.hawk.targetplatform/org.eclipse.hawk.targetplatform.target
@@ -69,18 +69,16 @@
<unit id="ch.qos.logback.classic.source" version="1.0.7.v20121108-1250"/>
<unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
<unit id="ch.qos.logback.core.source" version="1.0.7.v20121108-1250"/>
- <unit id="ch.qos.logback.slf4j" version="1.0.7.v20121108-1250"/>
- <unit id="ch.qos.logback.slf4j.source" version="1.0.7.v20121108-1250"/>
+ <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
+ <unit id="ch.qos.logback.slf4j.source" version="1.0.7.v201505121915"/>
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
- <unit id="com.google.guava" version="15.0.0.v201403281430"/>
- <unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
- <unit id="com.google.inject" version="3.0.0.v201312141243"/>
- <unit id="com.google.inject.source" version="3.0.0.v201312141243"/>
+ <unit id="com.google.inject" version="3.0.0.v201605172100"/>
+ <unit id="com.google.inject.source" version="3.0.0.v201605172100"/>
<unit id="com.google.inject.assistedinject" version="3.0.0.v201402270930"/>
<unit id="com.google.inject.assistedinject.source" version="3.0.0.v201402270930"/>
- <unit id="com.google.inject.multibindings" version="3.0.0.v201402270930"/>
- <unit id="com.google.inject.multibindings.source" version="3.0.0.v201402270930"/>
+ <unit id="com.google.inject.multibindings" version="3.0.0.v201605172100"/>
+ <unit id="com.google.inject.multibindings.source" version="3.0.0.v201605172100"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<unit id="io.github.classgraph.source" version="4.8.35.v20190528-1517"/>
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -89,10 +87,10 @@
<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
- <unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
- <unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
- <unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
- <unit id="org.apache.commons.collections.source" version="3.2.0.v2013030210310"/>
+ <unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
+ <unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
+ <unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
+ <unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.csv" version="1.4.0.v20190617-1333"/>
<unit id="org.apache.commons.csv.source" version="1.4.0.v20190617-1333"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
@@ -101,12 +99,12 @@
<unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
<unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201411290715"/>
- <unit id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
- <unit id="org.apache.httpcomponents.httpcore.source" version="4.3.3.v201411290715"/>
- <unit id="org.apache.httpcomponents.httpcore.nio" version="4.1.0.v201101201700"/>
- <unit id="org.apache.httpcomponents.httpcore.nio.source" version="4.1.0.v201101201700"/>
+ <unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
+ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
+ <unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
+ <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
+ <unit id="org.apache.httpcomponents.httpcore-nio" version="4.4.5.v20190709-1738"/>
+ <unit id="org.apache.httpcomponents.httpcore-nio.source" version="4.4.5.v20190709-1738"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.mockito" version="2.23.0.v20190527-1420"/>
diff --git a/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
index 600997a..dd82233 100644
--- a/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.thrift;bundle-version="[0.9.3,0.9.3]",
org.slf4j.api;bundle-version="1.7.2",
- org.apache.httpcomponents.httpclient;bundle-version="4.3.6";resolution:=optional,
- org.apache.httpcomponents.httpcore;bundle-version="4.3.3";resolution:=optional,
- org.eclipse.hawk.service.artemis;bundle-version="1.0.0",
- com.google.guava;bundle-version="15.0.0",
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.10";resolution:=optional,
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.12";resolution:=optional,
+ org.eclipse.hawk.service.artemis;bundle-version="2.0.0",
+ com.google.guava;bundle-version="27.1.0",
javax.annotation;bundle-version="1.2.0"
Export-Package: org.eclipse.hawk.service.api,
org.eclipse.hawk.service.api.utils
diff --git a/server/releng/org.eclipse.hawk.service.api.feature/feature.xml b/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
index 46a9ff2..cf9245f 100644
--- a/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
@@ -237,7 +237,7 @@
unpack="false"/>
<plugin
- id="org.apache.httpcomponents.httpcore.nio"
+ id="org.apache.httpcomponents.httpcore-nio"
download-size="0"
install-size="0"
version="0.0.0"
