TCI - Update to release 2021-06

Change-Id: I27c6c593db5c8efe32f7bc20ce0d2a58192b5443
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
index 64a2ef1..4fbac25 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
@@ -13,7 +13,7 @@
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2021-03"/>
+<repository location="http://download.eclipse.org/releases/2021-06"/>
 </location>
 </locations>
 </target>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
index 0e2a6e8..f3d82ea 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
@@ -13,7 +13,7 @@
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2021-03"/>
+<repository location="http://download.eclipse.org/releases/2021-06"/>
 </location>
 </locations>
 </target>
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.target b/releng/org.eclipse.emf.ecp.target.next/next.target
index 6b115cd..c1f8eb0 100644
--- a/releng/org.eclipse.emf.ecp.target.next/next.target
+++ b/releng/org.eclipse.emf.ecp.target.next/next.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RCP" sequenceNumber="1620988272">
+<target name="ECP RCP" sequenceNumber="1626697745">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.21-I-builds/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -75,7 +75,7 @@
       <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/2021-06"/>
+      <repository location="http://download.eclipse.org/releases/2021-09"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.tpd b/releng/org.eclipse.emf.ecp.target.next/next.tpd
index e8da266..8a9b6d9 100644
--- a/releng/org.eclipse.emf.ecp.target.next/next.tpd
+++ b/releng/org.eclipse.emf.ecp.target.next/next.tpd
@@ -10,7 +10,7 @@
 	org.eclipse.swtbot.feature.group lazy
 }
 
-location "https://download.eclipse.org/eclipse/updates/4.20-I-builds/" {
+location "https://download.eclipse.org/eclipse/updates/4.21-I-builds/" {
 	org.eclipse.equinox.sdk.feature.group lazy
 	org.eclipse.platform.ide lazy
 }
@@ -54,7 +54,7 @@
 	org.eclipse.nebula.widgets.grid.feature.feature.group lazy
 }
 
-location "http://download.eclipse.org/releases/2021-06" {
+location "http://download.eclipse.org/releases/2021-09" {
 	org.eclipse.emf.cdo.sdk.feature.group lazy
 	org.eclipse.emf.sdk.feature.group lazy
 	org.eclipse.emf.transaction.sdk.feature.group lazy
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index 0294424..9dda196 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP" sequenceNumber="1616590745">
+<target name="ECP RAP" sequenceNumber="1626699396">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,29 +14,13 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
+      <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
       <repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
-      <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
-      <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
-      <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.h2" version="1.3.168.v201212121212"/>
-      <unit id="org.h2.source" version="1.3.168.v201212121212"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="0.0.0"/>
       <repository location="http://download.eclipse.org/edapt/releases/14x"/>
@@ -65,7 +49,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <repository location="http://download.eclipse.org/releases/2021-03"/>
+      <repository location="http://download.eclipse.org/releases/2021-06"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
@@ -77,5 +61,22 @@
       <unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.0.0"/>
       <repository location="http://download.eclipse.org/emfstore/releases_19"/>
     </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="javax.servlet" version="0.0.0"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
+      <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
+      <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
+      <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+      <unit id="org.h2" version="1.3.168.v201212121212"/>
+      <unit id="org.h2.source" version="1.3.168.v201212121212"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
+      <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+      <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+    </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
index 93a5874..61ec5f4 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
@@ -4,7 +4,7 @@
 
 include "../org.eclipse.emf.ecp.target.rcp/ecp.tpd"
 
-location "http://download.eclipse.org/releases/2021-03" {
+location "http://download.eclipse.org/releases/2021-06" {
 	org.eclipse.rap.equinox.target.feature.feature.group lazy
 	org.eclipse.rap.feature.feature.group lazy
 	org.eclipse.rap.sdk.feature.feature.group lazy
@@ -15,7 +15,9 @@
 	org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group lazy
 }
 
-
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/" {
+	javax.servlet lazy
+}
 
 
 
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index e4900a0..c7cff39 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP with ECP" sequenceNumber="1616590749">
+<target name="ECP RAP with ECP" sequenceNumber="1626697708">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
+      <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
@@ -65,7 +65,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <repository location="http://download.eclipse.org/releases/2021-03"/>
+      <repository location="http://download.eclipse.org/releases/2021-06"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
index e543599..7467275 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RCP" sequenceNumber="1616590745">
+<target name="ECP RCP" sequenceNumber="1626697701">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
+      <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -70,7 +70,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <repository location="http://download.eclipse.org/releases/2021-03"/>
+      <repository location="http://download.eclipse.org/releases/2021-06"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
index 363b0da..8644d41 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
@@ -10,7 +10,7 @@
 	org.eclipse.swtbot.feature.group lazy
 }
 
-location "http://download.eclipse.org/eclipse/updates/4.19" {
+location "http://download.eclipse.org/eclipse/updates/4.20" {
 	org.eclipse.equinox.sdk.feature.group lazy
 	org.eclipse.platform.ide lazy
 }
@@ -53,7 +53,7 @@
 	org.eclipse.nebula.widgets.grid.feature.feature.group lazy
 }
 
-location "http://download.eclipse.org/releases/2021-03" {
+location "http://download.eclipse.org/releases/2021-06" {
 	org.eclipse.emf.cdo.sdk.feature.group lazy
 	org.eclipse.emf.sdk.feature.group lazy
 	org.eclipse.emf.transaction.sdk.feature.group lazy
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
index 0e6b994..f60aab7 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="emfforms_spreadsheet" sequenceNumber="1616590747">
+<target name="emfforms_spreadsheet" sequenceNumber="1626697710">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
+      <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -54,7 +54,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <repository location="http://download.eclipse.org/releases/2021-03"/>
+      <repository location="http://download.eclipse.org/releases/2021-06"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.commons.codec" version="0.0.0"/>