From 794a7e2339d5625bebecd397289974d08448f581 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Tue, 14 Apr 2020 12:29:28 +0300
Subject: [PATCH] Bug 562096 - Switch CDT 10.0 stream to Eclipse Platform 4.16
 M1

Switched to
https://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16M1-202004090200/
Added 2020-06 repository list to CDT.setup - let's keep 2020-03 for a
while as a fallback option until things are converged for 2020-06 stream

Change-Id: I7ec32e9897731d9093c5e88aeb618ab33ff5e6b2
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 releng/CDT.setup                         | 38 +++++++++++++++++++++++-
 releng/org.eclipse.cdt.target/cdt.target |  4 +--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index 537f4aacfb7..8fcf96d54de 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -63,7 +63,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2019-12"
+      defaultValue="2020-06"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.targlets:TargletTask"
@@ -310,6 +310,42 @@
               </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>
+        <repositoryList
+            name="2020-06">
+          <repository
+              url="https://download.eclipse.org/cbi/updates/license/"/>
+          <repository
+              url="https://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16M1-202004090200/"/>
+          <repository
+              url="https://download.eclipse.org/egit/updates/"/>
+          <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/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.7.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-06/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 0ca986f96bc..efc9225308c 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="80">
+<target name="cdt" sequenceNumber="81">
 <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.15/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16M1-202004090200/"/>
 </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"/>