Bug 572002: Update target definitions to Eclipse 2021-06 (M2)
Change-Id: I5e82f3bab88e28174dad81781ad24e3c66df1092
diff --git a/releng/pom.xml b/releng/pom.xml
index eca2362..5d759b7 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -49,7 +49,7 @@
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<statet.version>4.4.0</statet.version>
- <statet.target.id>E202103</statet.target.id>
+ <statet.target.id>E202106</statet.target.id>
<statet.build.timestamp>${maven.build.timestamp}</statet.build.timestamp>
<statet.build.id>${statet.build.timestamp}</statet.build.id>
diff --git a/releng/statet-repository/category.xml b/releng/statet-repository/category.xml
index f093b60..77086a1 100644
--- a/releng/statet-repository/category.xml
+++ b/releng/statet-repository/category.xml
@@ -107,14 +107,7 @@
<feature id="org.eclipse.statet.releng.3rdparty" version="0.0.0">
</feature>
- <bundle id="org.eclipse.jetty.util" version="0.0.0">
- <category name="org.eclipse.statet.libs"/>
- </bundle>
- <bundle id="org.eclipse.jetty.client" version="0.0.0">
- <category name="org.eclipse.statet.libs"/>
- </bundle>
- <bundle id="org.eclipse.jetty.proxy" version="0.0.0">
- <category name="org.eclipse.statet.libs"/>
- </bundle>
+ <feature id="org.eclipse.statet.releng.jetty" version="0.0.0">
+ </feature>
</site>
diff --git a/releng/target-eclipse.ide/target-eclipse.ide.target b/releng/target-eclipse.ide/target-eclipse.ide.target
index 79f3d29..8ed008b 100644
--- a/releng/target-eclipse.ide/target-eclipse.ide.target
+++ b/releng/target-eclipse.ide/target-eclipse.ide.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="StatET - Eclipse IDE 2021-03 - build">
+<target name="StatET - Eclipse IDE 2021-06 - build">
<locations>
<!-- Eclipse Platform (IDE) -->
@@ -8,10 +8,11 @@
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
- <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"/>
- <!-- repository location="https://download.eclipse.org/eclipse/updates/4.19milestones/S-4.19M1-"/> -->
- <!-- repository location="https://download.eclipse.org/eclipse/updates/4.19"/ -->
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20/R-4.20-"/ -->
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20milestones/S-4.20M1-"/> -->
+ <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/I20210429-1800"/>
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -23,7 +24,7 @@
includeConfigurePhase="false"
includeSource="true">
<repository location="https://download.eclipse.org/egit/updates-5.11"/>
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.jgit" version="0.0.0"/>
</location>
@@ -41,9 +42,9 @@
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/>
- <!-- repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S2021..."/ -->
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.26"/ -->
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202104270336"/>
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.emf.common" version="0.0.0"/>
<unit id="org.eclipse.emf.common.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.edit" version="0.0.0"/>
@@ -54,30 +55,13 @@
<unit id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
</location>
- <!-- Eclipse Jetty for RHelp -->
- <location type="InstallableUnit" includeMode="planner"
- includeAllPlatforms="false"
- includeConfigurePhase="false"
- includeSource="true">
- <repository location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219"/>
- <unit id="org.eclipse.jetty.server" version="0.0.0"/>
- <unit id="org.eclipse.jetty.http" version="0.0.0"/>
- <unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
- <unit id="org.eclipse.jetty.io" version="0.0.0"/>
- <unit id="org.eclipse.jetty.continuation" version="0.0.0"/>
- <unit id="org.eclipse.jetty.security" version="0.0.0"/>
- <unit id="org.eclipse.jetty.util" version="0.0.0"/>
- <unit id="org.eclipse.jetty.client" version="0.0.0"/>
- <unit id="org.eclipse.jetty.proxy" version="0.0.0"/>
- </location>
-
<!-- Eclipse Mylyn Docs for DocMlET Wikitext, ReDocs Wikitext -->
<location type="InstallableUnit" includeMode="planner"
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.39"/>
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.mylyn.wikitext" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.ui" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.textile" version="0.0.0"/>
@@ -91,13 +75,15 @@
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
</location>
- <!-- 3rd Party -->
+ <!-- 3rd Party
+ Eclipse Jetty for RHelp -->
<!-- location type="InstallableUnit" includeMode="planner"
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
<repository location="https://download.eclipse.org/..."/>
<unit id="org.eclipse.statet.releng.3rdparty.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.statet.releng.jetty.feature.group" version="0.0.0"/>
</location -->
</locations>
</target>
diff --git a/releng/target-eclipse.ide/ws-eclipse.ide.target b/releng/target-eclipse.ide/ws-eclipse.ide.target
index 10a05fd..3996486 100644
--- a/releng/target-eclipse.ide/ws-eclipse.ide.target
+++ b/releng/target-eclipse.ide/ws-eclipse.ide.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="StatET - Eclipse IDE 2021-03 - dev">
+<target name="StatET - Eclipse IDE 2021-06 - dev">
<locations>
<!-- Eclipse Platform (IDE) -->
@@ -8,10 +8,11 @@
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
- <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"/>
- <!-- repository location="https://download.eclipse.org/eclipse/updates/4.19milestones/S-4.19M1-"/> -->
- <!-- repository location="https://download.eclipse.org/eclipse/updates/4.19"/ -->
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20/R-4.20-"/ -->
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20milestones/S-4.20M1-"/> -->
+ <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/I20210429-1800"/>
+ <!-- repository location="https://download.eclipse.org/eclipse/updates/4.20"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -23,7 +24,7 @@
includeConfigurePhase="false"
includeSource="true">
<repository location="https://download.eclipse.org/egit/updates-5.11"/>
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.jgit" version="0.0.0"/>
</location>
@@ -41,9 +42,9 @@
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/>
- <!-- repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S2021..."/ -->
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.26"/ -->
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202104270336"/>
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.emf.common" version="0.0.0"/>
<unit id="org.eclipse.emf.common.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.edit" version="0.0.0"/>
@@ -54,30 +55,13 @@
<unit id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
</location>
- <!-- Eclipse Jetty for RHelp -->
- <location type="InstallableUnit" includeMode="planner"
- includeAllPlatforms="false"
- includeConfigurePhase="false"
- includeSource="true">
- <repository location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219"/>
- <unit id="org.eclipse.jetty.server" version="0.0.0"/>
- <unit id="org.eclipse.jetty.http" version="0.0.0"/>
- <unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
- <unit id="org.eclipse.jetty.io" version="0.0.0"/>
- <unit id="org.eclipse.jetty.continuation" version="0.0.0"/>
- <unit id="org.eclipse.jetty.security" version="0.0.0"/>
- <unit id="org.eclipse.jetty.util" version="0.0.0"/>
- <unit id="org.eclipse.jetty.client" version="0.0.0"/>
- <unit id="org.eclipse.jetty.proxy" version="0.0.0"/>
- </location>
-
<!-- Eclipse Mylyn Docs for DocMlET Wikitext, ReDocs Wikitext -->
<location type="InstallableUnit" includeMode="planner"
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.39"/>
- <!-- repository location="https://download.eclipse.org/releases/2021-03"/ -->
+ <!-- repository location="https://download.eclipse.org/releases/2021-06"/ -->
<unit id="org.eclipse.mylyn.wikitext" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.ui" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext.textile" version="0.0.0"/>
@@ -91,13 +75,15 @@
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
</location>
- <!-- 3rd Party -->
+ <!-- 3rd Party
+ Eclipse Jetty for RHelp -->
<location type="InstallableUnit" includeMode="planner"
includeAllPlatforms="false"
includeConfigurePhase="false"
includeSource="true">
<repository location="platform:/resource/org.eclipse.statet/3rdparty/_assemblies/repository/target/repository"/>
<unit id="org.eclipse.statet.releng.3rdparty.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.statet.releng.jetty.feature.group" version="0.0.0"/>
</location>
<location type="Profile" path="${eclipse_home}"/>
diff --git a/releng/tycho-1.7/pom.xml b/releng/tycho-1.7/pom.xml
index 2e760ce..d0678ed 100644
--- a/releng/tycho-1.7/pom.xml
+++ b/releng/tycho-1.7/pom.xml
@@ -49,7 +49,7 @@
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<statet.version>4.4.0</statet.version>
- <statet.target.id>E202103</statet.target.id>
+ <statet.target.id>E202106</statet.target.id>
<statet.build.timestamp>${maven.build.timestamp}</statet.build.timestamp>
<statet.build.id>${statet.build.timestamp}</statet.build.id>
