From 2e5ba637b8627db7b7cfbc5581f04aeaa347dd9d Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Sat, 21 Mar 2020 14:18:34 +0300
Subject: [PATCH] Bug 561314 - Update CDT baseline target to CDT 9.11

Switched baseline to CDT 9.11 and SimRel 2020-03

Change-Id: I3520d2f0142eacbd198dded5647dd253f56f9c98
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Also-by: Marco Stornelli <marco.stornelli@gmail.com>
---
 releng/CDT.setup                              | 14 ++-
 .../cdt-baseline.target                       | 86 ++++++++++++-------
 2 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index c55df6d7514..416ba455651 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -116,15 +116,15 @@
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.14/"/>
+            url="https://download.eclipse.org/eclipse/updates/4.15/"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-docker-4.5.0/"/>
+            url="https://download.eclipse.org/linuxtools/update-docker-4.6.0/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.14.0/"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.21/"/>
         <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
         <repository
             url="https://download.eclipse.org/mylyn/releases/3.24/"/>
         <repository
@@ -132,9 +132,7 @@
         <repository
             url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
         <repository
-            url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
-        <repository
-            url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/">
+            url="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/">
           <annotation>
             <detail
                 key="description">
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index cf060aec706..1f431934556 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,79 +1,101 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="22">
+<target name="cdt-baseline" sequenceNumber="23">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.15/"/>
 </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/"/>
+<repository location="https://download.eclipse.org/linuxtools/update-docker-4.6.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/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.14.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/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.21/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
 </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"/>
 <unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.bupc.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core.lrparser.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.core.lrparser.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core.parser.upc.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.core.parser.upc.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.debug.dap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.debug.dap.gdbjtag.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.debug.gdbjtag.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.debug.standalone.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.debug.ui.memory.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.docker.launcher.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.gdb.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.gnu.build.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.gnu.debug.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.gnu.multicorevisualizer.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.examples.dsf.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.launch.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.launch.serial.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.llvm.dsf.lldb.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.managedbuilder.llvm.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.meson.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.msw.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.qt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.testsrunner.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.visualizer.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.xlc.sdk.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+<unit id="org.eclipse.cdt.xlc.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.connector.ssh.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.connector.telnet.feature.feature.group" version="0.0.0"/>
+<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/releases/9.11/cdt-9.11.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/"/>
+<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"/>
+<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="javax.xml.stream" version="0.0.0"/>
+<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="0.0.0"/>
+<unit id="org.apache.commons.compress" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="org.assertj" version="0.0.0"/>
+<unit id="org.freemarker" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="org.hamcrest.core" version="0.0.0"/>
+<unit id="org.junit" version="0.0.0"/>
+<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-03/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
@@ -82,4 +104,4 @@
 <repository location="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/>
 </location>
 </locations>
-</target>
+</target>
\ No newline at end of file