From ead00d2e73c7e30f49945f263830472412a917ba Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 24 Jun 2024 19:56:44 +0200
Subject: [PATCH] Align name of rt.equinox.p2 submodule to actual repository
 name

... which is equinox.p2
---
 .gitmodules                                                   | 4 ++--
 cje-production/streams/repositories_java23.txt                | 2 +-
 cje-production/streams/repositories_master.txt                | 2 +-
 .../bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties   | 2 +-
 .../org.eclipse.platform.doc.isv/cbi_basedirs.properties      | 2 +-
 eclipse.platform.common/pom.xml                               | 2 +-
 rt.equinox.p2 => equinox.p2                                   | 0
 oomph/Platform.setup                                          | 2 +-
 pom.xml                                                       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename rt.equinox.p2 => equinox.p2 (100%)

diff --git a/.gitmodules b/.gitmodules
index f19d17edd3a..c990633a21f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,6 +32,6 @@
 [submodule "equinox"]
   path = equinox
   url = https://github.com/eclipse-equinox/equinox.git
-[submodule "rt.equinox.p2"]
-  path = rt.equinox.p2
+[submodule "equinox.p2"]
+  path = equinox.p2
   url = https://github.com/eclipse-equinox/p2.git
diff --git a/cje-production/streams/repositories_java23.txt b/cje-production/streams/repositories_java23.txt
index 85dc93aa94b..d2d39e605b7 100644
--- a/cje-production/streams/repositories_java23.txt
+++ b/cje-production/streams/repositories_java23.txt
@@ -1,6 +1,6 @@
 equinox.binaries: master
 equinox: master
-rt.equinox.p2: master
+equinox.p2: master
 eclipse.jdt: master
 eclipse.jdt.core.binaries: master
 eclipse.jdt.core: BETA_JAVA23
diff --git a/cje-production/streams/repositories_master.txt b/cje-production/streams/repositories_master.txt
index 43bc370d106..f2cdaaeb39a 100644
--- a/cje-production/streams/repositories_master.txt
+++ b/cje-production/streams/repositories_master.txt
@@ -1,6 +1,6 @@
 equinox.binaries: master
 equinox: master
-rt.equinox.p2: master
+equinox.p2: master
 eclipse.jdt.core.binaries: master
 eclipse.jdt.core: master
 eclipse.jdt.debug: master
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 cdee8af58df..fe65ad4d106 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
@@ -16,7 +16,7 @@ eclipse.platform.ua=../../../eclipse.platform/ua
 eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
 rt.equinox.bundles.bundles=../../../equinox/bundles
 rt.equinox.framework.bundles=../../../equinox/bundles
-rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
+rt.equinox.p2.bundles=../../../equinox.p2/bundles
 
 eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
 
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
index 65039318473..9de7f5a3c2b 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -15,7 +15,7 @@ eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
 eclipse.platform.update=../../../eclipse.platform/update
 rt.equinox.bundles.bundles=../../../equinox/bundles
 rt.equinox.framework.bundles=../../../equinox/bundles
-rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
+rt.equinox.p2.bundles=../../../equinox.p2/bundles
 eclipse.platform.team.examples=../../../eclipse.platform/team/examples
 eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
 eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
diff --git a/eclipse.platform.common/pom.xml b/eclipse.platform.common/pom.xml
index 849d225d1aa..14179a56802 100644
--- a/eclipse.platform.common/pom.xml
+++ b/eclipse.platform.common/pom.xml
@@ -40,7 +40,7 @@
 	<eclipse.platform.update>../../../eclipse.platform/update</eclipse.platform.update>
 	<rt.equinox.bundles.bundles>../../../equinox/bundles</rt.equinox.bundles.bundles>
 	<rt.equinox.framework.bundles>../../../equinox/bundles</rt.equinox.framework.bundles>
-	<rt.equinox.p2.bundles>../../../rt.equinox.p2/bundles</rt.equinox.p2.bundles>
+	<rt.equinox.p2.bundles>../../../equinox.p2/bundles</rt.equinox.p2.bundles>
 	<eclipse.pde.ui.apitools>../../../eclipse.pde/apitools</eclipse.pde.ui.apitools>
 	<eclipse.pde.ui.ui>../../../eclipse.pde/ui</eclipse.pde.ui.ui>
 	<eclipse.pde.build>../../../eclipse.pde/build</eclipse.pde.build>
diff --git a/rt.equinox.p2 b/equinox.p2
similarity index 100%
rename from rt.equinox.p2
rename to equinox.p2
diff --git a/oomph/Platform.setup b/oomph/Platform.setup
index 89d1700506d..63440b8a08b 100644
--- a/oomph/Platform.setup
+++ b/oomph/Platform.setup
@@ -707,7 +707,7 @@
           <excludedPath>eclipse.platform.ui</excludedPath>
           <excludedPath>equinox</excludedPath>
           <excludedPath>equinox.binaries</excludedPath>
-          <excludedPath>rt.equinox.p2</excludedPath>
+          <excludedPath>equinox.p2</excludedPath>
         </sourceLocator>
       </targlet>
       <composedTarget>eclipse-sdk-prereqs</composedTarget>
diff --git a/pom.xml b/pom.xml
index 7d416faa285..03b1ab6e64f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <module>eclipse.platform.swt</module>
 
     <module>equinox</module>
-    <module>rt.equinox.p2</module>
+    <module>equinox.p2</module>
 
     <module>eclipse.platform.releng</module>
     <module>eclipse.platform.releng.tychoeclipsebuilder</module>