diff --git a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
index fb9319120..9d540fa67 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html"
     modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
     forceOverwrite="true" modelName="IndentationAwareUiTestLanguage" updateClasspath="false"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IndentationAwareUiTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="indentationAwareUiTestLang"
diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
index 3eb4f5e81..157a42c43 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html"
     modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
     forceOverwrite="true" modelName="PartialContentAssistTestLanguage" updateClasspath="false"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="PartialContentAssistTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="partialcontentassisttestlang"
diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
index 80f95ce9e..d94f96b2a 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html"
     modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
     forceOverwrite="true" modelName="PartialSerializationTestLanguage" updateClasspath="false"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient">
   <genPackages prefix="PartialSerializationTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="pstl" ecorePackage="PartialSerializationTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel
index 646089776..4b64786a4 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html"
     modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
     forceOverwrite="true" modelName="RenameTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="RenameTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="renametl" ecorePackage="RenameTestLanguage.ecore#/">
     <genClasses ecoreClass="RenameTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel
index eb0604fc7..9f7badc9a 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html"
     modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
     forceOverwrite="true" modelName="TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="TestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="testlang,testlangext" ecorePackage="TestLanguage.ecore#/">
     <genClasses ecoreClass="TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
index 50a0226d5..158b761ec 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen"
     modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="FileAwareTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.12">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12">
   <genPackages prefix="FileAware" basePackage="org.eclipse.xtext.testlanguages.fileAware"
       disposableProviderFactory="true" fileExtensions="fileawaretestlanguage" ecorePackage="FileAwareTestLanguage.ecore#/">
     <genClasses ecoreClass="FileAwareTestLanguage.ecore#//PackageDeclaration">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel
index 0e3ba5564..9965b3cb8 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen"
     modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="NestedRefsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9">
   <genPackages prefix="NestedRefs" basePackage="org.eclipse.xtext.testlanguages.nestedRefs"
       disposableProviderFactory="true" fileExtensions="nestedRefs" ecorePackage="NestedRefsTestLanguage.ecore#/">
     <genClasses ecoreClass="NestedRefsTestLanguage.ecore#//Doc">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel
index f72295b34..e40e63784 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen"
     modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="NoJdtTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9">
   <genPackages prefix="NoJdt" basePackage="org.eclipse.xtext.testlanguages.noJdt"
       disposableProviderFactory="true" fileExtensions="nojdt" ecorePackage="NoJdtTestLanguage.ecore#/">
     <genClasses ecoreClass="NoJdtTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel
index 5a54decb0..4046e71f4 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen"
     modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="XtextGrammarTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.12">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12">
   <genPackages prefix="XtextGrammarTest" basePackage="org.eclipse.xtext.testlanguages.xtextgrammar"
       disposableProviderFactory="true" fileExtensions="xtextgrammar" ecorePackage="XtextGrammarTestLanguage.ecore#/">
     <genClasses ecoreClass="XtextGrammarTestLanguage.ecore#//Grammar">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
index 478d05dc5..5550a4664 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="XtextGrammarTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="XtextTest" basePackage="org.eclipse.xtext" disposableProviderFactory="true"
       fileExtensions="xtextgrammartestlanguage" ecorePackage="XtextGrammarTestLanguage.ecore#/">
     <genClasses ecoreClass="XtextGrammarTestLanguage.ecore#//Grammar">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel
index 6835460fc..f367f178d 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="DummyTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="DummyLang" basePackage="org.eclipse.xtext.dummy" disposableProviderFactory="true"
       fileExtensions="dummytestlanguage" ecorePackage="DummyTestLanguage.ecore#/">
     <genClasses ecoreClass="DummyTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
index 71d83aa92..0325d967f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EnumAndReferenceTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="EnumAndReferenceTestLanguage" basePackage="org.eclipse.xtext.enumrules"
       disposableProviderFactory="true" fileExtensions="enumandreferencetestlanguage"
       ecorePackage="EnumAndReferenceTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
index e179d1fbd..22881682f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EnumRulesTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums">
   <genPackages prefix="EnumRulesTestLanguage" basePackage="org.eclipse.xtext.enumrules"
       disposableProviderFactory="true" fileExtensions="enumrulestestlanguage" ecorePackage="EnumRulesTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="EnumRulesTestLanguage.ecore#//GeneratedEnum">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
index f84f8b87d..203482b86 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="MultiRuleEnumTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9">
   <genPackages prefix="MultiRuleenums" basePackage="org.eclipse.xtext.enumrules" disposableProviderFactory="true"
       fileExtensions="multiruleenumtestlanguage" ecorePackage="MultiRuleEnumTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="MultiRuleEnumTestLanguage.ecore#//MyEnum">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel
index dfafa70d8..32898e984 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="FormatterTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Formattertestlanguage" basePackage="org.eclipse.xtext.formatting2.internal"
       disposableProviderFactory="true" fileExtensions="formattertestlanguage" ecorePackage="FormatterTestLanguage.ecore#/">
     <genClasses ecoreClass="FormatterTestLanguage.ecore#//Root"/>
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel
index 3d1c94ca3..a63627f90 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="RegionAccessTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Regionaccesstestlanguage" basePackage="org.eclipse.xtext.formatting2.regionaccess.internal"
       disposableProviderFactory="true" fileExtensions="regionaccesstestlanguage" ecorePackage="RegionAccessTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="RegionAccessTestLanguage.ecore#//Enum">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel
index f61741155..986295bb5 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SubTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="SuperTestLanguage.genmodel#//superPackage">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="SuperTestLanguage.genmodel#//superPackage">
   <genPackages prefix="SubPackage" basePackage="org.eclipse.xtext.generator.ecore"
       disposableProviderFactory="true" fileExtensions="subtestlanguage" ecorePackage="SubTestLanguage.ecore#/">
     <genClasses ecoreClass="SubTestLanguage.ecore#//SubMain">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel
index 33778b269..a2ef5baf3 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SuperTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="SuperPackage" basePackage="org.eclipse.xtext.generator.ecore"
       disposableProviderFactory="true" fileExtensions="supertestlanguage" ecorePackage="SuperTestLanguage.ecore#/">
     <genClasses ecoreClass="SuperTestLanguage.ecore#//SuperMain">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel
index cfac1ebfd..a5b220e47 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="BaseInheritanceTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="BaseInheritanceTest" basePackage="org.eclipse.xtext.grammarinheritance"
       disposableProviderFactory="true" fileExtensions="baseinheritancetestlanguage"
       ecorePackage="BaseInheritanceTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel
index 8ded6782a..4e1923bc1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ConcreteTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel#//ametamodel">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel#//ametamodel">
   <genPackages prefix="Foo" basePackage="org.eclipse.xtext.grammarinheritance" disposableProviderFactory="true"
       fileExtensions="concretetestlanguage" ecorePackage="ConcreteTestLanguage.ecore#/">
     <genClasses ecoreClass="ConcreteTestLanguage.ecore#//RootRule"/>
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel
index 3867ca1d3..92204690e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="InheritanceTest2Language"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest InheritanceTestLanguage.genmodel#//inheritanceTest">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest InheritanceTestLanguage.genmodel#//inheritanceTest">
   <genPackages prefix="InheritanceTest2" basePackage="org.eclipse.xtext.grammarinheritance"
       disposableProviderFactory="true" fileExtensions="inheritancetest2language" ecorePackage="InheritanceTest2Language.ecore#/">
     <genClasses ecoreClass="InheritanceTest2Language.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel
index 288d77e47..ceda0ff8d 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="InheritanceTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest">
   <genPackages prefix="InheritanceTest" basePackage="org.eclipse.xtext.grammarinheritance"
       disposableProviderFactory="true" fileExtensions="inheritancetestlanguage" ecorePackage="InheritanceTestLanguage.ecore#/">
     <genClasses ecoreClass="InheritanceTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel
index d0296cf58..cd6209868 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IndexTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IndexTestLanguage" basePackage="org.eclipse.xtext.index" disposableProviderFactory="true"
       fileExtensions="indextestlanguage" ecorePackage="IndexTestLanguage.ecore#/">
     <genClasses ecoreClass="IndexTestLanguage.ecore#//File">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel
index 105868cfb..6dafd56e3 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="BacktrackingLexerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="BacktrackingTestLanguage" basePackage="org.eclipse.xtext.lexer"
       disposableProviderFactory="true" fileExtensions="backtrackinglexertestlanguage"
       ecorePackage="BacktrackingLexerTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel
index 112171e8c..6d2e562f8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IgnoreCaseLexerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IgnoreCaseTestLanguage" basePackage="org.eclipse.xtext.lexer"
       disposableProviderFactory="true" fileExtensions="ignorecaselexertestlanguage"
       ecorePackage="IgnoreCaseLexerTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel
index ca7fd60db..32c4500ab 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="AbstractIgnoreCaseLinkingTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IgnoreCaseLinkingTest" basePackage="org.eclipse.xtext.linking"
       disposableProviderFactory="true" fileExtensions="abstractignorecaselinkingtestlanguage"
       ecorePackage="AbstractIgnoreCaseLinkingTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel
index 988b093f0..f2e5c9523 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug287988TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug287988Test" basePackage="org.eclipse.xtext.linking" disposableProviderFactory="true"
       fileExtensions="bug287988testlanguage" ecorePackage="Bug287988TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug287988TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel
index 3e9caa6de..80204d275 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug289059TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug289059Test" basePackage="org.eclipse.xtext.linking" disposableProviderFactory="true"
       fileExtensions="bug289059testlanguage" ecorePackage="Bug289059TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug289059TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel
index 9e1c62b12..10f9f30f9 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug313089TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug313089" basePackage="org.eclipse.xtext.linking" disposableProviderFactory="true"
       fileExtensions="bug313089testlanguage" ecorePackage="Bug313089TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug313089TestLanguage.ecore#//Foo">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel
index 8257500b1..7f8c3d482 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug362902"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug362902" basePackage="org.eclipse.xtext.linking" disposableProviderFactory="true"
       fileExtensions="bug362902" ecorePackage="Bug362902.ecore#/">
     <genClasses ecoreClass="Bug362902.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel
index 89f033642..e8bca565c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IgnoreCaseImportsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
   <genPackages prefix="IgnoreCaseImportsTest" basePackage="org.eclipse.xtext.linking"
       disposableProviderFactory="true" fileExtensions="ignorecaseimportstestlanguage"
       ecorePackage="IgnoreCaseImportsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel
index aff425426..1831616f1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IgnoreCaseNamespacesTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
   <genPackages prefix="IgnoreCaseNamespacesTest" basePackage="org.eclipse.xtext.linking"
       disposableProviderFactory="true" fileExtensions="ignorecasenamespacestestlanguage"
       ecorePackage="IgnoreCaseNamespacesTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel
index 1ab9448bb..b19b02de1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ImportUriTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ImportedURI" basePackage="org.eclipse.xtext.linking" disposableProviderFactory="true"
       fileExtensions="importuritestlanguage" ecorePackage="ImportUriTestLanguage.ecore#/">
     <genClasses ecoreClass="ImportUriTestLanguage.ecore#//Main">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel
index be8fb5ab8..87f06f42e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LangATestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="LangATestLanguage" basePackage="org.eclipse.xtext.linking"
       disposableProviderFactory="true" fileExtensions="langatestlanguage" ecorePackage="LangATestLanguage.ecore#/">
     <genClasses ecoreClass="LangATestLanguage.ecore#//Main">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel
index c941d00c7..646e7705f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug311337TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug311337" basePackage="org.eclipse.xtext.linking.lazy" disposableProviderFactory="true"
       fileExtensions="bug311337testlanguage" ecorePackage="Bug311337TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug311337TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel
index 8928a0fad..010e232fd 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EcoreReferenceTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerNsURI ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformPlugin ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformResource">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerNsURI ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformPlugin ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformResource">
   <genPackages prefix="EcoreReference" basePackage="org.eclipse.xtext.metamodelreferencing.tests"
       disposableProviderFactory="true" fileExtensions="ecorereferencetestlanguage"
       ecorePackage="EcoreReferenceTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel
index ae873a359..da13c6bb3 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="MetamodelRefTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
   <genPackages prefix="AnotherSimpleTest" basePackage="org.eclipse.xtext.metamodelreferencing.tests"
       disposableProviderFactory="true" fileExtensions="metamodelreftestlanguage" ecorePackage="MetamodelRefTestLanguage.ecore#/">
     <genClasses ecoreClass="MetamodelRefTestLanguage.ecore#//Foo">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel
index 5530e300a..8e5aca4dc 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="MultiGenMMTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="SimpleTest" basePackage="org.eclipse.xtext.metamodelreferencing.tests"
       disposableProviderFactory="true" fileExtensions="multigenmmtestlanguage" ecorePackage="MultiGenMMTestLanguage.ecore#/0">
     <genClasses ecoreClass="MultiGenMMTestLanguage.ecore#/0/Foo">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel
index 174d13a4d..6e58caffb 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug289515TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug289515Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug289515testlanguage" ecorePackage="Bug289515TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug289515TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel
index 6d4af4d6c..606d5dba2 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug289524ExTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug289524ExTest" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug289524extestlanguage" ecorePackage="Bug289524ExTestLanguage.ecore#/">
     <genClasses ecoreClass="Bug289524ExTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel
index d26a58ee3..03fa04a38 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug289524TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug289524Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug289524testlanguage" ecorePackage="Bug289524TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug289524TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel
index e4074dcb4..211a9c295 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug296889ExTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug296889ExTest" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug296889extestlanguage" ecorePackage="Bug296889ExTestLanguage.ecore#/">
     <genClasses ecoreClass="Bug296889ExTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel
index c103a21e5..054b68e39 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug296889TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug296889Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug296889testlanguage" ecorePackage="Bug296889TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug296889TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel
index 02e24fb1d..d991e1ce4 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug299237TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug299237Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug299237testlanguage" ecorePackage="Bug299237TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug299237TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
index 16f8c8127..f2c84eb3a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug301935TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug301935Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug301935testlanguage" ecorePackage="Bug301935TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug301935TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel
index ec472540a..ef98a7d72 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug378967TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug378967Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug378967testlanguage" ecorePackage="Bug378967TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug378967TestLanguage.ecore#//FirstEnum">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
index a7b05d973..b4549e39a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug406914TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug406914Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug406914testlanguage" ecorePackage="Bug406914TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug406914TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel
index a8d0db520..0dd595f76 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug443221TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug443221Test" basePackage="org.eclipse.xtext.parser.antlr"
       disposableProviderFactory="true" fileExtensions="bug443221testlanguage" ecorePackage="Bug443221TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug443221TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel
index aeffa2fe2..c35822f44 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="AssignmentsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="AssignmentsTestLanguage" basePackage="org.eclipse.xtext.parser.assignments"
       disposableProviderFactory="true" fileExtensions="assignmentstestlanguage" ecorePackage="AssignmentsTestLanguage.ecore#/">
     <genClasses ecoreClass="AssignmentsTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel
index 3bae9dac5..ab1337b04 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug287184TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug287184Test" basePackage="org.eclipse.xtext.parser.assignments"
       disposableProviderFactory="true" fileExtensions="bug287184testlanguage" ecorePackage="Bug287184TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug287184TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel
index 7c78bc384..b3097b8f9 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug288432TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug288432Test" basePackage="org.eclipse.xtext.parser.assignments"
       disposableProviderFactory="true" fileExtensions="bug288432testlanguage" ecorePackage="Bug288432TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug288432TestLanguage.ecore#//Body">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel
index fe4419d6b..e38472e7e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="DatatypeRulesTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="DatatypeRulesTestLanguage" basePackage="org.eclipse.xtext.parser.datatyperules"
       disposableProviderFactory="true" fileExtensions="datatyperulestestlanguage"
       ecorePackage="DatatypeRulesTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel
index d28e40cf7..bf1860d0f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EncodingTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="EncodingTest" basePackage="org.eclipse.xtext.parser.encoding"
       disposableProviderFactory="true" fileExtensions="encodingtestlanguage" ecorePackage="EncodingTestLanguage.ecore#/">
     <genClasses ecoreClass="EncodingTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel
index a50c89b51..f43a5ac2a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EpatchTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="EpatchTestLanguage" basePackage="org.eclipse.xtext.parser.epatch"
       disposableProviderFactory="true" fileExtensions="epatchtestlanguage" ecorePackage="EpatchTestLanguage.ecore#/">
     <genClasses ecoreClass="EpatchTestLanguage.ecore#//EPatch">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel
index 3bcc0dfdb..7246155ce 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="FragmentTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="FragmentTestLanguage" basePackage="org.eclipse.xtext.parser.fragments"
       disposableProviderFactory="true" fileExtensions="fragmenttestlanguage" ecorePackage="FragmentTestLanguage.ecore#/">
     <genClasses ecoreClass="FragmentTestLanguage.ecore#//ParserRuleFragments">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel
index 8018dbbda..93df2bbfd 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IndentationAwareTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IndentationAwareTestLanguage" basePackage="org.eclipse.xtext.parser.indentation"
       disposableProviderFactory="true" fileExtensions="indentationawaretestlanguage"
       ecorePackage="IndentationAwareTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
index af8c10e6a..944533883 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="KeywordsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="KeywordsTestLanguage" basePackage="org.eclipse.xtext.parser.keywords"
       disposableProviderFactory="true" fileExtensions="keywordstestlanguage" ecorePackage="KeywordsTestLanguage.ecore#/">
     <genClasses ecoreClass="KeywordsTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel
index 21224344f..2f18f510c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ParametersTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ParametersTestLanguage" basePackage="org.eclipse.xtext.parser.parameters"
       disposableProviderFactory="true" fileExtensions="parameterstestlanguage" ecorePackage="ParametersTestLanguage.ecore#/">
     <genClasses ecoreClass="ParametersTestLanguage.ecore#//ParserRuleParameters">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel
index 4bec13816..c5dde0b7f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug292245TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug292245TestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="bug292245testlanguage" ecorePackage="Bug292245TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug292245TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel
index c6f142b3c..3326087c5 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug297105TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug297105TestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="bug297105testlanguage" ecorePackage="Bug297105TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug297105TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel
index 36f868bb4..48ff564b6 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug317840TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug317840TestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="bug317840testlanguage" ecorePackage="Bug317840TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug317840TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel
index 06c03f465..bedfbfbf8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EcoreTerminalsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="EcoreTerminalsTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="ecoreterminalstestlanguage"
       ecorePackage="EcoreTerminalsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel
index 33c4912c4..7f55d8367 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="HiddenTerminalsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="HiddenTerminalsTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="hiddenterminalstestlanguage"
       ecorePackage="HiddenTerminalsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel
index baefa246d..14a4ad997 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="TerminalRulesTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="TerminalRulesTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="terminalrulestestlanguage"
       ecorePackage="TerminalRulesTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel
index 9ff40c5f2..873204a54 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="UnicodeTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Unicode" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="unicodetestlanguage" ecorePackage="UnicodeTestLanguage.ecore#/">
     <genClasses ecoreClass="UnicodeTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel
index 33fbc07ec..afb8da608 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="XtextTerminalsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="XtextTerminalsTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules"
       disposableProviderFactory="true" fileExtensions="xtextterminalstestlanguage"
       ecorePackage="XtextTerminalsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel
index 9b91fdf3b..15ab319b6 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="BacktrackingBug325745TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="BacktrackingBug325745TestLanguage" basePackage="org.eclipse.xtext.parser.unorderedGroups"
       disposableProviderFactory="true" fileExtensions="backtrackingbug325745testlanguage"
       ecorePackage="BacktrackingBug325745TestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel
index 68b2a3d7e..e1907bf35 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="UnorderedGroupsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="UnorderedGroupsTestLanguage" basePackage="org.eclipse.xtext.parser.unorderedGroups"
       disposableProviderFactory="true" fileExtensions="unorderedgroupstestlanguage"
       ecorePackage="UnorderedGroupsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel
index 5a9249c4b..546d7a39d 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="FormatterTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Formattertestlanguage" basePackage="org.eclipse.xtext.parsetree.formatter"
       disposableProviderFactory="true" fileExtensions="formattertestlanguage" ecorePackage="FormatterTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="FormatterTestLanguage.ecore#//Enum1">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel
index 418694069..c99ba60d1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="FormatterTestLanguage2"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Formattertestlanguage2" basePackage="org.eclipse.xtext.parsetree.formatter"
       disposableProviderFactory="true" fileExtensions="formattertestlanguage2" ecorePackage="FormatterTestLanguage2.ecore#/">
     <genClasses ecoreClass="FormatterTestLanguage2.ecore#//Root">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel
index bc1b11f4e..68d7354c5 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug305397"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug305397" basePackage="org.eclipse.xtext.parsetree.impl" disposableProviderFactory="true"
       fileExtensions="bug305397" ecorePackage="Bug305397.ecore#/">
     <genClasses ecoreClass="Bug305397.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel
index fc80e5193..3cab84e50 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="CommentAssociationTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="CommentAssociation" basePackage="org.eclipse.xtext.parsetree.impl"
       disposableProviderFactory="true" fileExtensions="commentassociationtestlanguage"
       ecorePackage="CommentAssociationTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel
index 68e982492..b734c19e1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug299395TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug299395" basePackage="org.eclipse.xtext.parsetree.reconstr"
       disposableProviderFactory="true" fileExtensions="bug299395testlanguage" ecorePackage="Bug299395TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug299395TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel
index e0568377a..237ac19fe 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug302128TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug302128" basePackage="org.eclipse.xtext.parsetree.reconstr"
       disposableProviderFactory="true" fileExtensions="bug302128testlanguage" ecorePackage="Bug302128TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug302128TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel
index 922b26c38..9aa14140f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ComplexReconstrTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Complexrewritetest" basePackage="org.eclipse.xtext.parsetree.reconstr"
       disposableProviderFactory="true" fileExtensions="complexreconstrtestlanguage"
       ecorePackage="ComplexReconstrTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel
index 43c79b0ad..63c8d3d94 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SerializationBug269362TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="SerializationBug269362TestLanguage" basePackage="org.eclipse.xtext.parsetree.reconstr"
       disposableProviderFactory="true" fileExtensions="serializationbug269362testlanguage"
       ecorePackage="SerializationBug269362TestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel
index a5ee9429a..05979aaea 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SerializationErrorTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Serializationerror" basePackage="org.eclipse.xtext.parsetree.reconstr"
       disposableProviderFactory="true" fileExtensions="serializationerrortestlanguage"
       ecorePackage="SerializationErrorTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel
index 96bf13b48..8c8a0ac87 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="TransientValuesTest"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Transientvaluestest" basePackage="org.eclipse.xtext.parsetree.transientvalues"
       disposableProviderFactory="true" fileExtensions="transientvaluestest" ecorePackage="TransientValuesTest.ecore#/">
     <genClasses ecoreClass="TransientValuesTest.ecore#//Root"/>
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel
index c5fd02d60..3ffd040b5 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="UnassignedTextTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Unassignedtext" basePackage="org.eclipse.xtext.parsetree.unassignedtext"
       disposableProviderFactory="true" fileExtensions="unassignedtexttestlanguage"
       ecorePackage="UnassignedTextTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel
index 4dbcbe10d..8ccfa0c15 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug385636"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug385636" basePackage="org.eclipse.xtext.resource" disposableProviderFactory="true"
       fileExtensions="bug385636" ecorePackage="Bug385636.ecore#/">
     <genClasses ecoreClass="Bug385636.ecore#//Program">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel
index 651f7d272..72fb8c050 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="EObjectAtOffsetTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="EObjectAtOffsetTestLanguage" basePackage="org.eclipse.xtext.resource"
       disposableProviderFactory="true" fileExtensions="eobjectatoffsettestlanguage"
       ecorePackage="EObjectAtOffsetTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel
index ca41e6cfa..b1f257f76 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LiveContainerBuilderIntegerationTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="LiveContainerBuilderIntegerationTestLanguage" basePackage="org.eclipse.xtext.resource"
       disposableProviderFactory="true" fileExtensions="livecontainerbuilderintegerationtestlanguage"
       ecorePackage="LiveContainerBuilderIntegerationTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel
index 660ac646e..680f667f8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LiveContainerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="LiveContainerTestLanguage" basePackage="org.eclipse.xtext.resource"
       disposableProviderFactory="true" fileExtensions="livecontainertestlanguage"
       ecorePackage="LiveContainerTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel
index c5758aca9..643881c9b 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LocationProviderTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Locationprovidertest" basePackage="org.eclipse.xtext.resource"
       disposableProviderFactory="true" fileExtensions="locationprovidertestlanguage"
       ecorePackage="LocationProviderTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel
index 2ea17a6d0..e1a738b14 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="AssignmentFinderTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="AssignmentFinderTest" basePackage="org.eclipse.xtext.serializer"
       disposableProviderFactory="true" fileExtensions="assignmentfindertestlanguage"
       ecorePackage="AssignmentFinderTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel
index 9cf455f01..735327474 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ContextFinderTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ContextFinderTest" basePackage="org.eclipse.xtext.serializer"
       disposableProviderFactory="true" fileExtensions="contextfindertestlanguage"
       ecorePackage="ContextFinderTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel
index ddb0e124c..52ea7cf1e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="HiddenTokenSequencerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Hiddentokensequencertest" basePackage="org.eclipse.xtext.serializer"
       disposableProviderFactory="true" fileExtensions="hiddentokensequencertestlanguage"
       ecorePackage="HiddenTokenSequencerTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel
index 82da272c6..57ab3c0e8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SequencerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Sequencertest" basePackage="org.eclipse.xtext.serializer" disposableProviderFactory="true"
       fileExtensions="sequencertestlanguage" ecorePackage="SequencerTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="SequencerTestLanguage.ecore#//DefEnum">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel
index d09d3e68c..ff0d3946e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SyntacticSequencerTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Syntacticsequencertest" basePackage="org.eclipse.xtext.serializer"
       disposableProviderFactory="true" fileExtensions="syntacticsequencertestlanguage"
       ecorePackage="SyntacticSequencerTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel
index 2ebf9f39a..efd78d34e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ActionTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ActionLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true"
       fileExtensions="actiontestlanguage" ecorePackage="ActionTestLanguage.ecore#/">
     <genClasses ecoreClass="ActionTestLanguage.ecore#//Model"/>
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel
index befa95966..a019d90fb 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ActionTestLanguage2"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ActionLang2" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="actiontestlanguage2" ecorePackage="ActionTestLanguage2.ecore#/">
     <genClasses ecoreClass="ActionTestLanguage2.ecore#//ORing">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel
index f36014b8e..a5e4b9c9e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="FowlerDslTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Fowlerdsl" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true"
       fileExtensions="fowlerdsltestlanguage" ecorePackage="FowlerDslTestLanguage.ecore#/">
     <genClasses ecoreClass="FowlerDslTestLanguage.ecore#//Statemachine">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel
index df8cdaf82..580dd329c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LookaheadTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="LookaheadLang" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="lookaheadtestlanguage" ecorePackage="LookaheadTestLanguage.ecore#/">
     <genClasses ecoreClass="LookaheadTestLanguage.ecore#//Entry">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel
index 756cc2a90..0785af9e4 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="OptionalEmptyTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="OptionalEmpty" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="optionalemptytestlanguage"
       ecorePackage="OptionalEmptyTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel
index 05fbe76e3..54205bee6 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="PartialParserTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="PartialParserTestLanguage" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="partialparsertestlanguage"
       ecorePackage="PartialParserTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
index dd3b5d0d6..7338808a1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ReferenceGrammarTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ReferenceGrammar" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="referencegrammartestlanguage"
       ecorePackage="ReferenceGrammarTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel
index b9c63e619..719a66be6 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="SimpleExpressionsTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="SimpleExpressions" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="simpleexpressionstestlanguage"
       ecorePackage="SimpleExpressionsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel
index 49f4b319e..bfb5a3c2d 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="TestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="TestLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true"
       fileExtensions="testlanguage" ecorePackage="TestLanguage.ecore#/">
     <genClasses ecoreClass="TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
index d349e9cb5..28ae32dc4 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="TreeTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="TreeTestLanguage" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="treetestlanguage" ecorePackage="TreeTestLanguage.ecore#/">
     <genClasses ecoreClass="TreeTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel
index af4f5acd1..7b909f557 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="IndentationAwareTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="IndentLang" basePackage="org.eclipse.xtext.testlanguages.indent"
       disposableProviderFactory="true" fileExtensions="indentationawaretestlanguage"
       ecorePackage="IndentationAwareTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel
index 0e691fc22..825977ccb 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="ConcreteSyntaxValidationTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Csvalidationtest" basePackage="org.eclipse.xtext.validation"
       disposableProviderFactory="true" fileExtensions="concretesyntaxvalidationtestlanguage"
       ecorePackage="ConcreteSyntaxValidationTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel
index fcc7fcc40..07d29c02d 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug250313"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Bug250313" basePackage="org.eclipse.xtext.valueconverter" disposableProviderFactory="true"
       fileExtensions="bug250313" ecorePackage="Bug250313.ecore#/">
     <genClasses ecoreClass="Bug250313.ecore#//Model">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel
index 0c5d4c814..e664255a1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="QualifiedNameTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="QualifiedName" basePackage="org.eclipse.xtext.valueconverter"
       disposableProviderFactory="true" fileExtensions="qualifiednametestlanguage"
       ecorePackage="QualifiedNameTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel
index f5670918d..8e1d14f9b 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="MultiValueFeatureTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="MultiValueFeatureTestLanguage" basePackage="org.eclipse.xtext.xtext.ecoreInference"
       disposableProviderFactory="true" fileExtensions="multivaluefeaturetestlanguage"
       ecorePackage="MultiValueFeatureTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel
index 88cb5c6b8..50d878485 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
     modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="UnassignedRuleCallTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="UnassignedRuleCallTestLanguage" basePackage="org.eclipse.xtext.xtext.ecoreInference"
       disposableProviderFactory="true" fileExtensions="unassignedrulecalltestlanguage"
       ecorePackage="UnassignedRuleCallTestLanguage.ecore#/">