Skip to content

Commit

Permalink
Remove org.hamcrest.core from Eclipse SDK
Browse files Browse the repository at this point in the history
- 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.

#2343
  • Loading branch information
merks committed Sep 29, 2024
1 parent ee54898 commit b74e068
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
12 changes: 9 additions & 3 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
<unit id="org.apache.xmlgraphics.source" version="2.9.0.v20230916-1600"/>

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

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

<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>

<!-- Transitive dependency of jxpath, not available as OSGi bundle on Maven Central -->
<unit id="org.jdom" version="1.1.3.v20230812-1600"/>
<unit id="org.jdom.source" version="1.1.3.v20230812-1600"/>
Expand All @@ -55,6 +54,13 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202409180633"/>
</location>

<!-- This is temporary to make progress on https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2343 -->
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.junit.source" version="4.13.2.v20240929-1000"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
</location>

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.common.feature.group" version="2.33.0.v20240911-1027"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.releng.tests;singleton:=true
Bundle-Version: 3.6.500.qualifier
Bundle-Version: 3.6.600.qualifier
Eclipse-BundleShape: dir
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,5 @@ about_cairo.html
*/plugins/org.apache.commons.codec_*
*/plugins/org.apache.commons.codec.source_*
*/plugins/org.apache.commons.httpclient.source_*
*/plugins/org.hamcrest.core.source_*
*/eclipse/p2/org.eclipse.equinox.p2.metadata.repository/cache/content*_jar/content.xml
*/eclipse/artifacts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</parent>
<groupId>org.eclipse.releng</groupId>
<artifactId>org.eclipse.releng.tests</artifactId>
<version>3.6.500-SNAPSHOT</version>
<version>3.6.600-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,6 @@
id="org.eclipse.equinox.bidi.tests"
version="0.0.0"/>

<plugin
id="org.hamcrest.core"
version="0.0.0"/>

<plugin
id="org.mockito.mockito-core"
version="0.0.0"/>
Expand Down

0 comments on commit b74e068

Please sign in to comment.