From 825f88f49af0bd8430b29349e7e6b73cc3e02cdd Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Wed, 6 May 2020 21:44:04 +0300
Subject: [PATCH] Bug 562790 - Switch CDT 10.0 stream to Eclipse Platform 4.16
 M2

Updated Eclipse Platform according to
https://www.eclipse.org/lists/eclipse-dev/msg11376.html
using
https://download.eclipse.org/eclipse/updates/4.16-I-builds/I20200501-0520/
Added "org.eclipse.urischeme" bundle to debug.product definition as it
now required for E4 SWT Workbench

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

diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 5ae6a7e823a..e0207c09331 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -373,6 +373,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.eclipse.ui.workbench.texteditor"/>
       <plugin id="org.eclipse.update.configurator"/>
+      <plugin id="org.eclipse.urischeme"/>
       <plugin id="org.freemarker"/>
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
diff --git a/releng/CDT.setup b/releng/CDT.setup
index f77752c23ab..cb5a4fb4bd3 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -310,7 +310,7 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16M1-202004090200/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.16-I-builds/I20200501-0520/"/>
           <repository
               url="https://download.eclipse.org/egit/updates/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index efc9225308c..9ed7fbed125 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -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.16milestones/S-4.16M1-202004090200/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.16-I-builds/I20200501-0520/"/>
 </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"/>