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 index 4c60301095a..805edeb5c48 100644 --- 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 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml index 1d0708e21ae..c6f11c89a89 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml index f2afc6ba4ef..66b62950268 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml index ea0a22fa171..5eba12a52c4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml index 25c6885996c..5af411e4b20 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml index 5b188c10cd8..dd7ae36fc41 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml index fcf30e2bfa9..0bc99400053 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/pom.xml @@ -39,8 +39,8 @@ org.eclipse.xtext - xtext-antlr-generator - 2.1.1 + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml index 0d16090e103..bdf1ed45f17 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml @@ -44,8 +44,8 @@ org.eclipse.xtext - xtext-antlr-generator - [2.1.1, 3) + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 1a48533490f..933f382e8ad 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -361,8 +361,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { org.eclipse.xtext - xtext-antlr-generator - «config.xtextVersion.antlrGeneratorVersion» + org.eclipse.xtext.xtext.generator.dependencies + ${xtextVersion} «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 4367a06b696..b92cab7ee58 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.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("xtext-antlr-generator"); + _builder.append("org.eclipse.xtext.xtext.generator.dependencies"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("\t\t"); - _builder.append(""); - String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion(); - _builder.append(_antlrGeneratorVersion, "\t\t\t\t\t"); - _builder.append(""); - _builder.newLineIfNotEmpty(); + _builder.append("${xtextVersion}"); + _builder.newLine(); _builder.append("\t\t\t"); _builder.append("\t"); _builder.append("");