Skip to content

Commit 2097797

Browse files
committed
Include only ECF's bundles in the target platform
- Include ECF's 3rc party dependencies directly from Orbit. - Remove ECF's features from the category.xml and from org.eclipse.equinox.sdk.product.
1 parent 808d4a7 commit 2097797

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<unit id="org.commonmark" version="0.24.0.v20241021-1700"/>
3333
<unit id="org.commonmark-gfm-tables" version="0.24.0.v20241021-1700"/>
3434

35+
<!-- ECF -->
36+
<unit id="org.apache.httpcomponents.client5.httpclient5" version="0.0.0"/>
37+
<unit id="org.apache.httpcomponents.client5.httpclient5-win" version="0.0.0"/>
38+
<unit id="org.apache.httpcomponents.core5.httpcore5" version="0.0.0"/>
39+
<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="0.0.0"/>
40+
3541
<!-- This is the "normal" Orbit repository is expected to be updated on milestones and releases based on Orbit deliveries. -->
3642
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.36.0"/>
3743
</location>
@@ -54,14 +60,13 @@
5460
</location>
5561

5662
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
57-
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.7.0.v20250304-2338"/>
58-
<unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.7.0.v20250304-2338"/>
59-
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.15.0.v20250115-0406"/>
60-
<unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.15.0.v20250115-0406"/>
61-
<unit id="org.eclipse.ecf.filetransfer.httpclientjava.feature.feature.group" version="2.1.0.v20250108-1923"/>
62-
<unit id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source.feature.group" version="2.1.0.v20250108-1923"/>
63-
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.2.0.v20250522-2300"/>
64-
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.source.feature.group" version="1.2.0.v20250522-2300"/>
63+
<unit id="org.eclipse.ecf" version="3.13.0.v20250304-2338"/>
64+
<unit id="org.eclipse.ecf.identity" version="3.10.0.v20240812-1535"/>
65+
<unit id="org.eclipse.ecf.filetransfer" version="5.1.103.v20230705-0614"/>
66+
<unit id="org.eclipse.ecf.provider.filetransfer" version="3.3.100.v20250115-0406"/>
67+
<unit id="org.eclipse.ecf.provider.filetransfer.httpclient5" version="1.1.100.v20250108-1923"/>
68+
<unit id="org.eclipse.ecf.provider.filetransfer.httpclient5.win32" version="1.1.200.v20250122-1953"/>
69+
<unit id="org.eclipse.ecf.provider.filetransfer.httpclientjava" version="2.1.0.v20250108-1923"/>
6570
<repository location="https://download.eclipse.org/rt/ecf/3.16.2/site.p2/3.16.2.v20250528-1917"/>
6671
</location>
6772

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
<feature id="org.eclipse.emf.edit.source" version="0.0.0"/>
3030
<feature id="org.eclipse.emf.databinding.source" version="0.0.0"/>
3131
<feature id="org.eclipse.emf.databinding.edit.source" version="0.0.0"/>
32-
<feature id="org.eclipse.ecf.core.feature" version="0.0.0"/>
33-
<feature id="org.eclipse.ecf.core.feature.source" version="0.0.0"/>
34-
<feature id="org.eclipse.ecf.filetransfer.feature" version="0.0.0"/>
35-
<feature id="org.eclipse.ecf.filetransfer.feature.source" version="0.0.0"/>
36-
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" version="0.0.0"/>
37-
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source" version="0.0.0"/>
38-
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" version="0.0.0"/>
39-
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source" version="0.0.0"/>
4032
<bundle id="jakarta.annotation-api" version="1.3.5"/>
4133
<bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
4234
<bundle id="org.eclipse.equinox.slf4j"/>

eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@ United States, other countries, or both.
159159
<feature id="org.eclipse.equinox.p2.extras.feature"/>
160160
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
161161
<feature id="org.eclipse.core.runtime.feature"/>
162-
<feature id="org.eclipse.ecf.core.feature.source"/>
163-
<feature id="org.eclipse.ecf.filetransfer.feature.source"/>
164-
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source"/>
165-
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source"/>
166-
<feature id="org.eclipse.ecf.core.feature"/>
167-
<feature id="org.eclipse.ecf.filetransfer.feature"/>
168-
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
169-
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
170162
</features>
171163

172164

0 commit comments

Comments
 (0)