Merge pull request #3308 from LorenzoBettini/lb_3304

xtext.generator.dependencies for exec-maven-plugin
eclipse-xtext · Dec 30, 2024 · 1251656 · 1251656
2 parents d4c5a97 + 15a3d99
commit 1251656
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 24 deletions.
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...stdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml b/...stdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...zard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml b/...zard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/....xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml b/....xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...ata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml b/...ata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/....tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml b/....tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...stdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml b/...stdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml
@@ -39,8 +39,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...text.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/...text.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -44,8 +44,8 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3)</version>
+						<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+						<version>${xtextVersion}</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/...ipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/...ipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -361,8 +361,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 								<dependencies>
 									<dependency>
 										<groupId>org.eclipse.xtext</groupId>
-										<artifactId>xtext-antlr-generator</artifactId>
-										<version>«config.xtextVersion.antlrGeneratorVersion»</version>
+										<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>
+										<version>${xtextVersion}</version>
 									</dependency>
 								</dependencies>
 							«ENDIF»

diff --git a/...xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/...xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
@@ -850,15 +850,12 @@ public PomFile pom() {
           _builder.newLine();
           _builder.append("\t\t\t");
           _builder.append("\t\t");
-          _builder.append("<artifactId>xtext-antlr-generator</artifactId>");
+          _builder.append("<artifactId>org.eclipse.xtext.xtext.generator.dependencies</artifactId>");
           _builder.newLine();
           _builder.append("\t\t\t");
           _builder.append("\t\t");
-          _builder.append("<version>");
-          String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
-          _builder.append(_antlrGeneratorVersion, "\t\t\t\t\t");
-          _builder.append("</version>");
-          _builder.newLineIfNotEmpty();
+          _builder.append("<version>${xtextVersion}</version>");
+          _builder.newLine();
           _builder.append("\t\t\t");
           _builder.append("\t");
           _builder.append("</dependency>");