From 6a9d212c0e68ec45679b0b54c34248db5f105d78 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <malaperle@gmail.com>
Date: Sat, 19 Sep 2020 14:03:44 -0400
Subject: [PATCH] Update target and baseline after 2020-09 release

Change-Id: I631545a1ceaf18e576f85f744d6b141c35363fe1
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
---
 releng/CDT.setup                              | 160 +++++++-----------
 .../cdt-baseline.target                       |  22 +--
 releng/org.eclipse.cdt.target/cdt.target      |  12 +-
 3 files changed, 77 insertions(+), 117 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index 992a6dbf515..e8cd23f01c7 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2020-06"
+      defaultValue="2020-09"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.targlets:TargletTask"
@@ -89,6 +89,14 @@
           name="org.eclipse.cdt.autotools.feature.group"/>
       <requirement
           name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.cmake.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.core.autotools.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.debug.dap.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.debug.dap.gdbjtag.feature.group"/>
       <requirement
           name="org.eclipse.cdt.debug.gdbjtag.feature.group"/>
       <requirement
@@ -97,16 +105,36 @@
           name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
       <requirement
           name="org.eclipse.cdt.docker.launcher.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.gdb.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.gnu.build.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.gnu.debug.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.gnu.dsf.feature.group"/>
       <requirement
           name="org.eclipse.cdt.gnu.multicorevisualizer.feature.group"/>
       <requirement
           name="org.eclipse.cdt.examples.dsf.feature.group"/>
       <requirement
           name="org.eclipse.cdt.launch.remote.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.llvm.dsf.lldb.feature.group"/>
       <requirement
           name="org.eclipse.cdt.managedbuilder.llvm.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.meson.feature.group"/>
       <requirement
           name="org.eclipse.cdt.msw.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.native.feature.group"/>
+      <requirement
+          name="org.eclipse.cdt.platform.feature.group"/>
       <requirement
           name="org.eclipse.cdt.qt.feature.group"/>
       <requirement
@@ -119,28 +147,42 @@
           name="org.eclipse.launchbar.feature.group"/>
       <requirement
           name="org.eclipse.launchbar.remote.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.connector.local.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.connector.remote.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.connector.ssh.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.connector.telnet.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.control.feature.feature.group"/>
+      <requiremane
+          name="org.eclipse.tm.terminal.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm.terminal.view.feature.feature.group"/>
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.16/"/>
+            url="https://download.eclipse.org/eclipse/updates/4.17/"/>
         <repository
-            url="https://download.eclipse.org/egit/updates-5.8/"/>
+            url="https://download.eclipse.org/egit/updates-5.9/"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-2020-06-docker/"/>
+            url="https://download.eclipse.org/linuxtools/update-2020-09-docker/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.15.0/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.16.0/"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23/"/>
         <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
         <repository
-            url="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330"/>
+            url="http://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
         <repository
-            url="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+            url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
         <repository
-            url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
-        <repository
-            url="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1">
+            url="https://download.eclipse.org/tools/cdt/releases/10.0/cdt-10.0.0">
           <annotation>
             <detail
                 key="description">
@@ -152,9 +194,7 @@
           </annotation>
         </repository>
         <repository
-            url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
-        <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/2020-09/"/>
         <repository
             url="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/>
       </repositoryList>
@@ -238,14 +278,6 @@
             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.freemarker"/>
         <requirement
@@ -268,7 +300,7 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.17milestones/S-4.17RC2-202009021800/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/>
           <repository
               url="https://download.eclipse.org/egit/updates/"/>
           <repository
@@ -280,15 +312,15 @@
           <repository
               url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
           <repository
-              url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+              url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
           <repository
-              url="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330"/>
+              url="http://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
           <repository
               url="https://download.eclipse.org/technology/swtbot/releases/3.0.0/"/>
           <repository
-              url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
+              url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
           <repository
-              url="https://download.eclipse.org/tools/cdt/builds/10.0/cdt-10.0.0-rc1/">
+              url="https://download.eclipse.org/tools/cdt/releases/10.0/cdt-10.0.0/">
             <annotation>
               <detail
                   key="description">
@@ -301,78 +333,6 @@
           <repository
               url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
         </repositoryList>
-        <repositoryList
-            name="2020-06">
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license/"/>
-          <repository
-              url="https://download.eclipse.org/eclipse/updates/4.16/"/>
-          <repository
-              url="https://download.eclipse.org/egit/updates-5.8/"/>
-          <repository
-              url="https://download.eclipse.org/linuxtools/update-2020-06-docker/"/>
-          <repository
-              url="https://download.eclipse.org/lsp4e/releases/0.15.0/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
-          <repository
-              url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
-          <repository
-              url="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330"/>
-          <repository
-              url="https://download.eclipse.org/technology/swtbot/releases/3.0.0/"/>
-          <repository
-              url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1">
-            <annotation>
-              <detail
-                  key="description">
-                <value>We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace.</value>
-              </detail>
-            </annotation>
-          </repository>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
-          <repository
-              url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
-        </repositoryList>
-        <repositoryList
-            name="2020-03">
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license/"/>
-          <repository
-              url="https://download.eclipse.org/eclipse/updates/4.15/"/>
-          <repository
-              url="https://download.eclipse.org/egit/updates-5.7/"/>
-          <repository
-              url="https://download.eclipse.org/linuxtools/update-2020-03-docker/"/>
-          <repository
-              url="https://download.eclipse.org/lsp4e/releases/0.14.0/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
-          <repository
-              url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
-          <repository
-              url="https://download.eclipse.org/mylyn/releases/3.24/"/>
-          <repository
-              url="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
-          <repository
-              url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/">
-            <annotation>
-              <detail
-                  key="description">
-                <value>We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace.</value>
-              </detail>
-            </annotation>
-          </repository>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/2020-03/"/>
-          <repository
-              url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
-        </repositoryList>
       </targlet>
     </setupTask>
     <setupTask
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index f5da7eeb052..a3fbac07df4 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="24">
+<target name="cdt-baseline" sequenceNumber="25">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/eclipse/updates/4.16/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/egit/updates-5.8/"/>
+		<repository location="https://download.eclipse.org/egit/updates-5.9/"/>
 		<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
 	</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-2020-06-docker/"/>
+<repository location="https://download.eclipse.org/linuxtools/update-2020-09-docker/"/>
 </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.15.0/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.16.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.22/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330/"/>
+<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
 </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/"/>
+<repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
@@ -71,7 +71,7 @@
 <unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.0/cdt-10.0.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
@@ -91,7 +91,7 @@
 <unit id="org.junit.jupiter.api" version="0.0.0"/>
 <unit id="org.mockito" version="0.0.0"/>
 <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-09/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 6c804572f3e..e53ef00a524 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="94">
+<target name="cdt" sequenceNumber="95">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -11,7 +11,7 @@
 <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.17milestones/S-4.17RC2-202009021800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://download.eclipse.org/egit/updates"/>
@@ -30,10 +30,10 @@
 <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330/"/>
+<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -43,10 +43,10 @@
 </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/"/>
+<repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/tools/cdt/builds/10.0/cdt-10.0.0-rc1/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.0/cdt-10.0.0/"/>
 <!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
 	<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 </location>