Skip to content

Commit

Permalink
Support GenModel versions for 2024-06 and EMF 2.38 and JDK 23
Browse files Browse the repository at this point in the history
  • Loading branch information
@merks
merks committed Mar 14, 2024
1 parent ddc2fbf commit 75a76d7
Show file tree
Hide file tree
Showing 25 changed files with 151 additions and 38 deletions.
2 changes: 1 addition & 1 deletion features/org.eclipse.emf-feature/feature.xml
View file
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf-feature/pom.xml
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.all-feature/feature.xml
View file
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.all-feature/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.codegen.ecore-feature/feature.xml
View file
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.codegen.ecore-feature/pom.xml
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
View file
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.codegen.ecore.ui-feature/pom.xml
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.sdk-feature/feature.xml
View file
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.sdk-feature/pom.xml
View file
Expand Up @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -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)"
Expand Down
3 changes: 3 additions & 0 deletions plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml
View file
Expand Up @@ -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>
24 changes: 12 additions & 12 deletions plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
View file
Expand Up @@ -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)",
Expand Down
15 changes: 15 additions & 0 deletions plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
View file
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.emf.codegen.ecore/pom.xml
View file
Expand Up @@ -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>
5 changes: 5 additions & 0 deletions .../org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java
View file
Expand Up @@ -428,6 +428,11 @@ public JControlModel getJControlModel()
facadeHelper.setCompilerCompliance("22");
break;
}
case JDK230_LITERAL:
{
facadeHelper.setCompilerCompliance("23");
break;
}
}

if (genModel.isCodeFormatting())
Expand Down
30 changes: 29 additions & 1 deletion ...f.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -821,6 +847,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
ECLIPSE_2023_09,
ECLIPSE_2023_12,
ECLIPSE_2024_03,
ECLIPSE_2024_06,
};

/**
Expand Down Expand Up @@ -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;
}
Expand Down
30 changes: 29 additions & 1 deletion ...org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -540,6 +566,7 @@ public enum GenJDKLevel implements Enumerator
JDK200_LITERAL,
JDK210_LITERAL,
JDK220_LITERAL,
JDK230_LITERAL,
};

/**
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 75a76d7

Please sign in to comment.