diff --git a/releng/CDT.setup b/releng/CDT.setup
index aa73af1146f..b82905fc066 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -69,8 +69,6 @@
     <targlet
         name="${scope.project.label}"
         activeRepositoryList="CDT Latest Released">
-      <requirement
-          name="org.eclipse.cdt.sdk.feature.group"/>
       <requirement
           name="org.eclipse.cdt.arduino.feature.group"/>
       <requirement
@@ -103,6 +101,8 @@
           name="org.eclipse.cdt.msw.feature.group"/>
       <requirement
           name="org.eclipse.cdt.qt.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.sdk.feature.group"/>
       <requirement
           name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
       <requirement
@@ -115,36 +115,37 @@
           name="org.eclipse.launchbar.remote.feature.group"/>
       <repositoryList
           name="CDT Latest Released">
-        <repository
-            url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
-        <repository
-            url="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
-        <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
-        <repository
-            url="https://download.eclipse.org/mylyn/releases/3.24/"/>
-        <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
-<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
-<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
-        <repository
-            url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.14/"/>
-        <repository
-            url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
         <repository
             url="https://download.eclipse.org/linuxtools/update-docker-4.5.0/"/>
         <repository
-            url="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
         <repository
-            url="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
         <repository
-            url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+        <repository
+            url="https://download.eclipse.org/mylyn/releases/3.24/"/>
+        <repository
+            url="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
         <repository
             url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+            url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+        <repository
+<!-- OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+<!-- but it gets resolved here as we have CDT repo below -->
+            url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+        <repository
+            url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+        <repository
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+            url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
+        <repository
+            url="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
+        <repository
+            url="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
       </repositoryList>
     </targlet>
   </setupTask>
@@ -208,6 +209,56 @@
             name="org.apache.log4j"/>
         <requirement
             name="org.assertj"/>
+        <requirement
+            name="org.eclipse.epp.logging.aeri.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.equinox.executable.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.annotation"/>
+        <requirement
+            name="org.eclipse.launchbar.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.docker.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.lsp4e"/>
+        <requirement
+            name="org.eclipse.lsp4e.debug"/>
+        <requirement
+            name="org.eclipse.remote.console.feature.group"/>
+        <requirement
+            name="org.eclipse.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.remote.serial.feature.group"/>
+        <requirement
+            name="org.eclipse.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.feature.group"/>
+        <requirement
+            name="org.eclipse.test.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.control"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm4e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tools.templates.core"/>
+        <requirement
+            name="org.eclipse.tools.templates.freemarker"/>
+        <requirement
+            name="org.eclipse.tools.templates.freemarker.java11"/>
+        <requirement
+            name="org.eclipse.tools.templates.ui"/>
+        <requirement
+            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <requirement
             name="org.freemarker"/>
         <requirement
@@ -222,56 +273,6 @@
             name="org.mockito"/>
         <requirement
             name="org.slf4j.impl.log4j12"/>
-        <requirement
-            name="org.eclipse.equinox.executable.feature.group"/>
-        <requirement
-            name="org.eclipse.jdt.annotation"/>
-        <requirement
-            name="org.eclipse.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.test.feature.group"/>
-        <requirement
-            name="org.eclipse.epp.logging.aeri.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.eclipse.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
-        <requirement
-            name="org.eclipse.remote.console.feature.group"/>
-        <requirement
-            name="org.eclipse.remote.feature.group"/>
-        <requirement
-            name="org.eclipse.remote.serial.feature.group"/>
-        <requirement
-            name="org.eclipse.launchbar.feature.group"/>
-        <requirement
-            name="org.eclipse.launchbar.remote.feature.group"/>
-        <requirement
-            name="org.eclipse.linuxtools.docker.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.tm.terminal.control"/>
-        <requirement
-            name="org.eclipse.tm.terminal.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.tools.templates.core"/>
-        <requirement
-            name="org.eclipse.tools.templates.freemarker"/>
-        <requirement
-            name="org.eclipse.tools.templates.freemarker.java11"/>
-        <requirement
-            name="org.eclipse.tools.templates.ui"/>
-        <requirement
-            name="org.eclipse.tm4e.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.lsp4e"/>
-        <requirement
-            name="org.eclipse.lsp4e.debug"/>
         <sourceLocator
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
@@ -280,41 +281,41 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.14/"/>
+          <repository
+              url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+          <repository
+              url="https://download.eclipse.org/lsp4e/snapshots/"/>
           <repository
               url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.14/"/>
+              url="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
           <repository
               url="https://download.eclipse.org/mylyn/releases/3.24/"/>
           <repository
-              url="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
-<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
-          <repository
-              url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
-<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
-          <repository
-              url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
-          <repository
-              url="http://download.eclipse.org/technology/epp/logging/stable/"/>
+              url="https://download.eclipse.org/technology/epp/logging/stable/"/>
           <repository
               url="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
           <repository
-              url="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1-simrel-2019-12-m3/"/>
-          <repository
-              url="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
-          <repository
-              url="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
-          <repository
-              url="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+              url="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
           <repository
               url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
           <repository
-              url="http://download.eclipse.org/lsp4e/snapshots/"/>
+              url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1-simrel-2019-12-m3/"/>
+          <repository
+<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+              url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+          <repository
+              url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+          <repository
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+              url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+          <repository
+              url="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
+          <repository
+              url="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
         </repositoryList>
       </targlet>
     </setupTask>
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index f9a572bbde7..7d549e3dcd1 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,8 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="19">
+<target name="cdt-baseline" sequenceNumber="20">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/linuxtools/update-docker-4.5.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+<!-- but it gets resolved here as we have CDT repo below -->
 <unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.arduino.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
@@ -26,49 +64,6 @@
 <repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
-</location>
-<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
-<!-- but nothing to add here as we already have CDT repo above -->
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
-<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/linuxtools/update-docker-4.5.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <!-- normalize org.eclipse.cdt\releng\org.eclipse.cdt.repo\category.xml to remove .source IUs below -->
 <unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
 <unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
@@ -81,13 +76,18 @@
 <repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.lsp4e" version="0.0.0"/>
-<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-<repository location="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
 </location>
 </locations>
-</target>
\ No newline at end of file
+</target>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 4dd5d8412f6..53b3bddb98b 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,8 +1,82 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="66">
+<target name="cdt" sequenceNumber="67">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+<repository location="http://download.eclipse.org/lsp4e/snapshots/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/technology/epp/logging/stable/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- normalize org.eclipse.cdt\releng\org.eclipse.cdt.repo\category.xml to remove .source IUs below -->
+<unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
 <unit id="com.sun.xml.bind" version="0.0.0"/>
 <unit id="javax.activation" version="0.0.0"/>
@@ -23,89 +97,15 @@
 <repository location="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/technology/epp/logging/stable/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
-</location>
-<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
-<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
-<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1-simrel-2019-12-m3/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- normalize org.eclipse.cdt\releng\org.eclipse.cdt.repo\category.xml to remove .source IUs below -->
-<unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.lsp4e" version="0.0.0"/>
-<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-<repository location="http://download.eclipse.org/lsp4e/snapshots/"/>
-</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>