diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel
index cb37ab3e3..0af724c9e 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel
+++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2019 itemis AG (http://www.itemis.eu) 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="WithTransient" 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" >
WithTransient.ecore
+ complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9">
diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
index c5fb35d04..56bcaa0e3 100644
--- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
+++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
@@ -7,7 +7,7 @@ var backtrack = false
var memoize = false
var classSplitting = true
-var jdkLevel = "JDK60"
+var jdkLevel = "JDK80"
var parser = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {
options = auto-inject {
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel
index e2a54adb5..8194ea254 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/enums.genmodel
@@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" modelName="Enums" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false">
+ complianceLevel="8.0" copyrightFields="false">
enums.ecore
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel
index f0ce7f2b2..2749f1c74 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel
@@ -1,7 +1,7 @@
GenModelAccessTest.ecore
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel
index 1d5fc6f4a..51e96eda7 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel
@@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" modelName="Ametamodel" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false">
+ complianceLevel="8.0" copyrightFields="false">
ametamodel.ecore
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
index 9382cb610..3871d1176 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="LazyLinkingTestLanguage"
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">
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel
index 5a1178b07..e05550745 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel
@@ -4,7 +4,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" redirection="" forceOverwrite="true" modelName="EcoreReferences"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
usedGenPackages="../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
EcorePerNsURI.ecore
EcorePerPlatformPlugin.ecore
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel
index 31bff1234..b392f36b2 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingTestUtil.genmodel
@@ -4,7 +4,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" modelName="PartialParsingTestUtil" modelPluginClass=""
rootImplementsInterface="" featureMapWrapperClass="" booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore"
- containmentProxies="true" complianceLevel="5.0" copyrightFields="false" interfaceNamePattern=""
+ containmentProxies="true" complianceLevel="8.0" copyrightFields="false" interfaceNamePattern=""
classNamePattern="">
PartialParsingTestUtil.ecore
+ containmentProxies="true" complianceLevel="8.0" copyrightFields="false">
CrossContainment.ecore
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel
index c6c81db57..1aa37dccf 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/GenericsTest.genmodel
@@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" modelName="GenericsTest" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.5">
+ complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.5">
GenericsTest.ecore
diff --git a/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel b/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel
index 933d9d559..08c323578 100644
--- a/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel
+++ b/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.xtext.generator/src-gen" editDirectory="/org.eclipse.xtext.xtext.generator.edit/src"
editorDirectory="/org.eclipse.xtext.xtext.generator.editor/src" modelPluginID="org.eclipse.xtext.xtext.generator"
forceOverwrite="true" modelName="SimpleExpressions" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.xtext.xtext.generator.edit"
+ complianceLevel="8.0" copyrightFields="false" editPluginID="org.eclipse.xtext.xtext.generator.edit"
editorPluginID="org.eclipse.xtext.xtext.generator.editor" runtimeVersion="2.9">
diff --git a/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel b/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
index d6526d557..d5272d9f3 100644
--- a/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
+++ b/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext/emf-gen" editDirectory="/org.eclipse.xtext.edit/src"
editorDirectory="/org.eclipse.xtext.editor/src" modelPluginID="org.eclipse.xtext"
forceOverwrite="true" modelName="Xtext" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
editPluginID="org.eclipse.xtext.edit" editorPluginID="org.eclipse.xtext.editor"
usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
Xtext.ecore