Updates EMF generation settings #150 #145

- Increases compliance to Java 11 - Ensures that manifest and plugin.xml files are not touched by the generator
eclipse-viatra · Apr 13, 2024 · e6e7235 · e6e7235
1 parent 8f8d982
commit e6e7235
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 20 deletions.
diff --git a/addon/plugins/org.eclipse.viatra.addon.viewers.runtime/model/notation.genmodel b/addon/plugins/org.eclipse.viatra.addon.viewers.runtime/model/notation.genmodel
@@ -5,7 +5,8 @@
     editorDirectory="/org.eclipse.viatra.addon.viewers.runtime.editor/emf-gen" modelPluginID="org.eclipse.viatra.addon.viewers.runtime"
     modelName="Notation" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     testsDirectory="/org.eclipse.viatra.addon.viewers.runtime.tests/emf-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="7.0" copyrightFields="false" runtimeVersion="2.10" operationReflection="true">
+    bundleManifest="false" complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.10"
+    operationReflection="true" pluginKey="">
   <foreignModel>notation.ecore</foreignModel>
   <genPackages prefix="Notation" basePackage="org.eclipse.viatra.addon.viewers.runtime"
       disposableProviderFactory="true" ecorePackage="notation.ecore#/">

diff --git a/addon/plugins/org.eclipse.viatra.addon.viewers.runtime/plugin.xml b/addon/plugins/org.eclipse.viatra.addon.viewers.runtime/plugin.xml
@@ -3,7 +3,8 @@
       <!-- @generated notation -->
       <package
             uri="http://www.eclipse.org/viatra/addon/viewers/notation/1.0"
-            class="org.eclipse.viatra.addon.viewers.runtime.notation.NotationPackage"/>
+            class="org.eclipse.viatra.addon.viewers.runtime.notation.NotationPackage"
+            genModel="model/notation.genmodel"/>
    </extension>
   <extension id="org.eclipse.viatra.addon.viewers.runtime.model.patterns.ViewersTraceabilityQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:org.eclipse.viatra.addon.viewers.runtime.model.patterns.ViewersTraceabilityQueries" id="org.eclipse.viatra.addon.viewers.runtime.model.patterns.ViewersTraceabilityQueries">

diff --git a/...rg.eclipse.viatra.query.patternlanguage.metamodel/model/GraphicalPatternLanguage.genmodel b/...rg.eclipse.viatra.query.patternlanguage.metamodel/model/GraphicalPatternLanguage.genmodel
@@ -6,8 +6,9 @@
     modelName="GraphicalQueryLanguage" editPluginClass="org.eclipse.viatra.query.patternlanguage.metamodel.vgql.provider.GraphicalQueryLanguageEditPlugin"
     editorPluginClass="org.eclipse.viatra.query.patternlanguage.metamodel.vgql.presentation.GraphicalQueryLanguageEditorPlugin"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" operationReflection="true" importOrganizing="true">
+    importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" complianceLevel="8.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" operationReflection="true"
+    importOrganizing="true" pluginKey="">
   <foreignModel>GraphicalPatternLanguage.ecore</foreignModel>
   <genPackages prefix="Vgql" basePackage="org.eclipse.viatra.query.patternlanguage.metamodel"
       disposableProviderFactory="true" ecorePackage="GraphicalPatternLanguage.ecore#/">

diff --git a/query/plugins/org.eclipse.viatra.query.runtime.rete.recipes/model/rete-recipes.genmodel b/query/plugins/org.eclipse.viatra.query.runtime.rete.recipes/model/rete-recipes.genmodel
@@ -4,8 +4,9 @@
     modelDirectory="/org.eclipse.viatra.query.runtime.rete.recipes/src-gen" modelPluginID="org.eclipse.viatra.query.runtime.rete.recipes"
     runtimeJar="true" forceOverwrite="true" modelName="Rete-recipes" updateClasspath="false"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
-    complianceLevel="7.0" language="en" operationReflection="true">
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" bundleManifest="false"
+    containmentProxies="true" complianceLevel="11.0" language="en" operationReflection="true"
+    pluginKey="">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
     <genAnnotations source="selectedPackages">
       <details key="http://www.eclipse.org/emf/2002/Ecore" value="Ecore.xsd"/>

diff --git a/.../org.eclipse.viatra.query.tooling.generator.model/model/generated/GeneratorModel.genmodel b/.../org.eclipse.viatra.query.tooling.generator.model/model/generated/GeneratorModel.genmodel
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.viatra.query.tooling.generator.model/src-gen"
-    editDirectory="/org.eclipse.viatra.query.tooling.generator.model.edit/src" editorDirectory="/org.eclipse.viatra.query.tooling.generator.model.editor/src"
-    modelPluginID="org.eclipse.viatra.query.tooling.generator.model" forceOverwrite="true"
-    modelName="GeneratorModel" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="8.0" copyrightFields="false" editPluginID="org.eclipse.viatra.query.tooling.generator.model.edit"
-    editorPluginID="org.eclipse.viatra.query.tooling.generator.model.editor" runtimeVersion="2.11"
-    usedGenPackages="platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010-2018, Zoltan Ujhelyi, Istvan Rath and Daniel Varro&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License v. 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-v20.html.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA;This file was generated from GeneratorModel.xtext"
+    modelDirectory="/org.eclipse.viatra.query.tooling.generator.model/src-gen" modelPluginID="org.eclipse.viatra.query.tooling.generator.model"
+    forceOverwrite="true" modelName="GeneratorModel" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="GeneratorModel" basePackage="org.eclipse.viatra.query.tooling.generator.model"
-      disposableProviderFactory="true" ecorePackage="GeneratorModel.ecore#/">
+      disposableProviderFactory="true" fileExtensions="vqgen" ecorePackage="GeneratorModel.ecore#/">
     <genClasses ecoreClass="GeneratorModel.ecore#//ViatraQueryGeneratorModel">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GeneratorModel.ecore#//ViatraQueryGeneratorModel/genmodels"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GeneratorModel.ecore#//ViatraQueryGeneratorModel/configuration"/>

diff --git a/...or.model/src/org/eclipse/viatra/query/tooling/generator/model/GenerateGeneratorModel.mwe2 b/...or.model/src/org/eclipse/viatra/query/tooling/generator/model/GenerateGeneratorModel.mwe2
@@ -82,7 +82,7 @@ Workflow {
 
             fragment = grammarAccess.GrammarAccessFragment2 {}
             fragment = ecore.EMFGeneratorFragment2 {
-                jdkLevel = "JDK80"
+                jdkLevel = "JDK110"
             }
             fragment = serializer.SerializerFragment2 {
                 generateStub = false

diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.genmodel b/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.genmodel
@@ -4,8 +4,9 @@
     modelDirectory="/org.eclipse.viatra.query.testing.snapshot/emf-gen" editDirectory=""
     editorDirectory="" modelPluginID="org.eclipse.viatra.query.testing.snapshot" modelName="Snapshot"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    runtimeVersion="2.10" language="" operationReflection="true" importOrganizing="true">
+    importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" complianceLevel="11.0"
+    copyrightFields="false" runtimeVersion="2.10" language="" operationReflection="true"
+    importOrganizing="true" pluginKey="">
   <foreignModel>snapshot.ecore</foreignModel>
   <genPackages prefix="Snapshot" basePackage="org.eclipse.viatra.query.testing" disposableProviderFactory="true"
       ecorePackage="snapshot.ecore#/">

diff --git a/transformation/plugins/org.eclipse.viatra.transformation.views/model/traceability.genmodel b/transformation/plugins/org.eclipse.viatra.transformation.views/model/traceability.genmodel
@@ -7,8 +7,8 @@
     editorPluginClass="org.eclipse.viatra.transformation.views.traceability.presentation.TraceabilityEditorPlugin"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.viatra.transformation.views.tests/emf-gen"
     testSuiteClass="org.eclipse.viatra.transformation.views.traceability.tests.TraceabilityAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    runtimeVersion="2.10" operationReflection="true">
+    importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" complianceLevel="11.0"
+    copyrightFields="false" runtimeVersion="2.10" operationReflection="true" pluginKey="">
   <foreignModel>traceability.ecore</foreignModel>
   <genPackages prefix="Traceability" basePackage="org.eclipse.viatra.transformation.views"
       disposableProviderFactory="true" ecorePackage="traceability.ecore#/">

diff --git a/transformation/plugins/org.eclipse.viatra.transformation.views/plugin.xml b/transformation/plugins/org.eclipse.viatra.transformation.views/plugin.xml
@@ -3,7 +3,8 @@
       <!-- @generated traceability -->
       <package
             uri="http://www.eclipse.org/viatra/transformation/views/traceability/1.0"
-            class="org.eclipse.viatra.transformation.views.traceability.TraceabilityPackage"/>
+            class="org.eclipse.viatra.transformation.views.traceability.TraceabilityPackage"
+            genModel="model/traceability.genmodel"/>
    </extension>
   <extension id="org.eclipse.viatra.transformation.views.traceability.patterns.Helpers" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:org.eclipse.viatra.transformation.views.traceability.patterns.Helpers" id="org.eclipse.viatra.transformation.views.traceability.patterns.Helpers">