From b74e068b836b5539569f47363ec6682198e56a64 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Sun, 29 Sep 2024 12:47:17 +0200
Subject: [PATCH] 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.

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2343
---
 .../eclipse-sdk-prereqs.target                       | 12 +++++++++---
 .../org.eclipse.releng.tests/META-INF/MANIFEST.MF    |  2 +-
 .../bundles/org.eclipse.releng.tests/ignoreFiles.txt |  1 -
 .../bundles/org.eclipse.releng.tests/pom.xml         |  2 +-
 .../features/org.eclipse.sdk.tests/feature.xml       |  4 ----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index 1b095d55e27..711ae44b173 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -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"/>
@@ -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"/>
@@ -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"/>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
index ded41c9aa6e..ace3aedf57b 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
@@ -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
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt
index f6768c67912..f9de821eec4 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt
@@ -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
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
index c921cd2fe02..65084e61356 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
@@ -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>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
index a5d1fce2d35..2db32750640 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -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"/>