Revert "Disable WindowBuilder dependencies in Java + RCP/RAP package"

This reverts commit 40da965546b4abbdb52009e122ea42d6140b276a.

Bug 467800 - WindowBuilder disappeared in Mars RC1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800

Change-Id: I65fafa1af805f05f1d23f1e4181d03a2cd9a7e9b
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>

4 files changed, 1 insertions, 7 deletions

diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
index 330c84f3..c49eb59e 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -14,7 +14,7 @@
    bugzillaComponentId="java-package"
    testPlan="http://www.eclipse.org/epp/testplan.php" >
     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a Git client, XML Editor, Mylyn, and Maven integration]]></description>
+     <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a Git client, XML Editor, Mylyn, Maven integration and WindowBuilder]]></description>
     <!-- packageTesters is a list of the people that are testing the package -->
      <packageTesters>
       <tester>Tomasz Zarna</tester>
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index 8f32b3fe..4b5e4e4d 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -50,12 +50,10 @@
       <import feature="org.eclipse.recommenders.rcp.feature"/>
       <import feature="org.eclipse.recommenders.snipmatch.rcp.feature"/>
       <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
-      <!-- disabled in Mars RC1 https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800
       <import feature="org.eclipse.wb.core.feature"/>
       <import feature="org.eclipse.wb.core.ui.feature"/>
       <import feature="org.eclipse.wb.layout.group.feature"/>
       <import feature="org.eclipse.wb.swing.feature"/>
-      -->
       <import feature="org.eclipse.wst.xml_ui.feature"/>
    </requires>
 
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 02c839cf..dde019e3 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -52,7 +52,6 @@
       <import feature="org.eclipse.recommenders.rcp.feature"/>
       <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
       <import feature="org.eclipse.recommenders.snipmatch.rcp.feature"/>
-      WB disabled in Mars RC1 https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800
       <import feature="org.eclipse.wb.core.ui.feature"/>
       <import feature="org.eclipse.wb.rcp.feature"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
@@ -64,7 +63,6 @@
 <!-- redundant features (already included in other features
       <import feature="org.eclipse.mylyn_feature"/>
       <import feature="org.eclipse.rcp"/>
-      WB disabled in Mars RC1 https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800
       <import feature="org.eclipse.wb.core.feature"/>
       <import feature="org.eclipse.wb.swt.feature"/>
       <import feature="org.eclipse.wb.layout.group.feature"/>
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 6217cace..6a31865f 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -210,10 +210,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.recommenders.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.recommenders.mylyn.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.recommenders.snipmatch.rcp.feature" installMode="root"/>
-      <!-- disabled in Mars RC1 https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800
       <feature id="org.eclipse.wb.core.ui.feature" installMode="root"/>
       <feature id="org.eclipse.wb.rcp.feature" installMode="root"/>
-      -->
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>