From 75e304e3040d43d0183a75a9f6212b8a07f0b5f7 Mon Sep 17 00:00:00 2001
From: Stefan Oehme <stefan.oehme@itemis.de>
Date: Thu, 22 Oct 2015 11:33:08 +0200
Subject: [PATCH] [generator2][wizard] only depend on new generator in new
 projects

---
 .../org.eclipse.xtext.xtext.generator/pom.xml | 71 +++++++++++++++++--
 .../wizard/RuntimeProjectDescriptor.xtend     |  7 --
 .../org.eclipse.xtext/.settings/.api_filters  |  6 ++
 .../org/eclipse/xtext/XtextRuntimeModule.java | 11 ++-
 .../build.properties                          |  1 -
 .../org.xtext.example.full/build.gradle       |  1 -
 .../org.xtext.example.full/build.properties   |  1 -
 .../org.xtext.example.full/pom.xml            |  5 --
 .../org.xtext.example.gradle/build.gradle     |  1 -
 .../build.properties                          |  1 -
 .../org.xtext.example.mavenTycho/pom.xml      |  5 --
 11 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/plugins/org.eclipse.xtext.xtext.generator/pom.xml b/plugins/org.eclipse.xtext.xtext.generator/pom.xml
index 90a427e85..7570aa0d1 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/pom.xml
+++ b/plugins/org.eclipse.xtext.xtext.generator/pom.xml
@@ -13,6 +13,11 @@
 	<name>Xtext Generator 2</name>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext</artifactId>
+			<version>[${project.version}]</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.xtext</groupId>
 			<artifactId>org.eclipse.xtext.ecore</artifactId>
@@ -33,15 +38,71 @@
 			<artifactId>org.eclipse.emf.codegen.ecore</artifactId>
 			<version>${emf.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.xtext</groupId>
-			<artifactId>xtext-antlr-generator</artifactId>
-			<version>${antlr-generator-version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 			<version>${icu4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.lib</artifactId>
+			<version>${mwe2-version}</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.common.types</artifactId>
+			<version>[${project.version}]</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe.utils</artifactId>
+			<version>${mwe-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
+			<version>${mwe2-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.language</artifactId>
+			<version>${mwe2-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
+			<version>${mwe2-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.emf</groupId>
+			<artifactId>org.eclipse.emf.mwe.core</artifactId>
+			<version>${mwe-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>xtext-antlr-generator</artifactId>
+			<version>${antlr-generator-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.common</artifactId>
+			<version>[3.6.0,)</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>${commons-logging.version}</version>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
index 61a61a7a8..76f422fac 100644
--- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
+++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -81,7 +81,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 		newLinkedHashSet(
 			"org.eclipse.xtext.xbase", 
 			"org.eclipse.xtext.common.types", 
-			"org.eclipse.xtext.generator",
 			"org.eclipse.xtext.xtext.generator",
 			"org.eclipse.emf.codegen.ecore", 
 			"org.eclipse.emf.mwe.utils",
@@ -249,7 +248,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 				}
 
 				dependencies {
-					mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
 					mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
 				}
 				
@@ -321,11 +319,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 							</configuration>
 							«IF config.needsTychoBuild»
 								<dependencies>
-									<dependency>
-										<groupId>org.eclipse.xtext</groupId>
-										<artifactId>org.eclipse.xtext.xtext</artifactId>
-										<version>${xtextVersion}</version>
-									</dependency>
 									<dependency>
 										<groupId>org.eclipse.xtext</groupId>
 										<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
diff --git a/plugins/org.eclipse.xtext/.settings/.api_filters b/plugins/org.eclipse.xtext/.settings/.api_filters
index 38ecde7b0..9a3df0c95 100644
--- a/plugins/org.eclipse.xtext/.settings/.api_filters
+++ b/plugins/org.eclipse.xtext/.settings/.api_filters
@@ -411,6 +411,12 @@
                 <message_argument value="bindIQualifiedNameConverter()"/>
             </message_arguments>
         </filter>
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.xtext.XtextRuntimeModule"/>
+                <message_argument value="bindIXtext2EcorePostProcessor()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java" type="org.eclipse.xtext.formatting.impl.MatcherNFAProvider">
         <filter id="576720909">
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java
index dc7b5a098..65ff25ee2 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java
@@ -106,8 +106,15 @@ public class XtextRuntimeModule extends AbstractXtextRuntimeModule {
 		return XtextValueConverters.class;
 	}
 
-	public Class<? extends IXtext2EcorePostProcessor> bindIXtext2EcorePostProcessor() {
-		return XtendXtext2EcorePostProcessor.class;
+	/**
+	 * @since 2.9
+	 */
+	public void configureIXtext2EcorePostProcessor(Binder binder) {
+		try {
+			Class.forName("org.eclipse.xtend.expression.ExecutionContext");
+			binder.bind(IXtext2EcorePostProcessor.class).to(XtendXtext2EcorePostProcessor.class);
+		} catch (ClassNotFoundException e) {
+		}
 	}
 
 	@Override
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties
index b11223798..73e1ca390 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties
@@ -6,7 +6,6 @@ bin.includes = .,\
                plugin.xml
 additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.generator,\
                      org.eclipse.xtext.xtext.generator,\
                      org.eclipse.emf.codegen.ecore,\
                      org.eclipse.emf.mwe.utils,\
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
index 24e0e07f7..e0575b42f 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle
@@ -9,7 +9,6 @@ configurations {
 }
 
 dependencies {
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
 }
 
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties
index b11223798..73e1ca390 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties
@@ -6,7 +6,6 @@ bin.includes = .,\
                plugin.xml
 additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.generator,\
                      org.eclipse.xtext.xtext.generator,\
                      org.eclipse.emf.codegen.ecore,\
                      org.eclipse.emf.mwe.utils,\
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
index 3f74a98f0..253f27afb 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
@@ -34,11 +34,6 @@
 					<includePluginDependencies>true</includePluginDependencies>
 				</configuration>
 				<dependencies>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.xtext</artifactId>
-						<version>${xtextVersion}</version>
-					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
index 88766a43a..3ae27e1c1 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle
@@ -11,7 +11,6 @@ configurations {
 }
 
 dependencies {
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
 }
 
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties
index b11223798..73e1ca390 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties
@@ -6,7 +6,6 @@ bin.includes = .,\
                plugin.xml
 additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.generator,\
                      org.eclipse.xtext.xtext.generator,\
                      org.eclipse.emf.codegen.ecore,\
                      org.eclipse.emf.mwe.utils,\
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
index 67f0f5328..33f147166 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
@@ -34,11 +34,6 @@
 					<includePluginDependencies>true</includePluginDependencies>
 				</configuration>
 				<dependencies>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.xtext</artifactId>
-						<version>${xtextVersion}</version>
-					</dependency>
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>