Update build configuration for RAP Tools 3.17.0 M2
- Use Eclipse Platform 4.20 I20210429-1800
- Make sure Eclipse Jetty 9.4.37 and all its dependencies are
distributed as part of the RAP Tools feature, including additional
javax.servlet bundles from Eclipse Orbit 2021-06.
Also upgrade Eclipse Tycho to 2.1.0 in order to fix launch errors when
executing the tests.
Change-Id: I58217d7b76d23da1bc52f5f059921b3e31ed80cc
diff --git a/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate b/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
index e716e3a..6ddf6f8 100644
--- a/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
@@ -1 +1 @@
-2021-03-08T12:00:00+00:00
+2021-05-05T12:00:00+00:00
diff --git a/features/org.eclipse.rap.tools.feature/feature.xml b/features/org.eclipse.rap.tools.feature/feature.xml
index 4492a45..895014f 100644
--- a/features/org.eclipse.rap.tools.feature/feature.xml
+++ b/features/org.eclipse.rap.tools.feature/feature.xml
@@ -98,17 +98,80 @@
unpack="false"/>
<plugin
+ id="org.eclipse.jetty.continuation"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.http"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.io"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.security"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.server"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.servlet"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.util"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.util.ajax"
+ download-size="0"
+ install-size="0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.37.v20210219"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="9.4.37.v20210219"
+ unpack="false"/>
+
+ <plugin
+ id="javax.servlet"
+ download-size="0"
+ install-size="0"
+ version="3.1.0.v201410161800"
unpack="false"/>
</feature>
diff --git a/releng/org.eclipse.rap.tools.build/pom.xml b/releng/org.eclipse.rap.tools.build/pom.xml
index 58bec7f..e133485 100644
--- a/releng/org.eclipse.rap.tools.build/pom.xml
+++ b/releng/org.eclipse.rap.tools.build/pom.xml
@@ -22,7 +22,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
- <tycho-version>2.0.0</tycho-version>
+ <tycho-version>2.1.0</tycho-version>
<signing-plugin-version>1.1.7</signing-plugin-version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/rap/org.eclipse.rap.tools.git</tycho.scmUrl>
<!-- disabled due to bug 393977
diff --git a/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target b/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
index 2213fa2..4518df8 100644
--- a/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
+++ b/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
@@ -7,32 +7,35 @@
<repository location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.1200.v20210226-1447"/>
- <unit id="org.eclipse.e4.rcp.feature.group" version="4.19.0.v20210302-1107"/>
- <unit id="org.eclipse.e4.rcp.source.feature.group" version="4.19.0.v20210302-1107"/>
- <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.701.v20201027-0550"/>
- <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.500.v20200812-2314"/>
- <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1702.v20201025-2315"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.702.v20201025-2303"/>
- <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.400.v20200812-2314"/>
- <unit id="org.eclipse.emf.common.feature.group" version="2.22.0.v20210114-1734"/>
- <unit id="org.eclipse.emf.ecore.feature.group" version="2.23.0.v20200630-0516"/>
- <unit id="org.eclipse.help.feature.group" version="2.3.500.v20210303-1800"/>
- <unit id="org.eclipse.help.source.feature.group" version="2.3.500.v20210303-1800"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.18.700.v20210303-1800"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="3.18.700.v20210303-1800"/>
- <unit id="org.eclipse.pde.feature.group" version="3.14.700.v20210303-1800"/>
- <unit id="org.eclipse.pde.source.feature.group" version="3.14.700.v20210303-1800"/>
- <unit id="org.eclipse.platform.feature.group" version="4.19.0.v20210303-1800"/>
- <unit id="org.eclipse.platform.source.feature.group" version="4.19.0.v20210303-1800"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.19.0.v20210303-1800"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="4.19.0.v20210303-1800"/>
- <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
+ <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.1300.v20210429-1243"/>
+ <unit id="org.eclipse.e4.rcp.feature.group" version="4.20.0.v20210429-1609"/>
+ <unit id="org.eclipse.e4.rcp.source.feature.group" version="4.20.0.v20210429-1609"/>
+ <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.701.v20210326-0550"/>
+ <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.500.v20210320-0209"/>
+ <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1702.v20210326-0343"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.702.v20210326-0550"/>
+ <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.400.v20210320-0251"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.22.0.v20210319-0732"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.24.0.v20210405-0628"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210429-2046"/>
+ <unit id="org.eclipse.jdt.source.feature.group" version="3.18.800.v20210429-2046"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.14.800.v20210429-1800"/>
+ <unit id="org.eclipse.pde.source.feature.group" version="3.14.800.v20210429-1800"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.20.0.v20210429-1800"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.20.0.v20210429-1800"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.20.0.v20210429-1800"/>
+ <unit id="org.eclipse.rcp.source.feature.group" version="4.20.0.v20210429-1800"/>
+ <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/I20210429-1800/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
</location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-06/"/>
+ <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+ <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
+ </location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-</target>
+</target>
\ No newline at end of file
