From 75a76d76c2200094b11c2beb417f69cd4006f6b4 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Thu, 14 Mar 2024 11:03:23 +0100
Subject: [PATCH] Support GenModel versions for 2024-06 and EMF 2.38 and JDK 23

---
 features/org.eclipse.emf-feature/feature.xml  |  2 +-
 features/org.eclipse.emf-feature/pom.xml      |  2 +-
 .../org.eclipse.emf.all-feature/feature.xml   |  2 +-
 features/org.eclipse.emf.all-feature/pom.xml  |  2 +-
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../org.eclipse.emf.sdk-feature/feature.xml   |  2 +-
 features/org.eclipse.emf.sdk-feature/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      | 14 ++++-----
 .../plugin.properties                         |  3 ++
 .../org.eclipse.emf.codegen.ecore.ui/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      | 24 +++++++--------
 .../model/GenModel.ecore                      | 15 ++++++++++
 .../model/GenModel.genmodel                   |  3 ++
 plugins/org.eclipse.emf.codegen.ecore/pom.xml |  2 +-
 .../codegen/ecore/generator/Generator.java    |  5 ++++
 .../genmodel/GenEclipsePlatformVersion.java   | 30 ++++++++++++++++++-
 .../codegen/ecore/genmodel/GenJDKLevel.java   | 30 ++++++++++++++++++-
 .../ecore/genmodel/GenRuntimeVersion.java     | 30 ++++++++++++++++++-
 .../genmodel/impl/GenModelPackageImpl.java    |  3 ++
 .../META-INF/MANIFEST.MF                      |  4 +--
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 25 files changed, 151 insertions(+), 38 deletions(-)

diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index 353d36beb..a2d6533b9 100644
--- a/features/org.eclipse.emf-feature/feature.xml
+++ b/features/org.eclipse.emf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf"
       label="%featureName"
-      version="2.37.0.qualifier"
+      version="2.38.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf-feature/pom.xml b/features/org.eclipse.emf-feature/pom.xml
index 912919912..4e519f305 100644
--- a/features/org.eclipse.emf-feature/pom.xml
+++ b/features/org.eclipse.emf-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf</artifactId>
-  <version>2.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.all-feature/feature.xml b/features/org.eclipse.emf.all-feature/feature.xml
index a2fa03302..d3a661731 100644
--- a/features/org.eclipse.emf.all-feature/feature.xml
+++ b/features/org.eclipse.emf.all-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.all"
       label="%featureName"
-      version="2.37.0.qualifier"
+      version="2.38.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.all-feature/pom.xml b/features/org.eclipse.emf.all-feature/pom.xml
index fa8524b33..3a708bc39 100644
--- a/features/org.eclipse.emf.all-feature/pom.xml
+++ b/features/org.eclipse.emf.all-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.all</artifactId>
-  <version>2.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
index 2ae201d75..091e792eb 100644
--- a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.codegen.ecore"
       label="%featureName"
-      version="2.37.0.qualifier"
+      version="2.38.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-feature/pom.xml b/features/org.eclipse.emf.codegen.ecore-feature/pom.xml
index acb5c508f..088656285 100644
--- a/features/org.eclipse.emf.codegen.ecore-feature/pom.xml
+++ b/features/org.eclipse.emf.codegen.ecore-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.codegen.ecore</artifactId>
-  <version>2.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
index ef06a9681..c28b27d53 100644
--- 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.37.0.qualifier"
+      version="2.38.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
index 29f2c06fc..db6d1d073 100644
--- 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.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
index 0c9c715e3..57c3d3693 100644
--- a/features/org.eclipse.emf.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.sdk"
       label="%featureName"
-      version="2.37.0.qualifier"
+      version="2.38.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.sdk-feature/pom.xml b/features/org.eclipse.emf.sdk-feature/pom.xml
index 40f351004..d3e6c5138 100644
--- a/features/org.eclipse.emf.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.sdk</artifactId>
-  <version>2.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
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
index c110ac30c..2f88b0ed2 100644
--- 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,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.37.0.qualifier
+Bundle-Version: 2.38.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.codegen.ecore.genmodel.action;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.handler;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.presentation;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.provider;version="2.37.0",
- org.eclipse.emf.codegen.ecore.ui;version="2.37.0"
+Export-Package: org.eclipse.emf.codegen.ecore.genmodel.action;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.handler;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.presentation;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.provider;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.ui;version="2.38.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.37.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.38.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.23.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties b/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
index 017ad0031..17b2bfb02 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
@@ -344,6 +344,7 @@ _UI_GenJDKLevel_JDK190_literal = 19.0
 _UI_GenJDKLevel_JDK200_literal = 20.0
 _UI_GenJDKLevel_JDK210_literal = 21.0
 _UI_GenJDKLevel_JDK220_literal = 22.0
+_UI_GenJDKLevel_JDK230_literal = 23.0
 
 _UI_GenTypeParameter_type = Gen Type Parameter
 _UI_GenTypeParameter_ecoreTypeParameter_feature = Ecore Type Parameter
@@ -431,6 +432,7 @@ _UI_GenRuntimeVersion_EMF234_literal = 2.34
 _UI_GenRuntimeVersion_EMF235_literal = 2.35
 _UI_GenRuntimeVersion_EMF236_literal = 2.36
 _UI_GenRuntimeVersion_EMF237_literal = 2.37
+_UI_GenRuntimeVersion_EMF238_literal = 2.38
 
 _UI_GenPackage_contentTypeIdentifier_feature = Content Type Identifier
 _UI_GenPackage_contentTypeIdentifier_description = A content type identifier against which to register this model's resource factory
@@ -528,6 +530,7 @@ _UI_GenEclipsePlatformVersion_Eclipse_2023_06_literal = 2023-06 - 4.28
 _UI_GenEclipsePlatformVersion_Eclipse_2023_09_literal = 2023-09 - 4.29
 _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_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
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml b/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml
index b450220e7..a8e2abd6b 100644
--- 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.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
index 2a53f5b63..bd54d1c76 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore/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;singleton:=true
-Bundle-Version: 2.37.0.qualifier
+Bundle-Version: 2.38.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.codegen.ecore.CodeGenEcorePlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.codegen.ecore;version="2.37.0",
- org.eclipse.emf.codegen.ecore.generator;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.generator;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.impl;version="2.37.0",
- org.eclipse.emf.codegen.ecore.genmodel.util;version="2.37.0",
- org.eclipse.emf.codegen.ecore.gwt;version="2.37.0",
- org.eclipse.emf.codegen.ecore.templates.edit;version="2.37.0",
- org.eclipse.emf.codegen.ecore.templates.editor;version="2.37.0",
- org.eclipse.emf.codegen.ecore.templates.model;version="2.37.0",
- org.eclipse.emf.codegen.ecore.templates.model.tests;version="2.37.0"
+Export-Package: org.eclipse.emf.codegen.ecore;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.generator;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.generator;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.impl;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.genmodel.util;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.gwt;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.templates.edit;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.templates.editor;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.templates.model;version="2.38.0",
+ org.eclipse.emf.codegen.ecore.templates.model.tests;version="2.38.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)",
diff --git a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
index 4bc08286e..7941d0ff5 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
@@ -587,6 +587,11 @@
         <details key="documentation" value="@since 2.36"/>
       </eAnnotations>
     </eLiterals>
+    <eLiterals name="JDK230" value="19" literal="23.0">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.38"/>
+      </eAnnotations>
+    </eLiterals>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GenTypeParameter" eSuperTypes="#//GenBase">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ecoreTypeParameter" lowerBound="1"
@@ -733,6 +738,11 @@
         <details key="documentation" value="@since 2.37"/>
       </eAnnotations>
     </eLiterals>
+    <eLiterals name="EMF238" value="36" literal="2.38">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.38"/>
+      </eAnnotations>
+    </eLiterals>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="GenRuntimePlatform">
     <eLiterals name="IDE"/>
@@ -871,6 +881,11 @@
         <details key="documentation" value="@since 2.37"/>
       </eAnnotations>
     </eLiterals>
+    <eLiterals name="Eclipse_2024_06" value="30" literal="2024-06">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.38"/>
+      </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
index f3bbba70a..7077e8bce 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
@@ -55,6 +55,7 @@
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK200"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK210"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK220"/>
+      <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK230"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimeVersion">
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF22"/>
@@ -93,6 +94,7 @@
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF235"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF236"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF237"/>
+      <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF238"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimePlatform">
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimePlatform/IDE"/>
@@ -136,6 +138,7 @@
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2023_09"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2023_12"/>
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_03"/>
+      <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2024_06"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenCodeStyle">
       <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenCodeStyle/UnnecessaryElse"/>
diff --git a/plugins/org.eclipse.emf.codegen.ecore/pom.xml b/plugins/org.eclipse.emf.codegen.ecore/pom.xml
index c3c74cbbd..0d11e5839 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/pom.xml
+++ b/plugins/org.eclipse.emf.codegen.ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.codegen.ecore</artifactId>
-  <version>2.37.0-SNAPSHOT</version>
+  <version>2.38.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java
index abfd0bc92..764261c5e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java
@@ -428,6 +428,11 @@ public JControlModel getJControlModel()
               facadeHelper.setCompilerCompliance("22"); 
               break;
             }
+            case JDK230_LITERAL:
+            {
+              facadeHelper.setCompilerCompliance("23"); 
+              break;
+            }
           }
 
           if (genModel.isCodeFormatting())
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java
index 5a424f468..b2f341739 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java
@@ -381,7 +381,19 @@ public enum GenEclipsePlatformVersion implements Enumerator
    * @generated
    * @ordered
    */
-  ECLIPSE_2024_03(29, "Eclipse_2024_03", "2024-03");
+  ECLIPSE_2024_03(29, "Eclipse_2024_03", "2024-03"),
+  /**
+   * The '<em><b>Eclipse 2024 06</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #ECLIPSE_2024_06_VALUE
+   * @generated
+   * @ordered
+   */
+  ECLIPSE_2024_06(30, "Eclipse_2024_06", "2024-06");
 
   /**
    * The '<em><b>Juno</b></em>' literal value.
@@ -782,6 +794,20 @@ public enum GenEclipsePlatformVersion implements Enumerator
    */
   public static final int ECLIPSE_2024_03_VALUE = 29;
 
+  /**
+   * The '<em><b>Eclipse 2024 06</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #ECLIPSE_2024_06
+   * @model name="Eclipse_2024_06" literal="2024-06"
+   * @generated
+   * @ordered
+   */
+  public static final int ECLIPSE_2024_06_VALUE = 30;
+
   /**
    * An array of all the '<em><b>Gen Eclipse Platform Version</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -821,6 +847,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
       ECLIPSE_2023_09,
       ECLIPSE_2023_12,
       ECLIPSE_2024_03,
+      ECLIPSE_2024_06,
     };
 
   /**
@@ -915,6 +942,7 @@ public static GenEclipsePlatformVersion get(int value)
       case ECLIPSE_2023_09_VALUE: return ECLIPSE_2023_09;
       case ECLIPSE_2023_12_VALUE: return ECLIPSE_2023_12;
       case ECLIPSE_2024_03_VALUE: return ECLIPSE_2024_03;
+      case ECLIPSE_2024_06_VALUE: return ECLIPSE_2024_06;
     }
     return null;
   }
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
index 2df4c9e4f..7707c17a4 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
@@ -254,7 +254,19 @@ public enum GenJDKLevel implements Enumerator
    * @generated
    * @ordered
    */
-  JDK220_LITERAL(18, "JDK220", "22.0");
+  JDK220_LITERAL(18, "JDK220", "22.0"),
+  /**
+   * The '<em><b>JDK230</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #JDK230
+   * @generated
+   * @ordered
+   */
+  JDK230_LITERAL(19, "JDK230", "23.0");
 
   /**
    * The '<em><b>JDK14</b></em>' literal value.
@@ -512,6 +524,20 @@ public enum GenJDKLevel implements Enumerator
    */
   public static final int JDK220 = 18;
 
+  /**
+   * The '<em><b>JDK230</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #JDK230_LITERAL
+   * @model literal="23.0"
+   * @generated
+   * @ordered
+   */
+  public static final int JDK230 = 19;
+
   /**
    * An array of all the '<em><b>Gen JDK Level</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -540,6 +566,7 @@ public enum GenJDKLevel implements Enumerator
       JDK200_LITERAL,
       JDK210_LITERAL,
       JDK220_LITERAL,
+      JDK230_LITERAL,
     };
 
   /**
@@ -623,6 +650,7 @@ public static GenJDKLevel get(int value)
       case JDK200: return JDK200_LITERAL;
       case JDK210: return JDK210_LITERAL;
       case JDK220: return JDK220_LITERAL;
+      case JDK230: return JDK230_LITERAL;
     }
     return null;
   }
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
index f5eddfbac..674d05a6f 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
@@ -450,7 +450,19 @@ public enum GenRuntimeVersion implements Enumerator
    * @generated
    * @ordered
    */
-  EMF237(35, "EMF237", "2.37");
+  EMF237(35, "EMF237", "2.37"),
+  /**
+   * The '<em><b>EMF238</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #EMF238_VALUE
+   * @generated
+   * @ordered
+   */
+  EMF238(36, "EMF238", "2.38");
 
   /**
    * The '<em><b>EMF22</b></em>' literal value.
@@ -934,6 +946,20 @@ public enum GenRuntimeVersion implements Enumerator
    */
   public static final int EMF237_VALUE = 35;
 
+  /**
+   * The '<em><b>EMF238</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * <!-- begin-model-doc -->
+   * @since 2.38
+   * <!-- end-model-doc -->
+   * @see #EMF238
+   * @model literal="2.38"
+   * @generated
+   * @ordered
+   */
+  public static final int EMF238_VALUE = 36;
+
   /**
    * An array of all the '<em><b>Gen Runtime Version</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -979,6 +1005,7 @@ public enum GenRuntimeVersion implements Enumerator
       EMF235,
       EMF236,
       EMF237,
+      EMF238,
     };
 
   /**
@@ -1079,6 +1106,7 @@ public static GenRuntimeVersion get(int value)
       case EMF235_VALUE: return EMF235;
       case EMF236_VALUE: return EMF236;
       case EMF237_VALUE: return EMF237;
+      case EMF238_VALUE: return EMF238;
     }
     return null;
   }
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java
index 5de95dd3a..28447ecfc 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java
@@ -3028,6 +3028,7 @@ public void initializePackageContents()
     addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK200_LITERAL);
     addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK210_LITERAL);
     addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK220_LITERAL);
+    addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK230_LITERAL);
 
     initEEnum(genRuntimeVersionEEnum, GenRuntimeVersion.class, "GenRuntimeVersion");
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF22);
@@ -3066,6 +3067,7 @@ public void initializePackageContents()
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF235);
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF236);
     addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF237);
+    addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF238);
 
     initEEnum(genRuntimePlatformEEnum, GenRuntimePlatform.class, "GenRuntimePlatform");
     addEEnumLiteral(genRuntimePlatformEEnum, GenRuntimePlatform.IDE);
@@ -3109,6 +3111,7 @@ public void initializePackageContents()
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2023_09);
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2023_12);
     addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_03);
+    addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2024_06);
 
     initEEnum(genCodeStyleEEnum, GenCodeStyle.class, "GenCodeStyle");
     addEEnumLiteral(genCodeStyleEEnum, GenCodeStyle.UNNECESSARY_ELSE);
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
index 03f494a42..05030e8f6 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
@@ -21,10 +21,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
  org.eclipse.xtext.common.types.ui;bundle-version="[2.18.0,3.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.14.0,3.0.0)",
- org.eclipse.emf.codegen.ecore;bundle-version="[2.37.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.38.0,3.0.0)",
  org.eclipse.emf.ecore.editor;bundle-version="[2.18.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.37.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.38.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)",
diff --git a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
index 510e45817..997fc4a36 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.13.0,3.0.0)";visibility:=re
  org.eclipse.xtext.ecore;bundle-version="[2.18.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xcore.lib;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.codegen.ecore.xtext;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.37.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.38.0,3.0.0)",
  org.objectweb.asm;bundle-version="[5.0.0,11.0.0)";resolution:=optional
 Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
index e6be9a2e1..fab335b29 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 1.28.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.37.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.38.0,3.0.0)",
  org.eclipse.emf.ecore.xcore;bundle-version="[1.29.0,2.0.0)",
  org.eclipse.emf.ecore.xcore.ui;bundle-version="[1.28.0,2.0.0)",
  org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,