From c18c2f6417e7b2878c0e79d3149c40b2a9e7c475 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 14 Jan 2024 12:56:22 +0100
Subject: [PATCH] Fix or remove references to obsolete
 eclipse.platform.swt.binaries repo

Fix paths that are still relevant and remove obsolete occurrences.
Especially this fixes the provision of the SWT.zip files at the Eclipse
download page.

Part of https://github.com/eclipse-platform/eclipse.platform.swt.binaries/issues/2
---
 NOTICE                                                      | 1 -
 cje-production/mbscripts/mb300_gatherEclipseParts.sh        | 2 +-
 cje-production/streams/repositories_java22.txt              | 1 -
 cje-production/streams/repositories_master.txt              | 1 -
 eclipse-platform-sources/sources.xml                        | 6 +++---
 .../bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/NOTICE b/NOTICE
index 54938209b80..6d93bcc788f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -34,7 +34,6 @@ The project maintains the following source code repositories:
 * https:/github.com/eclipse-platform/eclipse.platform.releng
 * https:/github.com/eclipse-platform/eclipse.platform.resources
 * https:/github.com/eclipse-platform/eclipse.platform.swt
-* https:/github.com/eclipse-platform/eclipse.platform.swt.binaries
 * https:/github.com/eclipse-platform/eclipse.platform.team
 * https:/github.com/eclipse-platform/eclipse.platform.text
 * https:/github.com/eclipse-platform/eclipse.platform.ua
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index aecffd8c36c..0e5e3b91f49 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -91,7 +91,7 @@ if [ -z $PATCH_BUILD ]; then
 
 
   # gather swt zips
-  SWT_BUNDLES_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.swt.binaries/bundles
+  SWT_BUNDLES_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.swt/binaries
   if [ -d $SWT_BUNDLES_DIR ]; then
     pushd $SWT_BUNDLES_DIR
     cp */target/*.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID
diff --git a/cje-production/streams/repositories_java22.txt b/cje-production/streams/repositories_java22.txt
index d327eca2f28..6170704ffb3 100644
--- a/cje-production/streams/repositories_java22.txt
+++ b/cje-production/streams/repositories_java22.txt
@@ -14,7 +14,6 @@ eclipse.platform.common: master
 eclipse.platform.releng: master
 eclipse.platform.runtime: master
 eclipse.platform.swt: master
-eclipse.platform.swt.binaries: master
 eclipse.platform.team: master
 eclipse.platform.text: master
 eclipse.platform.ua: master
diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt
index beb383db03b..1adba432fe8 100644
--- a/cje-production/streams/repositories_master.txt
+++ b/cje-production/streams/repositories_master.txt
@@ -10,5 +10,4 @@ eclipse.pde: master
 eclipse.platform: master
 eclipse.platform.releng: master
 eclipse.platform.swt: master
-eclipse.platform.swt.binaries: master
 eclipse.platform.ui: master
diff --git a/eclipse-platform-sources/sources.xml b/eclipse-platform-sources/sources.xml
index cc53a8a647c..8d58d1e35e1 100644
--- a/eclipse-platform-sources/sources.xml
+++ b/eclipse-platform-sources/sources.xml
@@ -25,9 +25,9 @@
         <exclude>eclipse.platform/**/*.dll</exclude>
         <exclude>eclipse.platform/**/*.jnilib</exclude>
         <exclude>eclipse.platform/**/*.so</exclude>
-        <exclude>eclipse.platform.swt.binaries/**/*.dll</exclude>
-        <exclude>eclipse.platform.swt.binaries/**/*.jnilib</exclude>
-        <exclude>eclipse.platform.swt.binaries/**/*.so</exclude>
+        <exclude>eclipse.platform.swt/binaries/**/*.dll</exclude>
+        <exclude>eclipse.platform.swt/binaries/**/*.jnilib</exclude>
+        <exclude>eclipse.platform.swt/binaries/**/*.so</exclude>
         <exclude>rt.equinox.binaries/org.eclipse.equinox.executable/bin/**</exclude>
         <exclude>rt.equinox.binaries/org.eclipse.equinox.executable/contributed/**</exclude>
         <exclude>rt.equinox.binaries/**/*.dll</exclude>
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
index e0bd6d9e31c..cdee8af58df 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
@@ -9,7 +9,7 @@ eclipse.platform.debug=../../../eclipse.platform/debug
 eclipse.platform.platform=../../../eclipse.platform/platform
 eclipse.platform.resources.bundles=../../../eclipse.platform/resources/bundles
 eclipse.platform.runtime.bundles=../../../eclipse.platform/runtime/bundles
-eclipse.platform.swt.binaries=../../../eclipse.platform.swt.binaries/bundles
+eclipse.platform.swt.binaries=../../../eclipse.platform.swt/binaries
 eclipse.platform.swt.bundles=../../../eclipse.platform.swt/bundles
 eclipse.platform.team.bundles=../../../eclipse.platform/team/bundles
 eclipse.platform.ua=../../../eclipse.platform/ua