[releng] Move to Sirius 7.0.0 and update tps

- Add a 2021-06 target platform
- Delete all previous target platforms : minimum platform version was
already 2019-06 for Sirius 6.5.0.

Change-Id: Ia7f5be597a8397463f8c1993ce2ad1dc6477dea3
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
diff --git a/org.eclipse.emf.ecoretools.build/oxygen.target b/org.eclipse.emf.ecoretools.build/2021-06.target
similarity index 66%
rename from org.eclipse.emf.ecoretools.build/oxygen.target
rename to org.eclipse.emf.ecoretools.build/2021-06.target
index 248da6d..4000711 100644
--- a/org.eclipse.emf.ecoretools.build/oxygen.target
+++ b/org.eclipse.emf.ecoretools.build/2021-06.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="Oxygen Target Platform For EcoreTools" sequenceNumber="1603202018">
+<target name="2021-06 Target Platform For EcoreTools" sequenceNumber="1631202719">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
@@ -10,19 +10,22 @@
       <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/sirius/updates/releases/5.0.2/oxygen/"/>
+      <repository location="https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R201902261618/"/>
+      <repository id="Acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2021-06/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="0.0.0"/>
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/oxygen"/>
+      <repository id="GMF-Runtime-1.14.0" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202107090702/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.amalgam.explorer.contextual.feature.group" version="0.0.0"/>
@@ -33,5 +36,12 @@
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
+      <unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+      <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+      <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
+      <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.emf.ecoretools.build/2021-06.tpd b/org.eclipse.emf.ecoretools.build/2021-06.tpd
new file mode 100644
index 0000000..095162c
--- /dev/null
+++ b/org.eclipse.emf.ecoretools.build/2021-06.tpd
@@ -0,0 +1,40 @@
+target "2021-06 Target Platform For EcoreTools" with source requirements
+
+location "https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06/" {
+	org.eclipse.sirius.runtime.aql.feature.group lazy
+	org.eclipse.sirius.runtime.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
+	org.eclipse.sirius.properties.feature.feature.group lazy
+}
+
+location Acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929" {
+	org.eclipse.acceleo.query.feature.group lazy
+}
+location "https://download.eclipse.org/releases/2021-06/" {
+	org.eclipse.sdk.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.emf.eef.runtime-feature.feature.group lazy
+}
+
+location GMF-Runtime-1.14.0 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202107090702/" {
+	org.eclipse.gmf.runtime.diagram.ui lazy
+	org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy
+}
+
+location "https://download.eclipse.org/modeling/amalgam/updates/stable/1.11.0-S20191007/capella/" {
+	org.eclipse.amalgam.explorer.contextual.feature.group lazy
+	org.eclipse.amalgam.explorer.contextual.sirius.feature.group lazy
+}
+
+location "http://download.eclipse.org/cbi/updates/license" {
+	org.eclipse.license.feature.group lazy
+}
+
+location Orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
+	org.apache.batik.ext [1.14.0,1.14.1)
+	org.apache.batik.codec [1.14.0,1.14.1)
+	org.apache.batik.bridge [1.14.0,1.14.1)
+	org.apache.batik.script [1.14.0,1.14.1)
+}
\ No newline at end of file
diff --git a/org.eclipse.emf.ecoretools.build/EcoreTools.setup b/org.eclipse.emf.ecoretools.build/EcoreTools.setup
index 716fab2..4d36bd4 100644
--- a/org.eclipse.emf.ecoretools.build/EcoreTools.setup
+++ b/org.eclipse.emf.ecoretools.build/EcoreTools.setup
@@ -56,23 +56,17 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      value="Luna"
+      value="2021-06"
       defaultValue="None"/>
   <setupTask
       xsi:type="setup:VariableTask"
       id="ecoretools.target.platform"
       name="ecoretools.target.platform"
-      defaultValue="Mars Target Platform For EcoreTools"
+      defaultValue="2021-06 Target Platform For EcoreTools"
       label="Target Platform - EcoreTools">
     <choice
-        value="Luna Target Platform For EcoreTools"
-        label="Eclipse Luna - 4.4"/>
-    <choice
-        value="Mars Target Platform For EcoreTools"
-        label="Eclipse Mars - 4.5"/>
-    <choice
-        value="Neon Target Platform For EcoreTools"
-        label="Eclipse Neon - 4.6"/>
+        value="2021-06 Target Platform For EcoreTools"
+        label="Eclipse 2021-06"/>
     <choice
         value="No"
         label="No target plaform"/>
@@ -104,7 +98,7 @@
     <repository
         url="http://download.eclipse.org/mylyn/releases/3.13"/>
     <repository
-        url="http://download.eclipse.org/sirius/updates/nightly/4.0.x/mars"/>
+        url="http://download.eclipse.org/sirius/updates/nightly/7.0.x/2021-06"/>
     <repository
         url="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
@@ -146,7 +140,7 @@
             project="org.eclipse.emf.ecoretools"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.10/@workingSets.3 //@setupTasks.10/@workingSets.1 //@setupTasks.10/@workingSets.2"/>
+            excludedWorkingSet="//@setupTasks.10/@workingSets[name='EcoreTools%20Packaging'] //@setupTasks.10/@workingSets[name='EcoreTools%20Tests'] //@setupTasks.10/@workingSets[name='EcoreTools%20Properties']"/>
       </predicate>
     </workingSet>
     <workingSet
diff --git a/org.eclipse.emf.ecoretools.build/luna.target b/org.eclipse.emf.ecoretools.build/luna.target
deleted file mode 100644
index c62ef06..0000000
--- a/org.eclipse.emf.ecoretools.build/luna.target
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Luna Target Platform For EcoreTools" sequenceNumber="1494860493">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/nightly/4.0.x/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/>
-      <repository id="EEF" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/luna/201502271000"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.amalgam.explorer.contextual.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.emf.ecoretools.build/luna.tpd b/org.eclipse.emf.ecoretools.build/luna.tpd
deleted file mode 100644
index 476614f..0000000
--- a/org.eclipse.emf.ecoretools.build/luna.tpd
+++ /dev/null
@@ -1,28 +0,0 @@
-target "Luna Target Platform For EcoreTools" with source requirements
-location "http://download.eclipse.org/sirius/updates/nightly/4.0.x/neon" Sirius {
-	org.eclipse.sirius.runtime.aql.feature.group lazy
-	org.eclipse.sirius.runtime.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-	org.eclipse.sirius.properties.feature.feature.group lazy
-	
-}
-location "http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/" EEF {
-	org.eclipse.emf.eef.runtime-feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321" Acceleo {
-	org.eclipse.acceleo.query.feature.group lazy
-}
-location "http://download.eclipse.org/releases/luna/201502271000" {
-	org.eclipse.sdk.feature.group lazy
-	org.eclipse.emf.sdk.feature.group lazy
-	org.eclipse.gmf.runtime.diagram.ui lazy
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy
-}
-location "http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/" {
-	org.eclipse.amalgam.explorer.contextual.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.emf.ecoretools.build/mars.target b/org.eclipse.emf.ecoretools.build/mars.target
deleted file mode 100644
index f25cd8c..0000000
--- a/org.eclipse.emf.ecoretools.build/mars.target
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Mars Target Platform For EcoreTools" sequenceNumber="1494860493">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/sirius/updates/nightly/4.0.x/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/>
-      <repository id="EEF" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/mars"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.amalgam.explorer.contextual.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.amalgam.explorer.contextual.sirius.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.emf.ecoretools.build/mars.tpd b/org.eclipse.emf.ecoretools.build/mars.tpd
deleted file mode 100644
index b7b817e..0000000
--- a/org.eclipse.emf.ecoretools.build/mars.tpd
+++ /dev/null
@@ -1,29 +0,0 @@
-target "Mars Target Platform For EcoreTools" with source requirements
-location "http://download.eclipse.org/sirius/updates/nightly/4.0.x/neon" {
-	org.eclipse.sirius.runtime.aql.feature.group lazy
-	org.eclipse.sirius.runtime.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-	org.eclipse.sirius.properties.feature.feature.group lazy
-}
-location "http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/" EEF {
-	org.eclipse.emf.eef.runtime-feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321" Acceleo {
-	org.eclipse.acceleo.query.feature.group lazy
-}
-location "http://download.eclipse.org/releases/mars" {
-	org.eclipse.sdk.feature.group lazy
-	org.eclipse.emf.sdk.feature.group lazy
-	org.eclipse.gmf.runtime.diagram.ui lazy
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy
-}
-location "http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/" {
-	org.eclipse.amalgam.explorer.contextual.feature.group lazy
-	org.eclipse.amalgam.explorer.contextual.sirius.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.emf.ecoretools.build/neon.target b/org.eclipse.emf.ecoretools.build/neon.target
deleted file mode 100644
index 338f93a..0000000
--- a/org.eclipse.emf.ecoretools.build/neon.target
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Neon Target Platform For EcoreTools" sequenceNumber="1494860493">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Acceleo" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.amalgam.explorer.contextual.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.amalgam.explorer.contextual.sirius.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.emf.ecoretools.build/neon.tpd b/org.eclipse.emf.ecoretools.build/neon.tpd
deleted file mode 100644
index 173cc48..0000000
--- a/org.eclipse.emf.ecoretools.build/neon.tpd
+++ /dev/null
@@ -1,26 +0,0 @@
-target "Neon Target Platform For EcoreTools" with source requirements
-location "http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon" {
-	org.eclipse.sirius.runtime.aql.feature.group lazy
-	org.eclipse.sirius.runtime.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-	org.eclipse.sirius.properties.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/acceleo/updates/nightly/latest" Acceleo {
-	org.eclipse.acceleo.query.feature.group lazy
-}
-location "http://download.eclipse.org/releases/neon" {
-	org.eclipse.sdk.feature.group lazy
-	org.eclipse.emf.sdk.feature.group lazy
-	org.eclipse.gmf.runtime.diagram.ui lazy
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy
-}
-location "http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/neon/" {
-	org.eclipse.amalgam.explorer.contextual.feature.group lazy
-	org.eclipse.amalgam.explorer.contextual.sirius.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.emf.ecoretools.build/oxygen.tpd b/org.eclipse.emf.ecoretools.build/oxygen.tpd
deleted file mode 100644
index 5bf9132..0000000
--- a/org.eclipse.emf.ecoretools.build/oxygen.tpd
+++ /dev/null
@@ -1,28 +0,0 @@
-target "Oxygen Target Platform For EcoreTools" with source requirements
-location "http://download.eclipse.org/sirius/updates/releases/5.0.2/oxygen/" {
-	org.eclipse.sirius.runtime.aql.feature.group lazy
-	org.eclipse.sirius.runtime.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-	org.eclipse.sirius.properties.feature.feature.group lazy
-}
-
-location "https://download.eclipse.org/acceleo/updates/releases/3.7/R201902261618/" Acceleo {
-	org.eclipse.acceleo.query.feature.group lazy
-}
-location "http://download.eclipse.org/releases/oxygen" {
-	org.eclipse.sdk.feature.group lazy
-	org.eclipse.emf.sdk.feature.group lazy
-	org.eclipse.gmf.runtime.diagram.ui lazy
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy
-	org.eclipse.emf.eef.runtime-feature.feature.group lazy
-}
-location "https://download.eclipse.org/modeling/amalgam/updates/stable/1.11.0-S20191007/capella/" {
-	org.eclipse.amalgam.explorer.contextual.feature.group lazy
-	org.eclipse.amalgam.explorer.contextual.sirius.feature.group lazy
-}
-
-location "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.emf.ecoretools.build/pom.xml b/org.eclipse.emf.ecoretools.build/pom.xml
index a9c79f3..0e751f3 100644
--- a/org.eclipse.emf.ecoretools.build/pom.xml
+++ b/org.eclipse.emf.ecoretools.build/pom.xml
@@ -202,66 +202,15 @@
   
   <profiles>
     <profile>
-      <id>oxygen</id>
+      <id>2021-06</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <PLATFORM>oxygen</PLATFORM>        
+        <PLATFORM>2021-06</PLATFORM>        
       </properties>   
     </profile> 
-    <profile>
-      <id>neon</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <PLATFORM>neon</PLATFORM>        
-      </properties>    
-    </profile>   
-    <profile>
-      <id>mars</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <PLATFORM>mars</PLATFORM>        
-      </properties>   
-    </profile>   
-    <profile>
-      <id>luna</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <PLATFORM>luna</PLATFORM>        
-      </properties>   
-    </profile>   
-    <profile>
-      <id>kepler</id>
-      <properties>
-        <PLATFORM>kepler</PLATFORM>        
-      </properties>
-    </profile>
-    <profile>
-      <id>juno</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <PLATFORM>juno</PLATFORM>        
-      </properties>
-    </profile>
-
-    <profile>
-      <id>indigo</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <PLATFORM>indigo</PLATFORM>        
-      </properties>
-    </profile>
+    
     <profile>
       <id>sign</id>
       <activation>