[dsl] Applied structural changes from master


Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>

packages/org.eclipse.epp.package.dsl.feature/feature.xml

diff --git a/packages/org.eclipse.epp.package.dsl.feature/feature.xml b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
index e24576a..a91fcf5 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
@@ -26,24 +26,13 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.pde"/>
       <import feature="org.eclipse.sdk"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.xtend.sdk"/>
-      <import feature="org.eclipse.xtext.sdk"/>
-      <import feature="org.eclipse.emf.mwe2.language.sdk"/>
-      <import feature="org.eclipse.emf.sdk"/>
-      <import feature="org.eclipse.emf.ecore.xcore.sdk"/>
       <import feature="org.eclipse.egit"/>
       <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.epp.mpc"/>
       <import feature="org.eclipse.m2e.feature"/>
-      <import feature="org.eclipse.epp.package.common.feature"/>
+      <import feature="org.eclipse.m2e.logback.feature"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
+      <import feature="org.eclipse.buildship"/>
    </requires>
 
    <plugin

packages/org.eclipse.epp.package.dsl.product/epp.product

diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index d346273..ed18d32 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -182,6 +182,14 @@
 
    <features>
       <feature id="org.eclipse.epp.package.dsl.feature" version="4.5.2.qualifier"/>
+      <feature id="org.eclipse.epp.package.dsl.feature" version="4.5.2.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.5.2.qualifier"/>
+      <feature id="org.eclipse.platform" version="4.5.2.qualifier"/>
+
+      <feature id="org.eclipse.emf.ecore.xcore.sdk" installMode="root"/>
+      <feature id="org.eclipse.emf.mwe2.language.sdk" installMode="root"/>
+      <feature id="org.eclipse.emf.sdk" installMode="root"/>
+      <feature id="org.eclipse.xtext.sdk" installMode="root"/>
    </features>