Skip to content

Commit 1e5890b

Browse files
committed
Replace EMF's features with EMF's bundles in the target platform
- Remove EMF's features from the category.xml - Restore source features accidentally committed.
1 parent 24bcd1f commit 1e5890b

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,13 @@
4343
</location>
4444

4545
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
46-
<!-- Check version in "<EMF>/features" directory -->
47-
<unit id="org.eclipse.emf.common.feature.group" version="2.35.0.v20250401-0947"/>
48-
<unit id="org.eclipse.emf.common.source.feature.group" version="2.35.0.v20250401-0947"/>
49-
<unit id="org.eclipse.emf.ecore.feature.group" version="2.40.0.v20250414-1351"/>
50-
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.40.0.v20250414-1351"/>
51-
<!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
52-
<!-- Check version in "<EMF>/features" directory -->
53-
<unit id="org.eclipse.emf.edit.feature.group" version="2.24.0.v20250330-0741"/>
54-
<unit id="org.eclipse.emf.edit.source.feature.group" version="2.24.0.v20250330-0741"/>
55-
<unit id="org.eclipse.emf.databinding.feature.group" version="1.12.0.v20240604-0832"/>
56-
<unit id="org.eclipse.emf.databinding.source.feature.group" version="1.12.0.v20240604-0832"/>
57-
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.12.0.v20240604-0832"/>
58-
<unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.12.0.v20240604-0832"/>
46+
<unit id="org.eclipse.emf.common" version="2.42.0.v20250401-0947"/>
47+
<unit id="org.eclipse.emf.ecore" version="2.39.0.v20250401-0947"/>
48+
<unit id="org.eclipse.emf.ecore.change" version="2.17.0.v20240604-0832"/>
49+
<unit id="org.eclipse.emf.ecore.xmi" version="2.39.0.v20250414-1351"/>
50+
<unit id="org.eclipse.emf.edit" version="2.23.0.v20250330-0741"/>
51+
<unit id="org.eclipse.emf.databinding" version="1.9.0.v20240604-0832"/>
52+
<unit id="org.eclipse.emf.databinding.edit" version="1.10.0.v20240604-0832"/>
5953
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.42.0"/>
6054
</location>
6155

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
<feature id="org.eclipse.sdk.tests" version="0.0.0"/>
44
<feature id="org.eclipse.equinox.p2.sdk" version="0.0.0"/>
55
<feature id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/>
6+
<feature id="org.eclipse.equinox.p2.discovery.feature.source" version="0.0.0"/>
67
<feature id="org.eclipse.core.runtime.feature" version="0.0.0"/>
78
<feature id="org.eclipse.equinox.sdk" version="0.0.0"/>
9+
<feature id="org.eclipse.sdk.examples.source" version="0.0.0"/>
810
<feature id="org.eclipse.swt.tools.feature" version="0.0.0"/>
11+
<feature id="org.eclipse.swt.tools.feature.source" version="0.0.0"/>
912
<feature id="org.eclipse.equinox.executable" version="0.0.0"/>
1013
<feature id="org.eclipse.sdk" version="0.0.0"/>
14+
<feature id="org.eclipse.e4.core.tools.feature.source" version="0.0.0"/>
1115
<feature id="org.eclipse.e4.tools.persistence.feature" version="0.0.0"/>
1216
<feature id="org.eclipse.pde.unittest.junit" version="0.0.0"/>
17+
<feature id="org.eclipse.pde.unittest.junit.source" version="0.0.0"/>
1318
<feature id="org.eclipse.tips.feature" version="0.0.0"/>
19+
<feature id="org.eclipse.tips.feature.source" version="0.0.0"/>
1420
<feature id="org.eclipse.jdt.ui.unittest.junit.feature" version="0.0.0"/>
15-
<feature id="org.eclipse.emf.common" version="0.0.0"/>
16-
<feature id="org.eclipse.emf.ecore" version="0.0.0"/>
17-
<feature id="org.eclipse.emf.edit" version="0.0.0"/>
18-
<feature id="org.eclipse.emf.databinding" version="0.0.0"/>
19-
<feature id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
21+
<feature id="org.eclipse.jdt.ui.unittest.junit.feature.source" version="0.0.0"/>
2022
<bundle id="jakarta.annotation-api" version="1.3.5"/>
2123
<bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
2224
<bundle id="org.eclipse.equinox.slf4j"/>
2325
<bundle id="org.eclipse.tm.terminal.control"/>
24-
</site>
26+
</site>

0 commit comments

Comments
 (0)