Bug 574370: Update target platform to 2021-06

Change-Id: I59653d8e7e8c0b88b10fa0cfb97af3011b1e877f
diff --git a/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.target b/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.target
index 3e9c380..180489a 100644
--- a/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.target
+++ b/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.target
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2020-12" sequenceNumber="1618484462">
+<target name="2021-06" sequenceNumber="1624342488">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.18.0.v20201202-1800"/>
-      <unit id="org.eclipse.rcp.feature.group" version="4.18.0.v20201202-1800"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.18.600.v20201202-1800"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.800.v20200916-1234"/>
-      <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="2.3.200.v202011230238"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.24.0.v20200917-1439"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.14.600.v20201202-1800"/>
-      <unit id="org.eclipse.jdt" version="3.18.600.v20201202-1800"/>
-      <repository id="eclipse-2020-12" location="http://download.eclipse.org/releases/2020-12/"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.20.0.v20210611-1600"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.20.0.v20210611-1600"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210611-1600"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.900.v20210418-1743"/>
+      <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="2.3.500.v202106021855"/>
+      <unit id="org.eclipse.emf.feature.group" version="2.26.0.v20210506-1425"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.14.800.v20210611-1636"/>
+      <unit id="org.eclipse.jdt" version="3.18.800.v20210611-1600"/>
+      <repository id="eclipse-2021-06" location="https://download.eclipse.org/releases/2021-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.mockito" version="2.23.0.v20200310-1642"/>
       <unit id="org.mozilla.javascript" version="1.7.10.v20190430-1943"/>
-      <repository id="eclipse-orbit-2020-12" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
+      <repository id="eclipse-orbit-2021-06" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ease.engine.jython.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.tpd b/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.tpd
index 4747f91..5b822f1 100644
--- a/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.tpd
+++ b/releng/org.eclipse.ease.releng.target/org.eclipse.ease.releng.target.tpd
@@ -1,8 +1,8 @@
-target "2020-12" with source requirements
+target "2021-06" with source requirements
 
 environment JavaSE-11
 
-location "http://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
+location "https://download.eclipse.org/releases/2021-06/" eclipse-2021-06 {
 	org.eclipse.platform.feature.group
 	org.eclipse.rcp.feature.group
 	org.eclipse.jdt.feature.group
@@ -19,7 +19,7 @@
 	org.eclipse.jdt
 }
 
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/" eclipse-orbit-2020-12 {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" eclipse-orbit-2021-06 {
 	// needed for unit tests
 	org.mockito [2.13.0,3.0.0)
 	org.mozilla.javascript [1.7.10,1.8.0)
diff --git a/releng/org.eclipse.ease.releng.target/previous targets/2020-12.target b/releng/org.eclipse.ease.releng.target/previous targets/2020-12.target
new file mode 100644
index 0000000..3e9c380
--- /dev/null
+++ b/releng/org.eclipse.ease.releng.target/previous targets/2020-12.target
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="2020-12" sequenceNumber="1618484462">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="4.18.0.v20201202-1800"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.18.0.v20201202-1800"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.600.v20201202-1800"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.800.v20200916-1234"/>
+      <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="2.3.200.v202011230238"/>
+      <unit id="org.eclipse.emf.feature.group" version="2.24.0.v20200917-1439"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.14.600.v20201202-1800"/>
+      <unit id="org.eclipse.jdt" version="3.18.600.v20201202-1800"/>
+      <repository id="eclipse-2020-12" location="http://download.eclipse.org/releases/2020-12/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+      <unit id="org.mozilla.javascript" version="1.7.10.v20190430-1943"/>
+      <repository id="eclipse-orbit-2020-12" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.engine.jython.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.engine.groovy.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.engine.jruby.feature.feature.group" version="0.0.0"/>
+      <repository id="ease-engines" location="https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.py4j.feature.feature.group" version="0.0.0"/>
+      <repository id="py4j-eclipse" location="http://eclipse.py4j.org/"/>
+    </location>
+  </locations>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+</target>
diff --git a/releng/org.eclipse.ease.releng.target/previous targets/2020-12.tpd b/releng/org.eclipse.ease.releng.target/previous targets/2020-12.tpd
new file mode 100644
index 0000000..4747f91
--- /dev/null
+++ b/releng/org.eclipse.ease.releng.target/previous targets/2020-12.tpd
@@ -0,0 +1,39 @@
+target "2020-12" with source requirements
+
+environment JavaSE-11
+
+location "http://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
+	org.eclipse.platform.feature.group
+	org.eclipse.rcp.feature.group
+	org.eclipse.jdt.feature.group
+	org.eclipse.equinox.p2.discovery.feature.feature.group
+
+	// javascript support (rhino & editors)
+	org.eclipse.wst.jsdt.feature.feature.group
+
+	// for modeling stuff
+	org.eclipse.emf.feature.group
+
+	// java module
+	org.eclipse.pde.feature.group
+	org.eclipse.jdt
+}
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/" eclipse-orbit-2020-12 {
+	// needed for unit tests
+	org.mockito [2.13.0,3.0.0)
+	org.mozilla.javascript [1.7.10,1.8.0)
+}
+
+location "https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest" ease-engines {
+	// jython interpreter
+	org.eclipse.ease.engine.jython.feature.feature.group lazy
+	// groovy interpreter
+	org.eclipse.ease.engine.groovy.feature.feature.group lazy
+	// ruby interpreter
+	org.eclipse.ease.engine.jruby.feature.feature.group lazy
+}
+
+location "http://eclipse.py4j.org/" py4j-eclipse {
+	org.py4j.feature.feature.group lazy
+}
diff --git a/releng/org.eclipse.ease.releng/oomph/ease.setup b/releng/org.eclipse.ease.releng/oomph/ease.setup
index 2b01890..65e5f2c 100644
--- a/releng/org.eclipse.ease.releng/oomph/ease.setup
+++ b/releng/org.eclipse.ease.releng/oomph/ease.setup
@@ -89,7 +89,7 @@
         <requirement
             name="net.sf.eclipsecs.feature.group"/>
         <repository
-            url="https://checkstyle.org/eclipse-cs/update"/>
+            url="https://checkstyle.org/eclipse-cs-update-site"/>
         <description>Install tpd editor</description>
       </setupTask>
     </setupTask>
@@ -293,6 +293,17 @@
           <repository
               url="http://eclipse.py4j.org/"/>
         </repositoryList>
+        <repositoryList
+            name="2021-06">
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+          <repository
+              url="https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest"/>
+          <repository
+              url="https://download.eclipse.org/releases/2021-06"/>
+          <repository
+              url="http://eclipse.py4j.org/"/>
+        </repositoryList>
       </targlet>
     </setupTask>
     <setupTask
@@ -471,7 +482,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.target.platform"
-        defaultValue="2020-12"
+        defaultValue="2021-06"
         storageURI="scope://Workspace">
       <description>Default target platform for EASE development.</description>
     </setupTask>
@@ -646,6 +657,19 @@
           <repository
               url="http://download.eclipse.org/ease/integration/nightly"/>
         </repositoryList>
+        <repositoryList
+            name="2021-06">
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+          <repository
+              url="http://download.eclipse.org/releases/2021-06"/>
+          <repository
+              url="http://download.eclipse.org/nebula/releases/1.0.0"/>
+          <repository
+              url="http://download.eclipse.org/technology/subversive/4.0/update-site/"/>
+          <repository
+              url="http://download.eclipse.org/ease/integration/nightly"/>
+        </repositoryList>
       </targlet>
     </setupTask>
     <setupTask
@@ -730,7 +754,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.target.platform"
-        defaultValue="2020-12"
+        defaultValue="2021-06"
         storageURI="scope://Workspace">
       <description>Default target platform for EASE development.</description>
     </setupTask>