diff --git a/org.eclipse.xtend.core/model/RichStrings.genmodel b/org.eclipse.xtend.core/model/RichStrings.genmodel
index e1bb8492ef1..99cd16b96fd 100644
--- a/org.eclipse.xtend.core/model/RichStrings.genmodel
+++ b/org.eclipse.xtend.core/model/RichStrings.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core"
     modelName="RichStrings" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
-    runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <foreignModel>RichStrings.ecore</foreignModel>
   <genPackages prefix="ProcessedRichString" basePackage="org.eclipse.xtend.core" disposableProviderFactory="true"
       fileExtensions="__richstrings" ecorePackage="RichStrings.ecore#/">
diff --git a/org.eclipse.xtend.core/model/Xtend.genmodel b/org.eclipse.xtend.core/model/Xtend.genmodel
index 799057d0f74..96492db4598 100644
--- a/org.eclipse.xtend.core/model/Xtend.genmodel
+++ b/org.eclipse.xtend.core/model/Xtend.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core"
     modelName="Xtend" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
-    runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <foreignModel>Xtend.ecore</foreignModel>
   <genPackages prefix="Xtend" basePackage="org.eclipse.xtend.core" disposableProviderFactory="true"
       ecorePackage="Xtend.ecore#/">
diff --git a/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel b/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel
index daa66aa93d8..6f114752cfd 100644
--- a/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel
+++ b/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.builder.standalone.tests/src-gen"
     modelPluginID="org.eclipse.xtext.builder.standalone.tests" forceOverwrite="true"
     modelName="BuilderTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="BuilderTestLanguage" basePackage="org.eclipse.xtext.builder.tests"
       disposableProviderFactory="true" fileExtensions="buildertestlanguage" ecorePackage="BuilderTestLanguage.ecore#/">
     <genClasses ecoreClass="BuilderTestLanguage.ecore#//NamedElement">
diff --git a/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel b/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel
index aee26b3fc2d..40114ee20d0 100644
--- a/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel
+++ b/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.builder.tests/src-gen" modelPluginID="org.eclipse.xtext.builder.tests"
     forceOverwrite="true" modelName="BuilderTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="BuilderTestLanguage" basePackage="org.eclipse.xtext.builder.tests"
       disposableProviderFactory="true" fileExtensions="buildertestlanguage" ecorePackage="BuilderTestLanguage.ecore#/">
     <genClasses ecoreClass="BuilderTestLanguage.ecore#//NamedElement">
diff --git a/org.eclipse.xtext.builder/model/BuilderState.genmodel b/org.eclipse.xtext.builder/model/BuilderState.genmodel
index 44564a08352..c314242cd06 100644
--- a/org.eclipse.xtext.builder/model/BuilderState.genmodel
+++ b/org.eclipse.xtext.builder/model/BuilderState.genmodel
@@ -4,7 +4,7 @@
     editorDirectory="" modelPluginID="org.eclipse.xtext.builder" modelName="BuilderState"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container" testsDirectory=""
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
-    runtimeVersion="2.29">
+    runtimeVersion="2.36">
   <foreignModel>BuilderState.ecore</foreignModel>
   <genPackages prefix="BuilderState" basePackage="org.eclipse.xtext.builder" disposableProviderFactory="true"
       ecorePackage="BuilderState.ecore#/">
diff --git a/org.eclipse.xtext.builder/model/Trace.genmodel b/org.eclipse.xtext.builder/model/Trace.genmodel
index f64d6c04118..08d3116a31f 100644
--- a/org.eclipse.xtext.builder/model/Trace.genmodel
+++ b/org.eclipse.xtext.builder/model/Trace.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.builder/emf-gen" modelPluginID="org.eclipse.xtext.builder"
     modelName="Trace" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
-    runtimeVersion="2.29">
+    runtimeVersion="2.36">
   <foreignModel>Trace.ecore</foreignModel>
   <genPackages prefix="Trace" basePackage="org.eclipse.xtext.builder" disposableProviderFactory="true"
       ecorePackage="Trace.ecore#/">
diff --git a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel
index 86d325b4cd1..8de476ed37e 100644
--- a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.common.types.eclipse.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.eclipse.tests"
     forceOverwrite="true" modelName="ContentAssistTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="ContentAssistTestLanguage" basePackage="org.eclipse.xtext.common.types.xtext.ui"
       disposableProviderFactory="true" fileExtensions="typesAssistTest" ecorePackage="ContentAssistTestLanguage.ecore#/">
     <genClasses ecoreClass="ContentAssistTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel
index 846ba0c11fa..6096b6f16cc 100644
--- a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel
+++ b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.common.types.eclipse.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.eclipse.tests"
     forceOverwrite="true" modelName="RefactoringTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="RefactoringTestLanguage" basePackage="org.eclipse.xtext.common.types.xtext.ui"
       disposableProviderFactory="true" fileExtensions="typesRefactoring" ecorePackage="RefactoringTestLanguage.ecore#/">
     <genClasses ecoreClass="RefactoringTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel b/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel
index eb8b97a0d57..05ce58efbd1 100644
--- a/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.common.types.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.tests"
     forceOverwrite="true" modelName="ContentAssistTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="ContentAssistTestLanguage" basePackage="org.eclipse.xtext.common.types.xtext.ui"
       disposableProviderFactory="true" fileExtensions="typesAssistTest" ecorePackage="ContentAssistTestLanguage.ecore#/">
     <genClasses ecoreClass="ContentAssistTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel b/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel
index 64e521ab010..68a8614195d 100644
--- a/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel
+++ b/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.common.types.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.tests"
     forceOverwrite="true" modelName="RefactoringTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="RefactoringTestLanguage" basePackage="org.eclipse.xtext.common.types.xtext.ui"
       disposableProviderFactory="true" fileExtensions="typesRefactoring" ecorePackage="RefactoringTestLanguage.ecore#/">
     <genClasses ecoreClass="RefactoringTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel b/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel
index 107415dd89b..12350565ef3 100644
--- a/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel
+++ b/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel
@@ -7,7 +7,7 @@
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" rootImplementsInterface=""
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" suppressGenModelAnnotations="false"
     copyrightFields="false" editPluginID="org.eclipse.xtext.common.types.edit" editorPluginID="org.eclipse.xtext.types.editor"
-    runtimeVersion="2.29" interfaceNamePattern="" classNamePattern="">
+    runtimeVersion="2.36" interfaceNamePattern="" classNamePattern="">
   <foreignModel>JavaVMTypes.ecore</foreignModel>
   <genPackages prefix="Types" basePackage="org.eclipse.xtext.common" disposableProviderFactory="true"
       ecorePackage="JavaVMTypes.ecore#/">
diff --git a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
index 9daac3ad412..a212aa883c9 100644
--- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
+++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests"
     forceOverwrite="true" modelName="EnumAndReferenceTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
index 5bdadad0f4a..fbe31afad56 100644
--- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
+++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests"
     forceOverwrite="true" modelName="EnumRulesTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums">
+    copyrightFields="false" runtimeVersion="2.36" 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.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
index 7d63172e883..ccf2cd5d751 100644
--- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
+++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests"
     forceOverwrite="true" modelName="MultiRuleEnumTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <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.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
index f9a96496965..ebb67ee1243 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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"
       ecorePackage="IndentationAwareUiTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
index f7111a25273..e3e45dd7d17 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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"
       ecorePackage="PartialContentAssistTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
index ddc659914b3..3c3eff3487a 100644
--- a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
+++ b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient">
+    copyrightFields="false" runtimeVersion="2.36" 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#/">
     <genClasses ecoreClass="PartialSerializationTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel
index 341a5277251..42ec82158a9 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;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 86cd46d7229..176ed4d82e7 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;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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.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 e4d044bb8ce..b4704cbc791 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.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <foreignModel>WithTransient.ecore</foreignModel>
   <genPackages prefix="Withtransient" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" ecorePackage="WithTransient.ecore#/">
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
index a13ae2679a6..facbc50a38c 100644
--- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
+++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
@@ -18,18 +18,18 @@
 		<eclipse-text-version>3.12.300</eclipse-text-version>
 		<core-resources-version>3.18.200</core-resources-version>
 		<core-runtime-version>3.26.100</core-runtime-version>
-		<emf-common-version>2.24.0</emf-common-version>
-		<emf-ecore-version>2.26.0</emf-ecore-version>
-		<emf-edit-version>2.17.0</emf-edit-version>
-		<emf-version>2.26.0</emf-version>
-		<emf-xmi-version>2.16.0</emf-xmi-version>
-		<emf-codegen-version>2.22.0</emf-codegen-version>
-		<emf-codegen-ecore-version>2.29.0</emf-codegen-ecore-version>
+		<emf-common-version>2.30.0</emf-common-version>
+		<emf-ecore-version>2.36.0</emf-ecore-version>
+		<emf-edit-version>2.21.0</emf-edit-version>
+		<emf-version>2.36.0</emf-version>
+		<emf-xmi-version>2.37.0</emf-xmi-version>
+		<emf-codegen-version>2.23.0</emf-codegen-version>
+		<emf-codegen-ecore-version>2.37.0</emf-codegen-ecore-version>
 		<ecore-xcore-version>1.20.0</ecore-xcore-version>
 		<ecore-xcore-lib-version>1.6.0</ecore-xcore-lib-version>
 		<ecore-xtext-version>1.6.0</ecore-xtext-version>
-		<jdt-core-version>3.33.0</jdt-core-version>
-		<platform-osgi-version>3.18.300</platform-osgi-version>
+		<jdt-core-version>3.37.0</jdt-core-version>
+		<platform-osgi-version>3.19.0</platform-osgi-version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
index 24d3570cc6f..17b72e21992 100644
--- a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
+++ b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.purexbase/src-gen" modelPluginID="org.eclipse.xtext.purexbase"
     forceOverwrite="true" modelName="PureXbase" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <genPackages prefix="PureXbase" basePackage="org.eclipse.xtext.purexbase" disposableProviderFactory="true"
       fileExtensions="xbase" ecorePackage="PureXbase.ecore#/">
     <genClasses ecoreClass="PureXbase.ecore#//Model">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel
index 2f5884f4640..e14232c91c7 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages"
     forceOverwrite="true" modelName="BeeLangTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="BeeLangTestLanguage" basePackage="org.eclipse.xtext.testlanguages.backtracking"
       disposableProviderFactory="true" fileExtensions="beelangtestlanguage" ecorePackage="BeeLangTestLanguage.ecore#/">
     <genClasses ecoreClass="BeeLangTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
index 51afaa99df3..a2f568c0af3 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <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 dea94377611..da71b197eb9 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <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 dd729707e9d..22f27b8d3b8 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <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 f4e7fadd8d4..916ebdeef82 100644
--- a/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel
+++ b/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <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 9e7c2103fbc..dfd9a1ab865 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 5610eeb95cd..7ce76ef2b76 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 fbfa148e1b4..2fc33d98a43 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 503082f0277..e73a6401ba1 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums">
+    copyrightFields="false" runtimeVersion="2.36" 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 14587c0b1e9..79ab5172a97 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <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 4423a2877cc..c16509ca69a 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 e830871d6f7..b5a6103ad8f 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 863a553e169..3520177a099 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="SuperTestLanguage.genmodel#//superPackage">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 6c8cebdb35f..6eee34f7356 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 0b9c5437e18..4eb1360d5e9 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 af5af5ecb20..a3da8956266 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel#//ametamodel">
+    copyrightFields="false" runtimeVersion="2.36" 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 f7318afe758..bc28a4ca69f 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest InheritanceTestLanguage.genmodel#//inheritanceTest">
+    copyrightFields="false" runtimeVersion="2.36" 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 921f3474a2f..47762084389 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest">
+    copyrightFields="false" runtimeVersion="2.36" 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 3f88268172d..0521c45ee6d 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 13c21560a49..b6e208149a6 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 afb43c13e08..ced6a296bfb 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 23203daadfa..567c34cf285 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 81a3c150981..25afbdaa7bd 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 f2a11e15dc4..55c1f6eea7e 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 3cbecb0a461..574ed93cfc9 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 642f91cf74a..530fc032e37 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 7c76137e8b0..d50518c6cec 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
+    copyrightFields="false" runtimeVersion="2.36" 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 fe485f75552..175fc4e3d39 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest">
+    copyrightFields="false" runtimeVersion="2.36" 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 d12349f1959..5a2cc189a0e 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 2b84a3ddec1..452b7015150 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 5f55a735a8b..8b71503ef95 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 b9896edd04c..c8faef747c2 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" 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">
+    copyrightFields="false" runtimeVersion="2.36" 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 8b53b446721..68c7abd26c2 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
+    copyrightFields="false" runtimeVersion="2.36" 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 3a4cd9e1363..3b9a2b5d6ac 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 92ecbe05886..985cf417a88 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 f99c7c74497..14e4bac8b9d 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 9a0d42723f1..cd146f2e5b0 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 9e9ad819ac9..0777cb32487 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 1b2ffa0ceff..fc0c9167d4a 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 17db40a5a02..9f88ba8d689 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 2e60848127b..face0f0ffaf 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 8179b5753dd..765705101aa 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 f1319f84a07..014c23fa6cf 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 c417522f9b2..9256fdcd24f 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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/antlr/GH1462TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/GH1462TestLanguage.genmodel
index b08fa8c1511..5e4cf706264 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/GH1462TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/GH1462TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.tests/src-gen" modelPluginID="org.eclipse.xtext.tests"
     forceOverwrite="true" modelName="GH1462TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Gh1462Test" basePackage="org.eclipse.xtext.parser.antlr" disposableProviderFactory="true"
       fileExtensions="gh1462testlanguage" ecorePackage="GH1462TestLanguage.ecore#/">
     <genClasses ecoreClass="GH1462TestLanguage.ecore#//Root">
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 ee92dd29061..a0fb256686c 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 a968b376cc0..3e2f8396398 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 01edde73de2..0551c4ba9a5 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 6ba72d78ea6..ee865468686 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 fa44a52ac6b..e38a08387c5 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 24f5988478f..f3dca17c387 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 524d19077bd..1efd40afade 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 cf6ac225a9e..a365402ef12 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 95a204474c9..27e15271a33 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 14c330f8ef1..e84ba2b1815 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 9e80db02486..3888443f433 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 2f581936dec..87a5dd9393d 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 f6d222255b2..2c96aff03f2 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 8a91e0d805a..06c0fa4de6a 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 4cda3d29d5f..a0333a088e5 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 bb8b6dc4a62..71ffcde1450 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 d8a2fd1e91d..697ff62a659 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 950761ceff2..5b62e5d4bf0 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 613e684fdab..5416eb6fc58 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 9f3acd91321..792d6f89371 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 580c67b5c3e..8b68b38d033 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 c5f1cd9c13f..c0b42bda411 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 62f0b9356ab..dd65ee2af7e 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 a58c549b2a0..462c15ea405 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 21c8c5d9bb6..186e58044e1 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 7149e0be678..a7046e67b3d 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 a265e897b44..5cc36327bf4 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 d4e3a812479..b1f4dd19078 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 197ecf3517a..1a219173381 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 027d9a7e036..275fe94226c 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 92b6a36bd62..3bcb654eaf9 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 5246cf6d84e..ee08bc940bb 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 2c1f39c5502..29bae68276e 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 6a5f7bab2a8..214b8f1a2fb 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
@@ -4,7 +4,7 @@
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 2e62f26add1..a8ac81e3f03 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 15eadf797f5..fd557302819 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 9074296a9d3..995c1e03d74 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 ac10d515833..402feae9ead 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 277785ce194..658890f206d 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 8c08b0098a4..daec3e2a9cd 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 0df8d38a758..2e2450ba7da 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 b8076266463..95f4ab92cef 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 f595e61be86..f4881b3d86b 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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/ActionTestLanguage3.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage3.genmodel
index dad780b2cf6..8b877480bf7 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage3.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage3.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.tests/src-gen" modelPluginID="org.eclipse.xtext.tests"
     forceOverwrite="true" modelName="ActionTestLanguage3" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="ActionLang3" basePackage="org.eclipse.xtext.testlanguages"
       disposableProviderFactory="true" fileExtensions="actiontestlanguage3" ecorePackage="ActionTestLanguage3.ecore#/">
     <genClasses ecoreClass="ActionTestLanguage3.ecore#//ProductionRules"/>
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 c48b1303ac7..082f2610751 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 aa6a203b76e..9bbfc54a93b 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 3d3b82ed5ab..188e94c5e8c 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 cc7003fc72e..adea7497564 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 00cd3bf3868..53afd4e0bf4 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 bcb993733f1..1a35958643d 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 f796f99c9e5..ab13568789d 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 dc29a1be3ad..02ad7562cdb 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 13dab90020d..55dec53dc20 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 383974ee24e..0ec8b2cc266 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 5842beaa8d8..fd202438c1a 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="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" 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 4554d1a4c4a..afb735138c8 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 0b545bbcb9e..c7e6abde9a3 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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 28a8f34170e..5b82505d78c 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
@@ -4,7 +4,7 @@
     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="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    copyrightFields="false" runtimeVersion="2.36" 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#/">
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 764a5af63d3..875dde3b1c7 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
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2022 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.tests/src-gen" modelPluginID="org.eclipse.xtext.tests"
     modelName="GenModelAccessTest" importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <foreignModel>GenModelAccessTest.ecore</foreignModel>
   <genPackages prefix="Root" basePackage="org.eclipse.xtext.generator.ecore.genmodelaccess"
       disposableProviderFactory="true" ecorePackage="GenModelAccessTest.ecore#/">
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel
index cea66fd6e65..b84e8da667c 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/Genmodel.genmodel
@@ -4,7 +4,7 @@
     editorDirectory="/org.eclipse.xtext.tests.editor/src" modelPluginID="org.eclipse.xtext.tests"
     forceOverwrite="true" modelName="Genmodel" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="11.0" copyrightFields="false" editPluginID="org.eclipse.xtext.tests.edit"
-    editorPluginID="org.eclipse.xtext.tests.editor" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    editorPluginID="org.eclipse.xtext.tests.editor" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="First" basePackage="org.eclipse.xtext.generator.ecore" disposableProviderFactory="true"
       ecorePackage="First.ecore#/">
     <genClasses ecoreClass="First.ecore#//First">
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 63036658681..ab7df8b232f 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="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="../../../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="LazyLinking" basePackage="org.eclipse.xtext.linking.lazy" disposableProviderFactory="true"
       fileExtensions="lazylinkingtestlanguage" ecorePackage="LazyLinkingTestLanguage.ecore#/">
     <genClasses ecoreClass="LazyLinkingTestLanguage.ecore#//Model">
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 ba68dcea2fa..3336fd28bfb 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
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" 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="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <foreignModel>GenericsTest.ecore</foreignModel>
   <genPackages prefix="GenericTest" basePackage="org.eclipse.xtext.util" disposableProviderFactory="true"
       ecorePackage="GenericsTest.ecore#/">
diff --git a/org.eclipse.xtext.ui.codetemplates/model/generated/Codetemplates.genmodel b/org.eclipse.xtext.ui.codetemplates/model/generated/Codetemplates.genmodel
index 102e5eed95a..ab76ef02df0 100644
--- a/org.eclipse.xtext.ui.codetemplates/model/generated/Codetemplates.genmodel
+++ b/org.eclipse.xtext.ui.codetemplates/model/generated/Codetemplates.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.ui.codetemplates/src-gen" modelPluginID="org.eclipse.xtext.ui.codetemplates"
     forceOverwrite="true" modelName="Codetemplates" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
   <genPackages prefix="Templates" basePackage="org.eclipse.xtext.ui.codetemplates"
       disposableProviderFactory="true" fileExtensions="codetemplates" ecorePackage="Codetemplates.ecore#/">
     <genClasses ecoreClass="Codetemplates.ecore#//Codetemplates">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/BacktrackingContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/BacktrackingContentAssistTestLanguage.genmodel
index d16d8a5e852..ee0d7ab51fb 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/BacktrackingContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/BacktrackingContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="BacktrackingContentAssistTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="BacktrackingContentAssistTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="backtrackingcontentassisttestlanguage"
       ecorePackage="BacktrackingContentAssistTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/BmTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/BmTestLanguage.genmodel
index a6ca69235e0..665d7fe31bf 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/BmTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/BmTestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="BmTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bracketmatching" basePackage="org.eclipse.xtext.ui.tests.editor.bracketmatching"
       disposableProviderFactory="true" fileExtensions="bmtestlanguage" ecorePackage="BmTestLanguage.ecore#/">
     <genClasses ecoreClass="BmTestLanguage.ecore#//File">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug286935TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug286935TestLanguage.genmodel
index 87d56e3647b..670b427c8b8 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug286935TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug286935TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug286935TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug286935TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug286935testlanguage" ecorePackage="Bug286935TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug286935TestLanguage.ecore#//StateType">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug287941TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug287941TestLanguage.genmodel
index c791e391d8f..da77005fd8a 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug287941TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug287941TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug287941TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug287941TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug287941testlanguage" ecorePackage="Bug287941TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug287941TestLanguage.ecore#//NumericOperator">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug288734TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug288734TestLanguage.genmodel
index 0eb9f6ff22f..7b6685a973e 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug288734TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug288734TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug288734TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug288734TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug288734testlanguage" ecorePackage="Bug288734TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug288734TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug288760TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug288760TestLanguage.genmodel
index abfa18c5670..7564c7cd0b4 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug288760TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug288760TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug288760TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug288760TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug288760testlanguage" ecorePackage="Bug288760TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug288760TestLanguage.ecore#//WorkflowElement">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug289187TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug289187TestLanguage.genmodel
index 434add675d1..356167c3ba4 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug289187TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug289187TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug289187TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug289187TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug289187testlanguage" ecorePackage="Bug289187TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug289187TestLanguage.ecore#//Visibility">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug291022TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug291022TestLanguage.genmodel
index e27fa8d5fd5..04e5e97bf11 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug291022TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug291022TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug291022TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug291022TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug291022testlanguage" ecorePackage="Bug291022TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug291022TestLanguage.ecore#//ModelElement">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug303200TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug303200TestLanguage.genmodel
index 834e2f93eda..7debb36314f 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug303200TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug303200TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug303200TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug303200TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug303200testlanguage" ecorePackage="Bug303200TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug303200TestLanguage.ecore#//Program">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug304681TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug304681TestLanguage.genmodel
index 0e0489ec1ea..f303e1a327a 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug304681TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug304681TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug304681TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug304681TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug304681testlanguage" ecorePackage="Bug304681TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug304681TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug307519TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug307519TestLanguage.genmodel
index 4838432ddda..f6cd7551fe4 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug307519TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug307519TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug307519TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug307519TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug307519testlanguage" ecorePackage="Bug307519TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug307519TestLanguage.ecore#//EnumT">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug309949TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug309949TestLanguage.genmodel
index 8414969a3bb..ebe0bfa898e 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug309949TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug309949TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug309949TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug309949TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug309949testlanguage" ecorePackage="Bug309949TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug309949TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug332217TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug332217TestLanguage.genmodel
index 72f83729da8..2a3c2d3314f 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug332217TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug332217TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug332217TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug332217TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug332217testlanguage" ecorePackage="Bug332217TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug332217TestLanguage.ecore#//TableViewStyle">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug347012TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug347012TestLanguage.genmodel
index dde28b82c6a..a2f00e505df 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug347012TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug347012TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug347012TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug347012TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug347012testlanguage" ecorePackage="Bug347012TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug347012TestLanguage.ecore#//MyProgram">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug348199TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug348199TestLanguage.genmodel
index 5ea826dff99..5b42264e44a 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug348199TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug348199TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug348199TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug348199TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug348199testlanguage" ecorePackage="Bug348199TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug348199TestLanguage.ecore#//Timeperiod">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug348427TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug348427TestLanguage.genmodel
index 6f602cae62f..4106162ce29 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug348427TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug348427TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug348427TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug348427TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug348427testlanguage" ecorePackage="Bug348427TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug348427TestLanguage.ecore#//EnumType">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug360834TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug360834TestLanguage.genmodel
index 4598f6b3f0b..1d09ab50118 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug360834TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug360834TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug360834TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug360834TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug360834testlanguage" ecorePackage="Bug360834TestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Bug360834TestLanguage.ecore#//Visibility">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug377311TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug377311TestLanguage.genmodel
index 35d7a7e4579..1fc51c8dfbc 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug377311TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug377311TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug377311TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug377311" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug377311testlanguage" ecorePackage="Bug377311TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug377311TestLanguage.ecore#//Root">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Bug381381TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Bug381381TestLanguage.genmodel
index 650bad66566..bf4a97ded01 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Bug381381TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Bug381381TestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Bug381381TestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Bug381381TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="bug381381testlanguage" ecorePackage="Bug381381TestLanguage.ecore#/">
     <genClasses ecoreClass="Bug381381TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistContextTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistContextTestLanguage.genmodel
index f9f653f1434..7c45bb8e54e 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistContextTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistContextTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ContentAssistContextTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ContentAssistContextTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="contentassistcontexttestlanguage"
       ecorePackage="ContentAssistContextTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistCustomizingTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistCustomizingTestLanguage.genmodel
index c672b59a5d1..6c1abc38fe4 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistCustomizingTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistCustomizingTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ContentAssistCustomizingTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ContentAssistCustomizingTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="contentassistcustomizingtestlanguage"
       ecorePackage="ContentAssistCustomizingTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistNoTerminalExtensionTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistNoTerminalExtensionTestLanguage.genmodel
index 115cffb4570..a736027d333 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistNoTerminalExtensionTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistNoTerminalExtensionTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ContentAssistNoTerminalExtensionTestLanguage"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="NoTerminalExtension" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="contentassistnoterminalextensiontestlanguage"
       ecorePackage="ContentAssistNoTerminalExtensionTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistTestLanguage.genmodel
index 181d8fc6263..f0f49d8534b 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ContentAssistTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ContentAssistTestLanguage" basePackage="org.eclipse.xtext.ui.tests.testlanguages"
       disposableProviderFactory="true" fileExtensions="contentassisttestlanguage"
       ecorePackage="ContentAssistTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/CrossReferenceProposalTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/CrossReferenceProposalTestLanguage.genmodel
index 8c9ac328c81..3a483bf896d 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/CrossReferenceProposalTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/CrossReferenceProposalTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="CrossReferenceProposalTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="CrossReferenceProposalTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="crossreferenceproposaltestlanguage"
       ecorePackage="CrossReferenceProposalTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/DatatypeRuleTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/DatatypeRuleTestLanguage.genmodel
index 9b958a1483e..2df90f08513 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/DatatypeRuleTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/DatatypeRuleTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="DatatypeRuleTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="DatatypeRuleTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="datatyperuletestlanguage" ecorePackage="DatatypeRuleTestLanguage.ecore#/">
     <genClasses ecoreClass="DatatypeRuleTestLanguage.ecore#//Model"/>
diff --git a/org.eclipse.xtext.ui.tests/model/generated/DomainModelTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/DomainModelTestLanguage.genmodel
index 21fb896ffa0..6ec7f2e2e66 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/DomainModelTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/DomainModelTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="DomainModelTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="DomainModelTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="domainmodeltestlanguage" ecorePackage="DomainModelTestLanguage.ecore#/">
     <genClasses ecoreClass="DomainModelTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/EncodingUiTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/EncodingUiTestLanguage.genmodel
index 526379edbdf..92339ab17c3 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/EncodingUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/EncodingUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="EncodingUiTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="EncodingTest" basePackage="org.eclipse.xtext.ui.tests.editor.encoding"
       disposableProviderFactory="true" fileExtensions="encodinguitestlanguage" ecorePackage="EncodingUiTestLanguage.ecore#/">
     <genClasses ecoreClass="EncodingUiTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/EnumRulesUiTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/EnumRulesUiTestLanguage.genmodel
index da3b47e63ba..f15f20e493b 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/EnumRulesUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/EnumRulesUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="EnumRulesUiTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../src/org/eclipse/xtext/ui/tests/enumrules/enumsUi.genmodel#//enumsUi">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="../../src/org/eclipse/xtext/ui/tests/enumrules/enumsUi.genmodel#//enumsUi">
   <genPackages prefix="EnumRulesUiTestLanguage" basePackage="org.eclipse.xtext.ui.tests.enumrules"
       disposableProviderFactory="true" fileExtensions="enumrulesuitestlanguage" ecorePackage="EnumRulesUiTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="EnumRulesUiTestLanguage.ecore#//GeneratedEnum">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/FoldingTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/FoldingTestLanguage.genmodel
index e4b904b6737..acc0b5ea7ad 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/FoldingTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/FoldingTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="FoldingTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Folding" basePackage="org.eclipse.xtext.ui.tests" disposableProviderFactory="true"
       fileExtensions="foldingtestlanguage" ecorePackage="FoldingTestLanguage.ecore#/">
     <genClasses ecoreClass="FoldingTestLanguage.ecore#//FoldingModel">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/GH341TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/GH341TestLanguage.genmodel
index ba487d8d3c9..ce63d862078 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/GH341TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/GH341TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="GH341TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Gh341TestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="gh341testlanguage" ecorePackage="GH341TestLanguage.ecore#/">
     <genClasses ecoreClass="GH341TestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ImportUriUiTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ImportUriUiTestLanguage.genmodel
index b804f720fda..4f2beed31ec 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ImportUriUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ImportUriUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ImportUriUiTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ImportUriUi" basePackage="org.eclipse.xtext.ui.tests.linking"
       disposableProviderFactory="true" fileExtensions="importuriuitestlanguage" ecorePackage="ImportUriUiTestLanguage.ecore#/">
     <genClasses ecoreClass="ImportUriUiTestLanguage.ecore#//Main">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/KeywordsUiTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/KeywordsUiTestLanguage.genmodel
index 24b22c941ab..f9c05d6d67c 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/KeywordsUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/KeywordsUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="KeywordsUiTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="KeywordsUiTestLanguage" basePackage="org.eclipse.xtext.ui.tests.parser.keywords"
       disposableProviderFactory="true" fileExtensions="keywordsuitestlanguage" ecorePackage="KeywordsUiTestLanguage.ecore#/">
     <genClasses ecoreClass="KeywordsUiTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/LookAheadContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/LookAheadContentAssistTestLanguage.genmodel
index a0efdad323e..33e7cebb753 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/LookAheadContentAssistTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/LookAheadContentAssistTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="LookAheadContentAssistTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="LookAheadContentAssistTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="lookaheadcontentassisttestlanguage"
       ecorePackage="LookAheadContentAssistTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/OutlineTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/OutlineTestLanguage.genmodel
index 73c675db3d4..08f3ee37e91 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/OutlineTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/OutlineTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="OutlineTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="OutlineTest" basePackage="org.eclipse.xtext.ui.tests.editor.outline"
       disposableProviderFactory="true" fileExtensions="outlinetestlanguage" ecorePackage="OutlineTestLanguage.ecore#/">
     <genClasses ecoreClass="OutlineTestLanguage.ecore#//Model">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ParameterizedExpressionsTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ParameterizedExpressionsTestLanguage.genmodel
index bb346a29e4e..c2c7a3e0402 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ParameterizedExpressionsTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ParameterizedExpressionsTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ParameterizedExpressionsTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ParameterizedExpressionsTestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="parameterizedexpressionstestlanguage"
       ecorePackage="ParameterizedExpressionsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ParametersTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ParametersTestLanguage.genmodel
index f61f957e7e1..bed03e64662 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ParametersTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ParametersTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ParametersTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ParametersTestLanguage" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="parameterstestlanguage" ecorePackage="ParametersTestLanguage.ecore#/">
     <genClasses ecoreClass="ParametersTestLanguage.ecore#//ParserRuleParameters">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/QuickfixCrossrefTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/QuickfixCrossrefTestLanguage.genmodel
index 396ebd49790..c3544b609ea 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/QuickfixCrossrefTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/QuickfixCrossrefTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="QuickfixCrossrefTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="QuickfixCrossref" basePackage="org.eclipse.xtext.ui.tests.quickfix"
       disposableProviderFactory="true" fileExtensions="quickfixcrossreftestlanguage"
       ecorePackage="QuickfixCrossrefTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/RefactoringTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/RefactoringTestLanguage.genmodel
index 60f20dfe0c5..f2619e1095f 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/RefactoringTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/RefactoringTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="RefactoringTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Refactoring" basePackage="org.eclipse.xtext.ui.tests.refactoring"
       disposableProviderFactory="true" fileExtensions="refactoringtestlanguage" ecorePackage="RefactoringTestLanguage.ecore#/">
     <genClasses ecoreClass="RefactoringTestLanguage.ecore#//Main">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ReferenceGrammarUiTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ReferenceGrammarUiTestLanguage.genmodel
index 2a89f463b18..0bc9de9a712 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ReferenceGrammarUiTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ReferenceGrammarUiTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ReferenceGrammarUiTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="ReferenceGrammarUi" basePackage="org.eclipse.xtext.ui.tests.testlanguages"
       disposableProviderFactory="true" fileExtensions="referencegrammaruitestlanguage"
       ecorePackage="ReferenceGrammarUiTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/ReferringTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/ReferringTestLanguage.genmodel
index 9079cd41087..24cfc42617f 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/ReferringTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/ReferringTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="ReferringTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Referring" basePackage="org.eclipse.xtext.ui.tests.refactoring"
       disposableProviderFactory="true" fileExtensions="referringtestlanguage" ecorePackage="ReferringTestLanguage.ecore#/">
     <genClasses ecoreClass="ReferringTestLanguage.ecore#//Main">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/TestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/TestLanguage.genmodel
index 074fd2e2fc9..d05a4232a5c 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/TestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/TestLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Foo" basePackage="org.eclipse.xtext.ui.tests" disposableProviderFactory="true"
       fileExtensions="testlanguage" ecorePackage="TestLanguage.ecore#/">
     <genClasses ecoreClass="TestLanguage.ecore#//File">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/TwoContextsTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/TwoContextsTestLanguage.genmodel
index 6d6acb83310..92fe08c8da4 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/TwoContextsTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/TwoContextsTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="TwoContextsTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="TwoContexts" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="twocontextstestlanguage" ecorePackage="TwoContextsTestLanguage.ecore#/">
     <genClasses ecoreClass="TwoContextsTestLanguage.ecore#//MainModel">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/UnorderedGroupsTestLanguage.genmodel b/org.eclipse.xtext.ui.tests/model/generated/UnorderedGroupsTestLanguage.genmodel
index b5884b7387f..69ac55a0aa2 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/UnorderedGroupsTestLanguage.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/UnorderedGroupsTestLanguage.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="UnorderedGroupsTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29">
+    copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="UnorderedGroupsTest" basePackage="org.eclipse.xtext.ui.tests.editor.contentassist"
       disposableProviderFactory="true" fileExtensions="unorderedgroupstestlanguage"
       ecorePackage="UnorderedGroupsTestLanguage.ecore#/">
diff --git a/org.eclipse.xtext.ui.tests/model/generated/Xml.genmodel b/org.eclipse.xtext.ui.tests/model/generated/Xml.genmodel
index e527eb97838..5858a0cc7fd 100644
--- a/org.eclipse.xtext.ui.tests/model/generated/Xml.genmodel
+++ b/org.eclipse.xtext.ui.tests/model/generated/Xml.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.ui.tests/src-gen" modelPluginID="org.eclipse.xtext.ui.tests"
     forceOverwrite="true" modelName="Xml" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Simplexml" basePackage="org.eclipse.xtext.ui.tests.xmleditor"
       disposableProviderFactory="true" fileExtensions="simplexml" ecorePackage="Xml.ecore#/">
     <genClasses ecoreClass="Xml.ecore#//XmlDocument">
diff --git a/org.eclipse.xtext.web.example.entities/model/generated/Entities.genmodel b/org.eclipse.xtext.web.example.entities/model/generated/Entities.genmodel
index 9a0a2c6b97e..1d1869e6321 100644
--- a/org.eclipse.xtext.web.example.entities/model/generated/Entities.genmodel
+++ b/org.eclipse.xtext.web.example.entities/model/generated/Entities.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.web.example.entities/src-gen" modelPluginID="org.eclipse.xtext.web.example.entities"
     forceOverwrite="true" modelName="Entities" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <genPackages prefix="Domainmodel" basePackage="org.eclipse.xtext.web.example.entities"
       disposableProviderFactory="true" fileExtensions="entities" ecorePackage="Entities.ecore#/">
     <genClasses ecoreClass="Entities.ecore#//Entities">
diff --git a/org.eclipse.xtext.web.example.statemachine/model/generated/Statemachine.genmodel b/org.eclipse.xtext.web.example.statemachine/model/generated/Statemachine.genmodel
index 7dfe22ca9ef..ac292930bd7 100644
--- a/org.eclipse.xtext.web.example.statemachine/model/generated/Statemachine.genmodel
+++ b/org.eclipse.xtext.web.example.statemachine/model/generated/Statemachine.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.web.example.statemachine/src-gen" modelPluginID="org.eclipse.xtext.web.example.statemachine"
     forceOverwrite="true" modelName="Statemachine" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Statemachine" basePackage="org.eclipse.xtext.web.example.statemachine"
       disposableProviderFactory="true" fileExtensions="statemachine" ecorePackage="Statemachine.ecore#/">
     <genClasses ecoreClass="Statemachine.ecore#//Statemachine">
diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel
index d5195dcad83..fd4f269332b 100644
--- a/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel
+++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages"
     forceOverwrite="true" modelName="Bug462047Lang" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="Bug462047" basePackage="org.eclipse.xtext.xbase.testlanguages.bug462047"
       disposableProviderFactory="true" fileExtensions="bug462047lang" ecorePackage="Bug462047Lang.ecore#/">
     <genClasses ecoreClass="Bug462047Lang.ecore#//Bug462047Root">
diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel
index 9766ba33f31..6aa0110975c 100644
--- a/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel
+++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages"
     forceOverwrite="true" modelName="ContentAssistFragmentTestLang" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
   <genPackages prefix="ContentAssistFragmentTestLang" basePackage="org.eclipse.xtext.xbase.testlanguages"
       disposableProviderFactory="true" fileExtensions="contentassistfragmenttestlang"
       ecorePackage="ContentAssistFragmentTestLang.ecore#/">
diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/JvmGenericTypeValidatorTestLang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/JvmGenericTypeValidatorTestLang.genmodel
index 494a8b11f48..851d2d43f99 100644
--- a/org.eclipse.xtext.xbase.testlanguages/model/generated/JvmGenericTypeValidatorTestLang.genmodel
+++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/JvmGenericTypeValidatorTestLang.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages"
     forceOverwrite="true" modelName="JvmGenericTypeValidatorTestLang" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <genPackages prefix="JvmGenericTypeValidatorTestLang" basePackage="org.eclipse.xtext.xbase.testlanguages"
       disposableProviderFactory="true" fileExtensions="jvmgenerictypevalidatortestlang"
       ecorePackage="JvmGenericTypeValidatorTestLang.ecore#/">
diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel
index b52519faf5a..bb56eab64db 100644
--- a/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel
+++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages"
     forceOverwrite="true" modelName="XImportSectionTestLang" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0"
-    copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <genPackages prefix="XImportSectionTestLang" basePackage="org.eclipse.xtext.xbase.testlanguages"
       disposableProviderFactory="true" fileExtensions="ximportsectiontestlang" ecorePackage="XImportSectionTestLang.ecore#/">
     <genClasses ecoreClass="XImportSectionTestLang.ecore#//ImportSectionTestLanguageRoot">
diff --git a/org.eclipse.xtext.xbase/model/Xbase.genmodel b/org.eclipse.xtext.xbase/model/Xbase.genmodel
index fde711f01ba..10037423eb3 100644
--- a/org.eclipse.xtext.xbase/model/Xbase.genmodel
+++ b/org.eclipse.xtext.xbase/model/Xbase.genmodel
@@ -6,7 +6,7 @@
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
     editPluginID="org.eclipse.xtext.xbase.edit" editorPluginID="org.eclipse.xtext.xbase.edit"
-    runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <foreignModel>XAnnotations.ecore</foreignModel>
   <foreignModel>Xtype.ecore</foreignModel>
   <foreignModel>Xbase.ecore</foreignModel>
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 bcb81340161..20ce16a042f 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
@@ -4,7 +4,7 @@
     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="11.0" copyrightFields="false" editPluginID="org.eclipse.xtext.xtext.generator.edit"
-    editorPluginID="org.eclipse.xtext.xtext.generator.editor" runtimeVersion="2.29">
+    editorPluginID="org.eclipse.xtext.xtext.generator.editor" runtimeVersion="2.36">
   <genPackages prefix="SimpleExpressions" basePackage="org.eclipse.xtext.xtext.generator.parser.antlr.splitting"
       disposableProviderFactory="true" ecorePackage="SimpleExpressions.ecore#/">
     <genClasses ecoreClass="SimpleExpressions.ecore#//IfCondition">
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/model/generated/Arithmetics.genmodel b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/model/generated/Arithmetics.genmodel
index a8aaf87bd16..9bee7a66930 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/model/generated/Arithmetics.genmodel
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/model/generated/Arithmetics.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.example.arithmetics/src-gen" modelPluginID="org.eclipse.xtext.example.arithmetics"
     forceOverwrite="true" modelName="Arithmetics" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Arithmetics" basePackage="org.eclipse.xtext.example.arithmetics"
       disposableProviderFactory="true" fileExtensions="calc" ecorePackage="Arithmetics.ecore#/">
     <genClasses ecoreClass="Arithmetics.ecore#//Module">
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/model/generated/Domainmodel.genmodel b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/model/generated/Domainmodel.genmodel
index a3fe7cbbb86..5898a716a13 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/model/generated/Domainmodel.genmodel
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/model/generated/Domainmodel.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2019 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.example.domainmodel/src-gen" modelPluginID="org.eclipse.xtext.example.domainmodel"
     forceOverwrite="true" modelName="Domainmodel" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <genPackages prefix="Domainmodel" basePackage="org.eclipse.xtext.example.domainmodel"
       disposableProviderFactory="true" fileExtensions="dmodel" ecorePackage="Domainmodel.ecore#/">
     <genClasses ecoreClass="Domainmodel.ecore#//DomainModel">
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/model/generated/Statemachine.genmodel b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/model/generated/Statemachine.genmodel
index 82b3c09ec33..11530855e98 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/model/generated/Statemachine.genmodel
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/model/generated/Statemachine.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.example.fowlerdsl/src-gen" modelPluginID="org.eclipse.xtext.example.fowlerdsl"
     forceOverwrite="true" modelName="Statemachine" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36">
   <genPackages prefix="Statemachine" basePackage="org.eclipse.xtext.example.fowlerdsl"
       disposableProviderFactory="true" fileExtensions="statemachine" ecorePackage="Statemachine.ecore#/">
     <genClasses ecoreClass="Statemachine.ecore#//Statemachine">
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/model/generated/RuleEngine.genmodel b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/model/generated/RuleEngine.genmodel
index eff34422278..f0350ede7f7 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/model/generated/RuleEngine.genmodel
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/model/generated/RuleEngine.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.example.homeautomation/src-gen" modelPluginID="org.eclipse.xtext.example.homeautomation"
     forceOverwrite="true" modelName="RuleEngine" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
   <genPackages prefix="RuleEngine" basePackage="org.eclipse.xtext.example.homeautomation"
       disposableProviderFactory="true" fileExtensions="rules" ecorePackage="RuleEngine.ecore#/">
     <genClasses ecoreClass="RuleEngine.ecore#//Model">