[eclipse/xtext#1282] Update to EMF 2.20: adapted workflows and manually maintained genmodels

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2019-12-13 10:12:33 +01:00 committed by Sebastian Zarnekow
parent d7ca0a4e72
commit de1a6b9bdb
9 changed files with 9 additions and 9 deletions

View file

@ -24,7 +24,7 @@ XtextGeneratorLanguage {
// generates Java API for the generated EPackages
fragment = ecore.EMFGeneratorFragment2 auto-inject {
emfRuntimeVersion = "2.9"
emfRuntimeVersion = "2.20"
}
// a custom ResourceFactory for use with EMF

View file

@ -14,7 +14,7 @@ XtextGeneratorLanguage {
// generates Java API for the generated EPackages
fragment = ecore.EMFGeneratorFragment2 auto-inject {
emfRuntimeVersion = "2.9"
emfRuntimeVersion = "2.20"
}
// serializer 2.0

View file

@ -14,7 +14,7 @@ XtextGeneratorLanguage {
// generates Java API for the generated EPackages
fragment = ecore.EMFGeneratorFragment2 auto-inject {
emfRuntimeVersion = "2.9"
emfRuntimeVersion = "2.20"
}
// serializer 2.0

View file

@ -19,7 +19,7 @@ var backtrackLexer = false
var debugGrammar = false
var generateDebugData = false
var generateStub = false
var emfRuntimeVersion = "2.9"
var emfRuntimeVersion = "2.20"
CompositeGeneratorFragment2 {
fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {

View file

@ -13,7 +13,7 @@ var genModel = ""
var classSplitting = true
var skipGenerate = false
var backtrack = false
var emfRuntimeVersion = "2.9"
var emfRuntimeVersion = "2.20"
CompositeGeneratorFragment2 {
fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {

View file

@ -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/src-gen" modelPluginID="org.eclipse.xtext.tests"
modelName="GenModelAccessTest" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
copyrightFields="false" runtimeVersion="2.5">
copyrightFields="false" runtimeVersion="2.20">
<foreignModel>GenModelAccessTest.ecore</foreignModel>
<genPackages prefix="Root" basePackage="org.eclipse.xtext.generator.ecore.genmodelaccess"
disposableProviderFactory="true" ecorePackage="GenModelAccessTest.ecore#/">

View file

@ -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="8.0" copyrightFields="false" editPluginID="org.eclipse.xtext.tests.edit"
editorPluginID="org.eclipse.xtext.tests.editor" runtimeVersion="2.5" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
editorPluginID="org.eclipse.xtext.tests.editor" runtimeVersion="2.20" 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">

View file

@ -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="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/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">

View file

@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen"
modelPluginID="org.eclipse.xtext.tests" modelName="GenericsTest" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.5">
complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20">
<foreignModel>GenericsTest.ecore</foreignModel>
<genPackages prefix="GenericTest" basePackage="org.eclipse.xtext.util" disposableProviderFactory="true"
ecorePackage="GenericsTest.ecore#/">