Target platform updates
* Add a 2020-03 target platform to verify build against the latest
release of the platform
* Update to the permanent R-build of Orbit from S-build
* Allow filetransfer tests to run on photon and oxygen target
platforms
* Don't treat o.e.ecf.tests.filetransfer.httpserver as a test
bundle since it just defines a test server for tests and contains
no actual tests
* Update to latest version of build-helper-maven-plugin in target
platform module
Change-Id: I0bf66876897973e05a3e06e50ec68a661dc3574a
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target b/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
index dfe5833..593dec8 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
@@ -39,7 +39,7 @@
<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200224183213/repository"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.16.0.v20181104-0733"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target b/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
index e052acf..bc643bd 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
@@ -39,7 +39,7 @@
<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200224183213/repository"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.17.0.v20190323-1059"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2020-03.target b/releng/org.eclipse.ecf.releng.target/ecf-2020-03.target
new file mode 100644
index 0000000..7232699
--- /dev/null
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2020-03.target
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="2020-03" sequenceNumber="26">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
+<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
+<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.logging" version="1.2.0.v20180409-1502"/>
+<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/>
+<unit id="org.objectweb.asm.source" version="7.2.0.v20191010-1910"/>
+<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.httpclient.win" version="4.5.10.v20200113-2105"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.10.v20200113-2105"/>
+<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="com.sun.jna" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.19.0.v20200205-0529"/>
+<unit id="org.eclipse.emf.edit.ui.source.feature.group" version="2.19.0.v20200205-0529"/>
+<unit id="org.eclipse.pde.feature.group" version="3.14.300.v20200226-1800"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.14.300.v20200226-1800"/>
+<unit id="org.eclipse.platform.feature.group" version="4.15.0.v20200226-1800"/>
+<unit id="org.eclipse.platform.source.feature.group" version="4.15.0.v20200226-1800"/>
+<repository location="http://download.eclipse.org/releases/2020-03"/>
+</location>
+</locations>
+</target>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
index ee61e6d..92bdb7e 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Oxygen" sequenceNumber="22">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Oxygen" sequenceNumber="23">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -7,13 +9,15 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
-<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
-<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
+<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.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -23,17 +27,19 @@
<unit id="org.json" version="1.0.0.v201011060100"/>
<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.win" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
- <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
- <unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform.source" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.source" version="4.5.1.v20180403-1933"/>
+<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/>
+<unit id="org.objectweb.asm.source" version="7.2.0.v20191010-1910"/>
+<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.httpclient.win" version="4.5.10.v20200113-2105"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.10.v20200113-2105"/>
+<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="com.sun.jna" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.13.0.v20170609-0928"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-photon.target b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
index d9c85ad..432df93 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-photon.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Photon" sequenceNumber="25">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Photon" sequenceNumber="26">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -7,13 +9,15 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
-<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
-<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
+<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.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -23,17 +27,19 @@
<unit id="org.json" version="1.0.0.v201011060100"/>
<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.win" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
- <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
- <unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform.source" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.source" version="4.5.1.v20180403-1933"/>
+<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/>
+<unit id="org.objectweb.asm.source" version="7.2.0.v20191010-1910"/>
+<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.httpclient.win" version="4.5.10.v20200113-2105"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.10.v20200113-2105"/>
+<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="com.sun.jna" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.14.0.v20180213-0527"/>
diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml
index 9b0cc13..8047108 100644
--- a/releng/org.eclipse.ecf.releng.target/pom.xml
+++ b/releng/org.eclipse.ecf.releng.target/pom.xml
@@ -20,7 +20,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -65,6 +65,11 @@
<type>target</type>
<classifier>ecf-2019-09</classifier>
</artifact>
+ <artifact>
+ <file>ecf-2020-03.target</file>
+ <type>target</type>
+ <classifier>ecf-2020-03</classifier>
+ </artifact>
</artifacts>
</configuration>
</execution>
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml
index 1710f6b..7a55355 100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml
@@ -11,5 +11,5 @@
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.tests.filetransfer.httpserver</artifactId>
<version>1.0.101-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
+ <packaging>eclipse-plugin</packaging>
</project>
