Bug 498252 - Migrate the e4 spies to PDE
The PDE feature now transitively depends on org.eclipse.emf.databinding,
org.eclipse.emf.edit, and org.eclipse.emf.databinding.edit. These
dependencies should be in the platform p2 repository. Ideally these
dependencies are treated consistently the way the org.eclipse.emf.common
and org.eclipse.emf.ecore dependencies are handled, i.e., their
corresponding features are in the p2 repository and of course must then
be in the target platform.
Change-Id: I39de11a357db7b17824c3d69f7b6a0e49e0f0e54
Signed-off-by: Ed Merks <ed.merks@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/185692
Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index 035a36b..d7f4391 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -166,11 +166,14 @@
<unit id="org.eclipse.emf.common.source.feature.group" version="2.23.0.v20210618-0700"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.25.0.v20210816-0937"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.25.0.v20210816-0937"/>
- <!-- For org.eclipse.ui.tools -->
- <!-- Check version in "<EMF>/plugins" directory -->
- <unit id="org.eclipse.emf.edit" version="2.16.0.v20190920-0401"/>
- <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/>
- <unit id="org.eclipse.emf.databinding.edit" version="1.7.0.v20210113-0340"/>
+ <!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
+ <!-- Check version in "<EMF>/features" directory -->
+ <unit id="org.eclipse.emf.edit.feature.group" version="2.16.0.v20190920-0401"/>
+ <unit id="org.eclipse.emf.edit.source.feature.group" version="2.16.0.v20190920-0401"/>
+ <unit id="org.eclipse.emf.databinding.feature.group" version="1.7.0.v20190323-1059"/>
+ <unit id="org.eclipse.emf.databinding.source.feature.group" version="1.7.0.v20190323-1059"/>
+ <unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.8.0.v20210113-0340"/>
+ <unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.8.0.v20210113-0340"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.27/"/>
</location>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index 7badad2..09cb8f9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -24,8 +24,14 @@
<feature id="org.eclipse.jdt.ui.unittest.junit.feature.source" version="0.0.0"/>
<feature id="org.eclipse.emf.common" version="0.0.0"/>
<feature id="org.eclipse.emf.ecore" version="0.0.0"/>
+ <feature id="org.eclipse.emf.edit" version="0.0.0"/>
+ <feature id="org.eclipse.emf.databinding" version="0.0.0"/>
+ <feature id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
<feature id="org.eclipse.emf.common.source" version="0.0.0"/>
<feature id="org.eclipse.emf.ecore.source" version="0.0.0"/>
+ <feature id="org.eclipse.emf.edit.source" version="0.0.0"/>
+ <feature id="org.eclipse.emf.databinding.source" version="0.0.0"/>
+ <feature id="org.eclipse.emf.databinding.edit.source" version="0.0.0"/>
<feature id="org.eclipse.ecf.core.feature" version="0.0.0"/>
<feature id="org.eclipse.ecf.core.feature.source" version="0.0.0"/>
<feature id="org.eclipse.ecf.core.ssl.feature" version="0.0.0"/>
