From 1834a3c88dc27b8e1f7da1096729d5c3b0ca3fe4 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Tue, 21 Jan 2020 15:03:10 -0500
Subject: [PATCH] [releng] Remove unneeded items from target platform

XML editors were added to CDT's target platform in
https://git.eclipse.org/r/#/c/56572/ for
"Bug 478231 - Hook up .qrc files to the XML Editor"

As far as I can tell it is not necessary to have the XML
editors in the target platform. The 56572 PatchSet does
not add any dependencies in Webtools XML editor. I believe
it was probably added to make it possible to test this
code in the dev environment. However now end users may
have xml editors installed from other places, such as
generic editor based ones.

Change-Id: I2f3c55918990778a77337fddaec6b06ee979fdb8
---
 releng/CDT.setup                              | 22 -------------------
 .../cdt-baseline.target                       | 10 +--------
 releng/org.eclipse.cdt.target/cdt.target      | 10 +--------
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index c810f1d3ceb..bab8612ed4a 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -147,19 +147,8 @@
         </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/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/">
-          <annotation>
-            <detail
-                key="description">
-              <value>We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group</value>
-            </detail>
-          </annotation>
-        </repository>
         <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>
@@ -319,21 +308,10 @@
               </detail>
             </annotation>
           </repository>
-          <repository
-              url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/">
-            <annotation>
-              <detail
-                  key="description">
-                <value>We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group</value>
-              </detail>
-            </annotation>
-          </repository>
           <repository
               url="https://download.eclipse.org/tools/orbit/downloads/2020-03/"/>
           <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 7d549e3dcd1..6839c6b7640 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="20">
+<target name="cdt-baseline" sequenceNumber="21">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
@@ -76,18 +76,10 @@
 <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="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>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index c676d8eb6b6..896c260b23c 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="70">
+<target name="cdt" sequenceNumber="71">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -54,10 +54,6 @@
 	<unit id="org.eclipse.cdt.feature.group" version="9.11.0.202001140305"/>
 </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"/>
@@ -83,10 +79,6 @@
 <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>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>