From 64ccb840fbc50b8fdddcb28a1bdcb35cee19649f Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich.opensource@gmail.com>
Date: Fri, 29 Sep 2023 10:14:44 +0200
Subject: [PATCH] remove xpand from targets and poms. See #2811

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
---
 org.eclipse.xtext.dev-bom/pom.xml | 15 ---------------
 org.eclipse.xtext/pom.xml         | 10 ----------
 xtext-latest.target               |  6 ------
 xtext-r202203.target              |  6 ------
 xtext-r202206.target              |  6 ------
 xtext-r202209.target              |  6 ------
 xtext-r202212.target              |  6 ------
 xtext-r202303.target              |  6 ------
 xtext-r202306.target              |  6 ------
 xtext-r202309.target              |  6 ------
 10 files changed, 73 deletions(-)

diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index fd473d770e9..394a2990059 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -394,21 +394,6 @@
 				<artifactId>org.eclipse.text</artifactId>
 				<version>3.12.300</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.xpand</groupId>
-				<artifactId>org.eclipse.xpand</artifactId>
-				<version>2.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.xpand</groupId>
-				<artifactId>org.eclipse.xtend.typesystem.emf</artifactId>
-				<version>2.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.xpand</groupId>
-				<artifactId>org.eclipse.xtend</artifactId>
-				<version>2.0.0</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.xtext</groupId>
 				<artifactId>xtext-antlr-generator</artifactId>
diff --git a/org.eclipse.xtext/pom.xml b/org.eclipse.xtext/pom.xml
index 5c246362ca5..2365307c7e3 100644
--- a/org.eclipse.xtext/pom.xml
+++ b/org.eclipse.xtext/pom.xml
@@ -75,16 +75,6 @@
 			<artifactId>org.eclipse.emf.mwe.utils</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.xpand</groupId>
-			<artifactId>org.eclipse.xtend.typesystem.emf</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.xpand</groupId>
-			<artifactId>org.eclipse.xtend</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
diff --git a/xtext-latest.target b/xtext-latest.target
index 5dd1b7f6c12..86054ef3ee4 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-latest" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202203.target b/xtext-r202203.target
index 9f16c99f5c5..7174ffddf14 100644
--- a/xtext-r202203.target
+++ b/xtext-r202203.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202203" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.29"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202206.target b/xtext-r202206.target
index 1b4f171a4c2..ea8176c288a 100644
--- a/xtext-r202206.target
+++ b/xtext-r202206.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202206" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202209.target b/xtext-r202209.target
index 8b0c1fd7df3..0c2a1fdf94b 100644
--- a/xtext-r202209.target
+++ b/xtext-r202209.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202209" sequenceNumber="7">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.31"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202212.target b/xtext-r202212.target
index b80a7f3f277..f1ae4c747e7 100644
--- a/xtext-r202212.target
+++ b/xtext-r202212.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202212" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202303.target b/xtext-r202303.target
index e371c553118..c36e696424b 100644
--- a/xtext-r202303.target
+++ b/xtext-r202303.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202303" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.33.0"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202306.target b/xtext-r202306.target
index 24f745b0690..6a15c8a508b 100644
--- a/xtext-r202306.target
+++ b/xtext-r202306.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202306" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
diff --git a/xtext-r202309.target b/xtext-r202309.target
index c2b3f4d3610..b7d85d7afc1 100644
--- a/xtext-r202309.target
+++ b/xtext-r202309.target
@@ -2,12 +2,6 @@
 <?pde version="3.8"?>
 <target name="xtext-r202309" sequenceNumber="8">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-			<unit id="org.eclipse.xpand" version="0.0.0"/>
-			<unit id="org.eclipse.xtend" version="0.0.0"/>
-			<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>