From 65b3ca781ae6ce4e06ff5d0b4ec6308a9364ebf2 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Fri, 21 May 2021 20:50:20 +0200
Subject: [PATCH] TITAN project migration to eclipse gitlab

As announced in https://www.eclipse.org/forums/index.php/t/1107586/
TITAN is migrating both their github and git.eclipse.org repositories to
eclipse gitlab.

Let's adjust our Makefile accordingly

Change-Id: I6a501d50891c4fda78d33d3efd6030244a4aaf50
---
 deps/Makefile | 50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/deps/Makefile b/deps/Makefile
index 3d49a68de..9296f1b0d 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -13,25 +13,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ECLIPSEGITHUB:=https://github.com/eclipse
-ECLIPSEGIT2:=https://git.eclipse.org/r/titan
 ECLIPSEGITLAB:=https://gitlab.eclipse.org/eclipse/titan
 OSMOGITHUB:=https://github.com/osmocom
 OSMOGIT:=git://git.osmocom.org
 
-ECLIPSEGITHUB_REPOS=	titan.Libraries.TCCUsefulFunctions \
+ECLIPSEGITLAB_REPOS=	titan.Libraries.TCCUsefulFunctions \
+			titan.ProtocolEmulations.M3UA \
+			titan.ProtocolModules.BSSAPP_v7.3.0 \
+			titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \
 			titan.ProtocolModules.DNS \
+			titan.ProtocolModules.GRE \
+			titan.ProtocolModules.GTP_v13.5.0 \
+			titan.ProtocolModules.GTPv2_v13.7.0 \
 			titan.ProtocolModules.ICMP \
 			titan.ProtocolModules.ICMPv6 \
 			titan.ProtocolModules.IP \
+			titan.ProtocolModules.ISUP_Q.762 \
 			titan.ProtocolModules.JSON_v07_2006 \
 			titan.ProtocolModules.L2TP \
+			titan.ProtocolModules.LLC_v7.1.0 \
 			titan.ProtocolModules.M3UA \
+			titan.ProtocolModules.MobileL3_v13.4.0 \
 			titan.ProtocolModules.SMPP \
 			titan.ProtocolModules.TCP \
 			titan.ProtocolModules.UDP \
 			titan.ProtocolModules.RTP \
-			titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \
+			titan.ProtocolModules.M2PA \
+			titan.ProtocolModules.ROSE \
+			titan.ProtocolModules.SCTP \
+			titan.ProtocolModules.SDP \
+			titan.ProtocolModules.SUA \
+			titan.ProtocolModules.NAS_EPS_15.2.0.1 \
+			titan.ProtocolModules.NS_v7.3.0 \
+			titan.ProtocolModules.SGsAP_13.2.0 \
+			titan.ProtocolModules.SNDCP_v7.0.0 \
 			titan.TestPorts.Common_Components.Socket-API \
 			titan.TestPorts.Common_Components.Abstract_Socket \
 			titan.TestPorts.HTTPmsg \
@@ -44,25 +59,6 @@ ECLIPSEGITHUB_REPOS=	titan.Libraries.TCCUsefulFunctions \
 			titan.TestPorts.TCPasp \
 			titan.TestPorts.UNIX_DOMAIN_SOCKETasp
 
-ECLIPSEGIT2_REPOS=	titan.ProtocolEmulations.M3UA \
-			titan.ProtocolModules.GRE \
-			titan.ProtocolModules.M2PA \
-			titan.ProtocolModules.ROSE \
-			titan.ProtocolModules.SCTP \
-			titan.ProtocolModules.SUA \
-			titan.ProtocolModules.SDP \
-			titan.ProtocolModules.BSSAPP_v7.3.0 \
-			titan.ProtocolModules.GTPv2_v13.7.0 \
-			titan.ProtocolModules.ISUP_Q.762 \
-			titan.ProtocolModules.LLC_v7.1.0 \
-			titan.ProtocolModules.MobileL3_v13.4.0 \
-			titan.ProtocolModules.NAS_EPS_15.2.0.1 \
-			titan.ProtocolModules.NS_v7.3.0 \
-			titan.ProtocolModules.SGsAP_13.2.0 \
-			titan.ProtocolModules.SNDCP_v7.0.0
-
-ECLIPSEGITLAB_REPOS=	titan.ProtocolModules.GTP_v13.5.0
-
 OSMOGITHUB_REPOS=	titan.TestPorts.SCTPasp \
 			titan.TestPorts.MTP3asp \
 			titan.TestPorts.UDPasp \
@@ -75,7 +71,7 @@ OSMOGIT_REPOS=		titan.ProtocolModules.MAP \
 			titan.TestPorts.AF_PACKET \
 			osmo-uecups
 
-ALL_REPOS=$(ECLIPSEGITHUB_REPOS) $(ECLIPSEGIT2_REPOS) $(ECLIPSEGITLAB_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS)
+ALL_REPOS=$(ECLIPSEGITLAB_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS)
 
 # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead.
 # Do not put references to branches here, except for local testing: this breaks the caching
@@ -183,12 +179,6 @@ else
 endif
 endef
 
-$(foreach dir,$(ECLIPSEGITHUB_REPOS), \
-	$(eval $(call GIT_template,$(dir),$(ECLIPSEGITHUB))))
-
-$(foreach dir,$(ECLIPSEGIT2_REPOS), \
-	$(eval $(call GIT_template,$(dir),$(ECLIPSEGIT2))))
-
 $(foreach dir,$(ECLIPSEGITLAB_REPOS), \
 	$(eval $(call GIT_template,$(dir),$(ECLIPSEGITLAB))))