From 3a0f370ed3a860a776c32e227188b4595f148b36 Mon Sep 17 00:00:00 2001
From: Mickael Istria
Date: Thu, 27 Mar 2014 16:47:34 +0100
Subject: [430708] Remove circular dependency on p2

In order to avoid circular dependencies at build-time, it's
recommended to avoid "includes" from a feature to another
feature that is most likely built separately

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=430708
Signed-off-by: Mickael Istria <mistria@redhat.com>
Change-Id: I0ed7e683239a0001a99fefa0da544002f429fd38
---
 features/org.eclipse.equinox.sdk/feature.xml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/features/org.eclipse.equinox.sdk/feature.xml b/features/org.eclipse.equinox.sdk/feature.xml
index df69b479b..258050f31 100644
--- a/features/org.eclipse.equinox.sdk/feature.xml
+++ b/features/org.eclipse.equinox.sdk/feature.xml
@@ -27,10 +27,6 @@
          id="org.eclipse.equinox.core.sdk"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.equinox.p2.sdk"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.equinox.serverside.sdk"
          version="0.0.0"/>
@@ -47,20 +43,11 @@
          id="org.eclipse.equinox.core.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.equinox.p2.core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.extras.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.rcp.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.core.runtime.feature"
-         version="0.0.0"/>
+   <requires>
+     <feature id="org.eclipse.equinox.p2.sdk"/>
+     <feature id="org.eclipse.equinox.p2.core.feature"/>
+     <feature id="org.eclipse.equinox.p2.extras.feature"/>
+     <feature id="org.eclipse.equinox.p2.rcp.feature"/>
+   </requires>
 
 </feature>
-- 
cgit v1.2.3