diff options
author | Markus Knauer | 2015-05-21 06:12:41 +0000 |
---|---|---|
committer | Markus Knauer | 2015-05-21 06:12:41 +0000 |
commit | 40da965546b4abbdb52009e122ea42d6140b276a (patch) | |
tree | d2b1900dd5c33e2762e2cc8f76e66a98e3d9aa30 | |
parent | 7955ed8f070f472eafc1d0b953a36b2da66e4236 (diff) | |
download | org.eclipse.epp.packages-40da965546b4abbdb52009e122ea42d6140b276a.tar.gz org.eclipse.epp.packages-40da965546b4abbdb52009e122ea42d6140b276a.tar.xz org.eclipse.epp.packages-40da965546b4abbdb52009e122ea42d6140b276a.zip |
Disable WindowBuilder dependencies in Java + RCP/RAP package
The artifacts from the WindowBuilder project have been removed in Mars
RC1 from the Simultaneous Release repository. In order to build the
packages the dependencies to WindowBuilder have been disabled. If
WindowBuild will drop out of the release the entries should be finally
removed.
Bug 467800 - WindowBuilder disappeared in Mars RC1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=467800
Change-Id: Ibc26a80bdc9095f9b722b4722730c3c564c779f7
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
4 files changed, 7 insertions, 1 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 6c8edf4f..cc2fcc31 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, Maven integration and WindowBuilder]]></description> + <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a Git client, XML Editor, Mylyn, and Maven integration]]></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 4b5e4e4d..8f32b3fe 100644 --- a/packages/org.eclipse.epp.package.java.feature/feature.xml +++ b/packages/org.eclipse.epp.package.java.feature/feature.xml @@ -50,10 +50,12 @@ <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 dde019e3..02c839cf 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml +++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml @@ -52,6 +52,7 @@ <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"/> @@ -63,6 +64,7 @@ <!-- 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 6a31865f..6217cace 100644 --- a/packages/org.eclipse.epp.package.rcp.product/epp.product +++ b/packages/org.eclipse.epp.package.rcp.product/epp.product @@ -210,8 +210,10 @@ 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"/> |