From dd1ffa04075a2151d2efd77250b41c07146c951e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 16 Jun 2022 13:59:27 +0300
Subject: [PATCH] Change aggregator build to use merged equinox repo

Switches aggregator build to use the new merged equinox repository
instead of the old split ones.
See https://github.com/eclipse-equinox/equinox.bundles/issues/18
---
 .gitmodules | 9 +++------
 pom.xml     | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 6c46c5fbcbe..00d36423ab6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,12 +53,9 @@
 [submodule "rt.equinox.binaries"]
   path = rt.equinox.binaries
   url = https://github.com/eclipse-equinox/equinox.binaries.git
-[submodule "rt.equinox.bundles"]
-  path = rt.equinox.bundles
-  url = https://github.com/eclipse-equinox/equinox.bundles.git
-[submodule "rt.equinox.framework"]
-  path = rt.equinox.framework
-  url = https://github.com/eclipse-equinox/equinox.framework.git
+[submodule "equinox"]
+  path = equinox
+  url = https://github.com/eclipse-equinox/equinox.git
 [submodule "rt.equinox.p2"]
   path = rt.equinox.p2
   url = https://github.com/eclipse-equinox/p2.git
diff --git a/pom.xml b/pom.xml
index 5ac850307f5..edf6d34763d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,7 @@
     <module>eclipse.platform.ua</module>
     <module>eclipse.platform.ui.tools</module>
 
-    <module>rt.equinox.bundles</module>
-    <module>rt.equinox.framework</module>
+    <module>equinox</module>
     <module>rt.equinox.p2</module>
 
     <module>eclipse.platform.releng</module>