From 7d2675ba40b145aaffcbe32dc59c82b050aa51f9 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Wed, 11 Jan 2017 14:11:16 +0100
Subject: [PATCH 1/4] 479196: AntlrToolFacade always downloads antlr-generator
 in Maven build

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
---
 .../org.xtext.example.full/pom.xml            |  5 +++++
 .../org.xtext.example.mavenTycho/pom.xml      |  5 +++++
 .../org.xtext.example.mavenTychoP2/pom.xml    |  5 +++++
 .../wizard/RuntimeProjectDescriptor.xtend     |  5 +++++
 .../wizard/RuntimeProjectDescriptor.java      | 20 +++++++++++++++++++
 5 files changed, 40 insertions(+)

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
index 5d92422c5..b4793ebca 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
@@ -56,6 +56,11 @@
 						<artifactId>org.eclipse.xtext.xbase</artifactId>
 						<version>${xtextVersion}</version>
 					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>xtext-antlr-generator</artifactId>
+						<version>[2.1.1, 3.0)</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
index 69b3e4aff..ab292b10a 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
@@ -56,6 +56,11 @@
 						<artifactId>org.eclipse.xtext.xbase</artifactId>
 						<version>${xtextVersion}</version>
 					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>xtext-antlr-generator</artifactId>
+						<version>[2.1.1, 3.0)</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
index 5ec3a02f2..a9af94780 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
@@ -56,6 +56,11 @@
 						<artifactId>org.eclipse.xtext.xbase</artifactId>
 						<version>${xtextVersion}</version>
 					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>xtext-antlr-generator</artifactId>
+						<version>[2.1.1, 3.0)</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
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 fd002e2da..5253f652b 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
@@ -375,6 +375,11 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 										<artifactId>org.eclipse.xtext.xbase</artifactId>
 										<version>${xtextVersion}</version>
 									</dependency>
+									<dependency>
+										<groupId>org.eclipse.xtext</groupId>
+										<artifactId>xtext-antlr-generator</artifactId>
+										<version>[2.1.1, 3.0)</version>
+									</dependency>
 								</dependencies>
 							«ENDIF»
 						</plugin>
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 8b67614c8..f838c131d 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
@@ -915,6 +915,26 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
           _builder.append("</dependency>");
           _builder.newLine();
           _builder.append("\t\t\t");
+          _builder.append("\t");
+          _builder.append("<dependency>");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("\t\t");
+          _builder.append("<groupId>org.eclipse.xtext</groupId>");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("\t\t");
+          _builder.append("<artifactId>xtext-antlr-generator</artifactId>");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("\t\t");
+          _builder.append("<version>[2.1.1, 3.0)</version>");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("\t");
+          _builder.append("</dependency>");
+          _builder.newLine();
+          _builder.append("\t\t\t");
           _builder.append("</dependencies>");
           _builder.newLine();
         }

From 8fca65f7eec32699270f5146ca40576c8babac0a Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Wed, 11 Jan 2017 15:22:16 +0100
Subject: [PATCH 2/4] 479196: added xtext-antlr-generator also in the
 build.gradle

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
---
 .../org.xtext.example.full/build.gradle                        | 1 +
 .../org.xtext.example.gradle/build.gradle                      | 1 +
 .../eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend  | 1 +
 .../eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java   | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
index 12f4185df..991e3f103 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
 }
 
 task generateXtextLanguage(type: JavaExec) {
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
index 07e85a8da..4fdd46288 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
@@ -15,6 +15,7 @@ dependencies {
 	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
 }
 
 task generateXtextLanguage(type: JavaExec) {
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 5253f652b..11dc1cbd7 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
@@ -284,6 +284,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 					mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:«config.xtextVersion.mweVersion»"
 					mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 					mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+					mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
 					«IF fromExistingEcoreModels»
 						mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}"
 						mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
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 f838c131d..9e0492702 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
@@ -596,6 +596,9 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
       _builder.append("\t");
       _builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}\"");
       _builder.newLine();
+      _builder.append("\t");
+      _builder.append("mwe2 \"org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)\"");
+      _builder.newLine();
       {
         boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
         if (_isFromExistingEcoreModels) {

From 9eb9ad3345080a8ad10209d80bf2369bf5ba1f53 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Wed, 11 Jan 2017 15:24:46 +0100
Subject: [PATCH 3/4] 479196: get antlr-generator version using a method

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
---
 .../src/org/eclipse/xtext/util/XtextVersion.xtend  |  4 ++++
 .../org/eclipse/xtext/util/XtextVersion.java       |  4 ++++
 .../xtext/wizard/RuntimeProjectDescriptor.xtend    |  4 ++--
 .../xtext/wizard/RuntimeProjectDescriptor.java     | 14 ++++++++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
index 33c13671d..1f43fafec 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
@@ -30,6 +30,10 @@ class XtextVersion {
 		'2.9.0.201605261059'
 	}
 
+	def getAntlrGeneratorVersion() {
+		'[2.1.1, 3.0)'
+	}
+
 	def getXtendGradlePluginVersion() {
 		xtextGradlePluginVersion
 	}
diff --git a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
index 46a5fed99..d837035d0 100644
--- a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
+++ b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
@@ -53,6 +53,10 @@ public class XtextVersion {
     return "2.9.0.201605261059";
   }
   
+  public String getAntlrGeneratorVersion() {
+    return "[2.1.1, 3.0)";
+  }
+  
   public String getXtendGradlePluginVersion() {
     return this.getXtextGradlePluginVersion();
   }
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 11dc1cbd7..054f54b47 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
@@ -284,7 +284,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 					mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:«config.xtextVersion.mweVersion»"
 					mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 					mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
-					mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
+					mwe2 "org.eclipse.xtext:xtext-antlr-generator:«config.xtextVersion.antlrGeneratorVersion»"
 					«IF fromExistingEcoreModels»
 						mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}"
 						mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
@@ -379,7 +379,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 									<dependency>
 										<groupId>org.eclipse.xtext</groupId>
 										<artifactId>xtext-antlr-generator</artifactId>
-										<version>[2.1.1, 3.0)</version>
+										<version>«config.xtextVersion.antlrGeneratorVersion»</version>
 									</dependency>
 								</dependencies>
 							«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 9e0492702..0e774ba25 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
@@ -597,8 +597,11 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
       _builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}\"");
       _builder.newLine();
       _builder.append("\t");
-      _builder.append("mwe2 \"org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)\"");
-      _builder.newLine();
+      _builder.append("mwe2 \"org.eclipse.xtext:xtext-antlr-generator:");
+      String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
+      _builder.append(_antlrGeneratorVersion, "\t");
+      _builder.append("\"");
+      _builder.newLineIfNotEmpty();
       {
         boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
         if (_isFromExistingEcoreModels) {
@@ -931,8 +934,11 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
           _builder.newLine();
           _builder.append("\t\t\t");
           _builder.append("\t\t");
-          _builder.append("<version>[2.1.1, 3.0)</version>");
-          _builder.newLine();
+          _builder.append("<version>");
+          String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
+          _builder.append(_antlrGeneratorVersion, "\t\t\t\t\t");
+          _builder.append("</version>");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t\t\t");
           _builder.append("\t");
           _builder.append("</dependency>");

From 00a949a153ea7a935608e52ccf79470536caf917 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Wed, 11 Jan 2017 15:40:49 +0100
Subject: [PATCH 4/4] 479196: use version range [2.1.1,3)

see
https://github.com/eclipse/xtext-core/pull/235#issuecomment-271882660

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
---
 .../org.xtext.example.full/build.gradle                         | 2 +-
 .../org.xtext.example.full/pom.xml                              | 2 +-
 .../org.xtext.example.gradle/build.gradle                       | 2 +-
 .../org.xtext.example.mavenTycho/pom.xml                        | 2 +-
 .../org.xtext.example.mavenTychoP2/pom.xml                      | 2 +-
 .../src/org/eclipse/xtext/util/XtextVersion.xtend               | 2 +-
 .../xtend-gen/org/eclipse/xtext/util/XtextVersion.java          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
index 991e3f103..458a2bf8a 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
-	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
+	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
 }
 
 task generateXtextLanguage(type: JavaExec) {
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
index b4793ebca..2be6cb07a 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
@@ -59,7 +59,7 @@
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3.0)</version>
+						<version>[2.1.1, 3)</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
index 4fdd46288..3a3c4bcff 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
-	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3.0)"
+	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
 }
 
 task generateXtextLanguage(type: JavaExec) {
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
index ab292b10a..5e595bfbd 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
@@ -59,7 +59,7 @@
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3.0)</version>
+						<version>[2.1.1, 3)</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
index a9af94780..098f5fd15 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml
@@ -59,7 +59,7 @@
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3.0)</version>
+						<version>[2.1.1, 3)</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
index 1f43fafec..02942b6fa 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
@@ -31,7 +31,7 @@ class XtextVersion {
 	}
 
 	def getAntlrGeneratorVersion() {
-		'[2.1.1, 3.0)'
+		'[2.1.1, 3)'
 	}
 
 	def getXtendGradlePluginVersion() {
diff --git a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
index d837035d0..6ad9808ec 100644
--- a/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
+++ b/org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
@@ -54,7 +54,7 @@ public class XtextVersion {
   }
   
   public String getAntlrGeneratorVersion() {
-    return "[2.1.1, 3.0)";
+    return "[2.1.1, 3)";
   }
   
   public String getXtendGradlePluginVersion() {