From ae78fde323f048080c240d0494eb723537eba7da Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <malaperle@gmail.com>
Date: Mon, 8 Oct 2018 15:20:37 -0400
Subject: [PATCH] releng: Use features instead of Eclipse product in
 target/targlet

In order to work around
https://bugs.eclipse.org/bugs/show_bug.cgi?id=539902

Also update the target to make it closer to the Oomph setup.

Change-Id: Ie581ea499d7cd0956780717f3a34e0762f868c0d
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
---
 releng/CDT.setup                         | 2 +-
 releng/org.eclipse.cdt.target/cdt.target | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index 0c642b44d1a..79f1fa25dc9 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -106,7 +106,7 @@
           name="CDT"
           activeRepositoryList="${eclipse.target.platform}">
         <requirement
-            name="org.eclipse.platform.ide"/>
+            name="org.eclipse.platform.feature.group"/>
         <requirement
             name="org.apache.log4j"/>
         <requirement
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 19196e9dfb5..f69d7fc3968 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt" sequenceNumber="36">
+<?pde version="3.8"?><target name="cdt" sequenceNumber="37">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
@@ -47,8 +47,8 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.8/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">