Support GenModel versions for 2024-12 and EMF 2.40

ewillink · Sep 11, 2024 · d9b2bb5 · d9b2bb5
1 parent 4db0a4f
commit d9b2bb5
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 16 deletions.
diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.codegen.ecore.ui"
       label="%featureName"
-      version="2.39.0.qualifier"
+      version="2.40.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">

diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/pom.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.codegen.ecore.ui</artifactId>
-  <version>2.39.0-SNAPSHOT</version>
+  <version>2.40.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.39.0.qualifier
+Bundle-Version: 2.40.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.emf.codegen.ecore.genmodel.action;version="2.39.0",
- org.eclipse.emf.codegen.ecore.genmodel.handler;version="2.39.0",
- org.eclipse.emf.codegen.ecore.genmodel.presentation;version="2.39.0",
- org.eclipse.emf.codegen.ecore.genmodel.provider;version="2.39.0",
- org.eclipse.emf.codegen.ecore.ui;version="2.39.0"
+Export-Package: org.eclipse.emf.codegen.ecore.genmodel.action;version="2.40.0",
+ org.eclipse.emf.codegen.ecore.genmodel.handler;version="2.40.0",
+ org.eclipse.emf.codegen.ecore.genmodel.presentation;version="2.40.0",
+ org.eclipse.emf.codegen.ecore.genmodel.provider;version="2.40.0",
+ org.eclipse.emf.codegen.ecore.ui;version="2.40.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.39.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.24.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.40.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.25.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
  org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties b/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
@@ -434,6 +434,7 @@ _UI_GenRuntimeVersion_EMF236_literal = 2.36
 _UI_GenRuntimeVersion_EMF237_literal = 2.37
 _UI_GenRuntimeVersion_EMF238_literal = 2.38
 _UI_GenRuntimeVersion_EMF239_literal = 2.39
+_UI_GenRuntimeVersion_EMF240_literal = 2.40
 
 _UI_GenPackage_contentTypeIdentifier_feature = Content Type Identifier
 _UI_GenPackage_contentTypeIdentifier_description = A content type identifier against which to register this model's resource factory
@@ -533,6 +534,7 @@ _UI_GenEclipsePlatformVersion_Eclipse_2023_12_literal = 2023-12 - 4.30
 _UI_GenEclipsePlatformVersion_Eclipse_2024_03_literal = 2024-03 - 4.31
 _UI_GenEclipsePlatformVersion_Eclipse_2024_06_literal = 2024-06 - 4.32
 _UI_GenEclipsePlatformVersion_Eclipse_2024_09_literal = 2024-09 - 4.33
+_UI_GenEclipsePlatformVersion_Eclipse_2024_12_literal = 2024-12 - 4.34
 
 _UI_GenModel_modelDocumentation_feature = Model Documentation
 _UI_GenModel_modelDocumentation_description = The Javadoc documentation to generate for the model-level artifacts such as plug-in classes, including any @since or @deprecated tags
@@ -595,4 +597,4 @@ _UI_GenCodeStyle_UnnecessaryDeprecatedMethod_literal = UnnecessaryDeprecatedMeth
 
 _UI_GenModel_oSGiStyle_feature = OSGi Style
 _UI_GenModel_oSGiStyle_description = A set of style options that affect OSGi-related artifacts, such as headers in the MANIFEST.MF
-_UI_GenOSGiStyle_ProvideCapabilityGeneratedPackage_literal = Provide-Capability: org.eclipse.emf.ecore.generated_package
+_UI_GenOSGiStyle_ProvideCapabilityGeneratedPackage_literal = Provide-Capability: org.eclipse.emf.ecore.generated_package
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml b/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.codegen.ecore.ui</artifactId>
-  <version>2.39.0-SNAPSHOT</version>
+  <version>2.40.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
@@ -748,6 +748,11 @@
         <details key="documentation" value="@since 2.39"/>
       </eAnnotations>
     </eLiterals>
+    <eLiterals name="EMF240" value="38" literal="2.40">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.40"/>
+      </eAnnotations>
+    </eLiterals>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="GenRuntimePlatform">
     <eLiterals name="IDE"/>
@@ -896,6 +901,11 @@
         <details key="documentation" value="@since 2.39"/>
       </eAnnotations>
     </eLiterals>
+    <eLiterals name="Eclipse_2024_12" value="32" literal="2024-12">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.40"/>
+      </eAnnotations>
+    </eLiterals>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="Path" instanceClassName="java.lang.String">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

diff --git a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
@@ -96,6 +96,7 @@
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF237"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF238"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF239"/>
+      <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF240"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimePlatform">
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimePlatform/IDE"/>
@@ -141,6 +142,7 @@
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_03"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_06"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_09"/>
+      <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_12"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenCodeStyle">
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenCodeStyle/UnnecessaryElse"/>

diff --git a/...f.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java b/...f.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java
@@ -405,7 +405,19 @@ public enum GenEclipsePlatformVersion implements Enumerator
    * @generated
    * @ordered
    */
-  ECLIPSE_2024_09(31, "Eclipse_2024_09", "2024-09");
+  ECLIPSE_2024_09(31, "Eclipse_2024_09", "2024-09"),
+  /**
+   * The '<em><b>Eclipse 2024 12</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.40
+   * <!-- end-model-doc -->
+   * @see #ECLIPSE_2024_12_VALUE
+   * @generated
+   * @ordered
+   */
+  ECLIPSE_2024_12(32, "Eclipse_2024_12", "2024-12");
 
   /**
    * The '<em><b>Juno</b></em>' literal value.
@@ -834,6 +846,20 @@ public enum GenEclipsePlatformVersion implements Enumerator
    */
   public static final int ECLIPSE_2024_09_VALUE = 31;
 
+  /**
+   * The '<em><b>Eclipse 2024 12</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.40
+   * <!-- end-model-doc -->
+   * @see #ECLIPSE_2024_12
+   * @model name="Eclipse_2024_12" literal="2024-12"
+   * @generated
+   * @ordered
+   */
+  public static final int ECLIPSE_2024_12_VALUE = 32;
+
   /**
    * An array of all the '<em><b>Gen Eclipse Platform Version</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -875,6 +901,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
       ECLIPSE_2024_03,
       ECLIPSE_2024_06,
       ECLIPSE_2024_09,
+      ECLIPSE_2024_12,
     };
 
   /**
@@ -971,6 +998,7 @@ public static GenEclipsePlatformVersion get(int value)
       case ECLIPSE_2024_03_VALUE: return ECLIPSE_2024_03;
       case ECLIPSE_2024_06_VALUE: return ECLIPSE_2024_06;
       case ECLIPSE_2024_09_VALUE: return ECLIPSE_2024_09;
+      case ECLIPSE_2024_12_VALUE: return ECLIPSE_2024_12;
     }
     return null;
   }

diff --git a/...lipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java b/...lipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
@@ -474,7 +474,19 @@ public enum GenRuntimeVersion implements Enumerator
    * @generated
    * @ordered
    */
-  EMF239(37, "EMF239", "2.39");
+  EMF239(37, "EMF239", "2.39"),
+  /**
+   * The '<em><b>EMF240</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.40
+   * <!-- end-model-doc -->
+   * @see #EMF240_VALUE
+   * @generated
+   * @ordered
+   */
+  EMF240(38, "EMF240", "2.40");
 
   /**
    * The '<em><b>EMF22</b></em>' literal value.
@@ -986,6 +998,20 @@ public enum GenRuntimeVersion implements Enumerator
    */
   public static final int EMF239_VALUE = 37;
 
+  /**
+   * The '<em><b>EMF240</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.40
+   * <!-- end-model-doc -->
+   * @see #EMF240
+   * @model literal="2.40"
+   * @generated
+   * @ordered
+   */
+  public static final int EMF240_VALUE = 38;
+
   /**
    * An array of all the '<em><b>Gen Runtime Version</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -1033,6 +1059,7 @@ public enum GenRuntimeVersion implements Enumerator
       EMF237,
       EMF238,
       EMF239,
+      EMF240,
     };
 
   /**
@@ -1135,6 +1162,7 @@ public static GenRuntimeVersion get(int value)
       case EMF237_VALUE: return EMF237;
       case EMF238_VALUE: return EMF238;
       case EMF239_VALUE: return EMF239;
+      case EMF240_VALUE: return EMF240;
     }
     return null;
   }

diff --git a/...mf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java b/...mf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java
@@ -3281,6 +3281,7 @@ public void initializePackageContents()
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF237);
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF238);
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF239);
+    addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF240);
 
     initEEnum(genRuntimePlatformEEnum, GenRuntimePlatform.class, "GenRuntimePlatform");
     addEEnumLiteral(genRuntimePlatformEEnum, GenRuntimePlatform.IDE);
@@ -3326,6 +3327,7 @@ public void initializePackageContents()
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_03);
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_06);
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_09);
+    addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_12);
 
     initEEnum(genCodeStyleEEnum, GenCodeStyle.class, "GenCodeStyle");
     addEEnumLiteral(genCodeStyleEEnum, GenCodeStyle.UNNECESSARY_ELSE);

diff --git a/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF
@@ -16,6 +16,6 @@ Export-Package: org.eclipse.emf.converter;version="2.15.0",
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.codegen.ecore;bundle-version="[2.40.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.39.0,3.0.0)";resolution:=optional
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.40.0,3.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.converter
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
  org.eclipse.emf.codegen.ecore;bundle-version="[2.40.0,3.0.0)",
  org.eclipse.emf.ecore.editor;bundle-version="[2.19.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.39.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.40.0,3.0.0)",
  org.eclipse.emf.codegen.ecore.xtext.ui;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jdt.ui;bundle-version="[3.6.0,4.0.0)",