From 31bdc4f9a44b56d375d9880c1e3243298f4d9ad1 Mon Sep 17 00:00:00 2001
From: Stefan Oehme <stefan.oehme@itemis.de>
Date: Mon, 5 Oct 2015 09:53:31 +0200
Subject: [PATCH 1/2] [wizard] generate m2e/buildship integration

---
 .../wizard/RuntimeProjectDescriptor.xtend     | 73 ++++++++++++++-----
 1 file changed, 53 insertions(+), 20 deletions(-)

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 e1d8e9ee8..19cb68d96 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
@@ -469,7 +469,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-clean-plugin</artifactId>
-							<version>2.5</version>
 							<configuration>
 								<filesets combine.children="append">
 									<fileset>
@@ -550,28 +549,62 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 								</executions>
 							</plugin>
 							«IF isPlainMavenBuild»
-							<plugin>
-								<artifactId>maven-assembly-plugin</artifactId>
-								<version>2.5.5</version>
-								<configuration>
-									<descriptors>
-										<descriptor>jar-with-ecore-model.xml</descriptor>
-									</descriptors>
-									<appendAssemblyId>false</appendAssemblyId>
-								</configuration>
-								<executions>
-									<execution>
-										<id>make-assembly</id>
-										<phase>package</phase>
-										<goals>
-											<goal>single</goal>
-										</goals>
-									</execution>
-								</executions>
-							</plugin>
+								<plugin>
+									<artifactId>maven-assembly-plugin</artifactId>
+									<version>2.5.5</version>
+									<configuration>
+										<descriptors>
+											<descriptor>jar-with-ecore-model.xml</descriptor>
+										</descriptors>
+										<appendAssemblyId>false</appendAssemblyId>
+									</configuration>
+									<executions>
+										<execution>
+											<id>make-assembly</id>
+											<phase>package</phase>
+											<goals>
+												<goal>single</goal>
+											</goals>
+										</execution>
+									</executions>
+								</plugin>
 							«ENDIF»
 						«ENDIF»
 					</plugins>
+					<pluginManagement>
+						<plugins>
+							<plugin>
+								<groupId>org.eclipse.m2e</groupId>
+								<artifactId>lifecycle-mapping</artifactId>
+								<version>1.0.0</version>
+								<configuration>
+									<lifecycleMappingMetadata>
+										<pluginExecutions>
+											<pluginExecution>
+												<pluginExecutionFilter>
+													<groupId>
+														org.codehaus.mojo
+													</groupId>
+													<artifactId>
+														exec-maven-plugin
+													</artifactId>
+													<versionRange>
+														[1.2.1,)
+													</versionRange>
+													<goals>
+														<goal>java</goal>
+													</goals>
+												</pluginExecutionFilter>
+												<action>
+													<ignore></ignore>
+												</action>
+											</pluginExecution>
+										</pluginExecutions>
+									</lifecycleMappingMetadata>
+								</configuration>
+							</plugin>
+						</plugins>
+					</pluginManagement>
 				</build>
 			'''
 		]

From 42e4881ef4e794bf585f0759a097199b0dc0c2c0 Mon Sep 17 00:00:00 2001
From: Stefan Oehme <stefan.oehme@itemis.de>
Date: Mon, 5 Oct 2015 11:28:08 +0200
Subject: [PATCH 2/2] [wizard] fixed test expectations

---
 .../xtext/example/mydsl/GenerateMyDsl.mwe2    |  5 ++-
 .../org.xtext.example.full/pom.xml            | 35 ++++++++++++++++++-
 .../xtext/example/mydsl/GenerateMyDsl.mwe2    |  5 ++-
 .../org.xtext.example.mavenTycho/pom.xml      | 35 ++++++++++++++++++-
 .../xtext/example/mydsl/GenerateMyDsl.mwe2    |  5 ++-
 .../org.xtext.example.plainMaven/pom.xml      | 35 ++++++++++++++++++-
 6 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index 37915f33e..17c38695d 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -109,9 +109,8 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.OutlineTreeProviderFragment auto-inject {}
-			}
+			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			
 			fragment = adapter.FragmentAdapter {
 				fragment = outline.QuickOutlineFragment auto-inject {}
 			}
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 e50b68c05..d4f33bf83 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
@@ -59,7 +59,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
@@ -81,6 +80,40 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.2.1,)
+										</versionRange>
+										<goals>
+											<goal>java</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 </project>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index dc0d2d9ec..cb7dec168 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -117,9 +117,8 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.OutlineTreeProviderFragment auto-inject {}
-			}
+			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			
 			fragment = adapter.FragmentAdapter {
 				fragment = outline.QuickOutlineFragment auto-inject {}
 			}
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 fb157403b..7891ba03e 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
@@ -59,7 +59,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
@@ -81,6 +80,40 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.2.1,)
+										</versionRange>
+										<goals>
+											<goal>java</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 </project>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index ae2204c6c..305893cde 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -113,9 +113,8 @@ Workflow {
 			}
 			
 			// outline API
-			fragment = adapter.FragmentAdapter {
-				fragment = outline.OutlineTreeProviderFragment auto-inject {}
-			}
+			fragment = ui.outline.OutlineTreeProviderFragment2 {}
+			
 			fragment = adapter.FragmentAdapter {
 				fragment = outline.QuickOutlineFragment auto-inject {}
 			}
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
index 79ca1fce1..82230669d 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
@@ -59,7 +59,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
@@ -147,6 +146,40 @@
 				</executions>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.2.1,)
+										</versionRange>
+										<goals>
+											<goal>java</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 	<dependencies>