From 2b7e195a74ea3387e4665cc7682525845ccf5066 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@itemis.de>
Date: Sun, 27 Aug 2023 18:53:33 +0200
Subject: [PATCH] update to Xtext 2.32

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
---
 .../example/mydsl/tests/SampleTest.xtend      |  2 +-
 org.xtext.example.mydsl/META-INF/MANIFEST.MF  |  2 +-
 org.xtext.example.mydsl/pom.xml               |  4 +-
 pom.xml                                       | 58 +++++++++++++++++--
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/org.xtext.example.mydsl.tests/src/org/xtext/example/mydsl/tests/SampleTest.xtend b/org.xtext.example.mydsl.tests/src/org/xtext/example/mydsl/tests/SampleTest.xtend
index 63f33b8..32805d6 100644
--- a/org.xtext.example.mydsl.tests/src/org/xtext/example/mydsl/tests/SampleTest.xtend
+++ b/org.xtext.example.mydsl.tests/src/org/xtext/example/mydsl/tests/SampleTest.xtend
@@ -1,6 +1,6 @@
 package org.xtext.example.mydsl.tests
 
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.xtext.junit4.InjectWith
 import org.eclipse.xtext.junit4.XtextRunner
 import org.eclipse.xtext.junit4.util.ParseHelper
diff --git a/org.xtext.example.mydsl/META-INF/MANIFEST.MF b/org.xtext.example.mydsl/META-INF/MANIFEST.MF
index 7550305..9a3aa40 100644
--- a/org.xtext.example.mydsl/META-INF/MANIFEST.MF
+++ b/org.xtext.example.mydsl/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: My Company
 Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: org.xtext.example.mydsl; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.31.0,2.32.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.32.0,2.33.0)";visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,
  com.ibm.icu;resolution:=optional,
  org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
diff --git a/org.xtext.example.mydsl/pom.xml b/org.xtext.example.mydsl/pom.xml
index 4ac7ede..f0c424e 100644
--- a/org.xtext.example.mydsl/pom.xml
+++ b/org.xtext.example.mydsl/pom.xml
@@ -82,7 +82,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.2.1</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -124,7 +124,7 @@
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>
 						<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
-						<version>2.14.0</version>
+						<version>2.15.0</version>
 						<optional>true</optional>
 					</dependency>
 					<dependency>
diff --git a/pom.xml b/pom.xml
index a5012af..7f2d231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<tycho-version>2.7.5</tycho-version>
-		<xtext-version>2.31.0</xtext-version>
+		<xtext-version>2.32.0</xtext-version>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
@@ -27,17 +27,17 @@
 	<repositories>
 		<repository>
 			<id>eclipse</id>
-			<url>https://download.eclipse.org/releases/2023-06</url>
+			<url>https://download.eclipse.org/releases/2023-09</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
 			<id>xtext</id>
-			<url>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/</url>
+			<url>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
 			<id>mwe</id>
-			<url>https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0/</url>
+			<url>https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -47,7 +47,7 @@
 		</repository>
 		<repository>
 			<id>xpand</id>
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/</url>
+			<url>https://download.eclipse.org/modeling/m2t/xpand/updates/releases/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -61,6 +61,32 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
+		<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent 
+			which is taken from exec-maven-plugin from at least version 1.6.0 -->
+		<repository>
+			<id>ossrh-snapshots</id>
+			<name>ossrh-snapshots</name>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
+		</repository>
+		<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by 
+			org/xtext/antlr-generator/3.2.1 -->
+		<repository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus Snapshots</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -74,6 +100,28 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+		<pluginRepository>
+			<id>ossrh-snapshots</id>
+			<name>ossrh-snapshots</name>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus Snapshots</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
 	</pluginRepositories>
 
 	<build>