Skip to content

Commit 9d9ccd3

Browse files
committed
Remove org.hamcrest.core from Eclipse SDK
- The org.hamcrest.core bundle is just an empty hull to provide metadata that redirects all references to it to the new org.hamcrest bundle that avoids split packages with the org.hamcrest.library bundle by combining all the content into a single bundle. - Nothing in the SDK should require org.hamcrest.core anymore, so it can be removed. - A new org.junit bundle from Orbit is needed that requires the org.hamcrest bundle instead of the org.hamcrest.core bundle. eclipse-platform#2343
1 parent ee54898 commit 9d9ccd3

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
<unit id="org.apache.xmlgraphics.source" version="2.9.0.v20230916-1600"/>
2424

2525
<!-- needed because org.eclipse.jdt.feature.group includes it, but it should include org.hamcrest (direct-from-maven) instead -->
26+
<!--
2627
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
2728
<unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
29+
-->
2830

2931
<unit id="org.apache.lucene.core" version="9.11.1.v20240628-1000"/>
3032
<unit id="org.apache.lucene.analysis-smartcn" version="9.11.1.v20240628-1000"/>
@@ -33,9 +35,6 @@
3335
<unit id="org.apache.lucene.analysis-smartcn.source" version="9.11.1.v20240628-1000"/>
3436
<unit id="org.apache.lucene.analysis-common.source" version="9.11.1.v20240628-1000"/>
3537

36-
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
37-
<unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>
38-
3938
<!-- Transitive dependency of jxpath, not available as OSGi bundle on Maven Central -->
4039
<unit id="org.jdom" version="1.1.3.v20230812-1600"/>
4140
<unit id="org.jdom.source" version="1.1.3.v20230812-1600"/>
@@ -55,6 +54,13 @@
5554
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202409180633"/>
5655
</location>
5756

57+
<!-- This is temporary to make progress on https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2343 -->
58+
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
59+
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
60+
<unit id="org.junit.source" version="4.13.2.v20240929-1000"/>
61+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
62+
</location>
63+
5864
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
5965
<!-- Check version in "<EMF>/features" directory -->
6066
<unit id="org.eclipse.emf.common.feature.group" version="2.33.0.v20240911-1027"/>

eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.releng.tests;singleton:=true
5-
Bundle-Version: 3.6.500.qualifier
5+
Bundle-Version: 3.6.600.qualifier
66
Eclipse-BundleShape: dir
77
Bundle-Vendor: %Plugin.providerName
88
Bundle-Localization: plugin

eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,5 @@ about_cairo.html
107107
*/plugins/org.apache.commons.codec_*
108108
*/plugins/org.apache.commons.codec.source_*
109109
*/plugins/org.apache.commons.httpclient.source_*
110-
*/plugins/org.hamcrest.core.source_*
111110
*/eclipse/p2/org.eclipse.equinox.p2.metadata.repository/cache/content*_jar/content.xml
112111
*/eclipse/artifacts.xml

eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</parent>
2222
<groupId>org.eclipse.releng</groupId>
2323
<artifactId>org.eclipse.releng.tests</artifactId>
24-
<version>3.6.500-SNAPSHOT</version>
24+
<version>3.6.600-SNAPSHOT</version>
2525
<packaging>eclipse-test-plugin</packaging>
2626
<properties>
2727
<testSuite>${project.artifactId}</testSuite>

eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,6 @@
351351
id="org.eclipse.equinox.bidi.tests"
352352
version="0.0.0"/>
353353

354-
<plugin
355-
id="org.hamcrest.core"
356-
version="0.0.0"/>
357-
358354
<plugin
359355
id="org.mockito.mockito-core"
360356
version="0.0.0"/>

0 commit comments

Comments
 (0)