Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2022-09-25 12:45:53 +0000
committerEd Merks2022-09-25 12:45:53 +0000
commit20f9e6516e0662e5c2d647819c30866656636ac9 (patch)
tree5977367298eb8da4a08478d39c1479b22cbbc197
parentc6e8080417e096e76885b1cc36a5559c803dd04a (diff)
downloadorg.eclipse.emf-20f9e6516e0662e5c2d647819c30866656636ac9.tar.gz
org.eclipse.emf-20f9e6516e0662e5c2d647819c30866656636ac9.tar.xz
org.eclipse.emf-20f9e6516e0662e5c2d647819c30866656636ac9.zip
[580798] Support GenModel versions for 2022-09 and EMF 2.32 and JDK 20
-rw-r--r--features/org.eclipse.emf-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore.ui-feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties5
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore15
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel3
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/Generator.java5
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEclipsePlatformVersion.java30
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java30
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java30
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java3
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore.exporter/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF2
22 files changed, 133 insertions, 20 deletions
diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index c8bad6a43..4a08a6084 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.31.0.qualifier"
+ version="2.32.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 9122b7507..49bfecebd 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.31.0-SNAPSHOT</version>
+ <version>2.32.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
index c06dcfc74..a3778ab26 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.31.0.qualifier"
+ version="2.32.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 809a7f944..0395fcac4 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.31.0-SNAPSHOT</version>
+ <version>2.32.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 8623ff2a4..7388be4e9 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.31.0.qualifier"
+ version="2.32.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 8da0cdc63..c162545a2 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.31.0-SNAPSHOT</version>
+ <version>2.32.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
index 34180f0a6..deee26783 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,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.31.0.qualifier
+Bundle-Version: 2.32.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin$Implementation
Bundle-Vendor: %providerName
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.31.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.32.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.22.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
org.eclipse.jface.text;bundle-version="[3.6.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 5a4a7c26c..b0db33da4 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
@@ -341,6 +341,7 @@ _UI_GenJDKLevel_JDK160_literal = 16.0
_UI_GenJDKLevel_JDK170_literal = 17.0
_UI_GenJDKLevel_JDK180_literal = 18.0
_UI_GenJDKLevel_JDK190_literal = 19.0
+_UI_GenJDKLevel_JDK200_literal = 20.0
_UI_GenTypeParameter_type = Gen Type Parameter
_UI_GenTypeParameter_ecoreTypeParameter_feature = Ecore Type Parameter
@@ -422,6 +423,7 @@ _UI_GenRuntimeVersion_EMF228_literal = 2.28
_UI_GenRuntimeVersion_EMF229_literal = 2.29
_UI_GenRuntimeVersion_EMF230_literal = 2.30
_UI_GenRuntimeVersion_EMF231_literal = 2.31
+_UI_GenRuntimeVersion_EMF232_literal = 2.32
_UI_GenPackage_contentTypeIdentifier_feature = Content Type Identifier
_UI_GenPackage_contentTypeIdentifier_description = A content type identifier against which to register this model's resource factory
@@ -513,6 +515,7 @@ _UI_GenEclipsePlatformVersion_Eclipse_2021_12_literal = 2021-12 - 4.22
_UI_GenEclipsePlatformVersion_Eclipse_2022_03_literal = 2022-03 - 4.23
_UI_GenEclipsePlatformVersion_Eclipse_2022_06_literal = 2022-06 - 4.24
_UI_GenEclipsePlatformVersion_Eclipse_2022_09_literal = 2022-09 - 4.25
+_UI_GenEclipsePlatformVersion_Eclipse_2022_12_literal = 2022-12 - 4.26
_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
@@ -571,4 +574,4 @@ _UI_GenModel_codeStyle_description = A set of style options that affect the code
_UI_GenCodeStyle_UnnecessaryElse_literal = UnnecessaryElse
_UI_GenCodeStyle_SwitchMissingDefaultCase_literal = SwitchMissingDefaultCase
_UI_GenCodeStyle_UnnecessaryAssignmentBeforeReturn_literal = UnnecessaryAssignmentBeforeReturn
-_UI_GenCodeStyle_UnnecessaryDeprecatedMethod_literal = UnnecessaryDeprecatedMethod
+_UI_GenCodeStyle_UnnecessaryDeprecatedMethod_literal = UnnecessaryDeprecatedMethod \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml b/plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml
index 014fade95..662306417 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.31.0-SNAPSHOT</version>
+ <version>2.32.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 c145c5e23..4bbcd16e8 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen.ecore; singleton:=true
-Bundle-Version: 2.31.0.qualifier
+Bundle-Version: 2.32.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.CodeGenEcorePlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
index c0290dbd4..a13d3b4be 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
@@ -566,6 +566,11 @@
<details key="documentation" value="@since 2.30"/>
</eAnnotations>
</eLiterals>
+ <eLiterals name="JDK200" value="16" literal="20.0">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="@since 2.32"/>
+ </eAnnotations>
+ </eLiterals>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenTypeParameter" eSuperTypes="#//GenBase">
<eStructuralFeatures xsi:type="ecore:EReference" name="ecoreTypeParameter" lowerBound="1"
@@ -682,6 +687,11 @@
<details key="documentation" value="@since 2.31"/>
</eAnnotations>
</eLiterals>
+ <eLiterals name="EMF232" value="30" literal="2.32">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="@since 2.32"/>
+ </eAnnotations>
+ </eLiterals>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="GenRuntimePlatform">
<eLiterals name="IDE"/>
@@ -790,6 +800,11 @@
<details key="documentation" value="@since 2.31"/>
</eAnnotations>
</eLiterals>
+ <eLiterals name="Eclipse_2022_12" value="24" literal="2022-12">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="@since 2.32"/>
+ </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 adaec279d..58b2d312f 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
@@ -52,6 +52,7 @@
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK170"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK180"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK190"/>
+ <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenJDKLevel/JDK200"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimeVersion">
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF22"/>
@@ -84,6 +85,7 @@
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF229"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF230"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF231"/>
+ <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF232"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimePlatform">
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimePlatform/IDE"/>
@@ -121,6 +123,7 @@
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2022_03"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2022_06"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2022_09"/>
+ <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2022_12"/>
</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 6035a70bb..5a33a25d7 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.31.0-SNAPSHOT</version>
+ <version>2.32.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 ece4bd0ab..aaf012009 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
@@ -413,6 +413,11 @@ public class Generator
facadeHelper.setCompilerCompliance("19");
break;
}
+ case JDK200_LITERAL:
+ {
+ facadeHelper.setCompilerCompliance("20");
+ 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 a45d38dce..0d5a7ea7a 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
@@ -309,7 +309,19 @@ public enum GenEclipsePlatformVersion implements Enumerator
* @generated
* @ordered
*/
- ECLIPSE_2022_09(23, "Eclipse_2022_09", "2022-09");
+ ECLIPSE_2022_09(23, "Eclipse_2022_09", "2022-09"),
+ /**
+ * The '<em><b>Eclipse 2022 12</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #ECLIPSE_2022_12_VALUE
+ * @generated
+ * @ordered
+ */
+ ECLIPSE_2022_12(24, "Eclipse_2022_12", "2022-12");
/**
* The '<em><b>Juno</b></em>' literal value.
@@ -627,6 +639,20 @@ public enum GenEclipsePlatformVersion implements Enumerator
public static final int ECLIPSE_2022_09_VALUE = 23;
/**
+ * The '<em><b>Eclipse 2022 12</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #ECLIPSE_2022_12
+ * @model name="Eclipse_2022_12" literal="2022-12"
+ * @generated
+ * @ordered
+ */
+ public static final int ECLIPSE_2022_12_VALUE = 24;
+
+ /**
* An array of all the '<em><b>Gen Eclipse Platform Version</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -659,6 +685,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
ECLIPSE_2022_03,
ECLIPSE_2022_06,
ECLIPSE_2022_09,
+ ECLIPSE_2022_12,
};
/**
@@ -747,6 +774,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
case ECLIPSE_2022_03_VALUE: return ECLIPSE_2022_03;
case ECLIPSE_2022_06_VALUE: return ECLIPSE_2022_06;
case ECLIPSE_2022_09_VALUE: return ECLIPSE_2022_09;
+ case ECLIPSE_2022_12_VALUE: return ECLIPSE_2022_12;
}
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 cbcf1cdd1..7e8588783 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
@@ -218,7 +218,19 @@ public enum GenJDKLevel implements Enumerator
* @generated
* @ordered
*/
- JDK190_LITERAL(15, "JDK190", "19.0");
+ JDK190_LITERAL(15, "JDK190", "19.0"),
+ /**
+ * The '<em><b>JDK200</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #JDK200
+ * @generated
+ * @ordered
+ */
+ JDK200_LITERAL(16, "JDK200", "20.0");
/**
* The '<em><b>JDK14</b></em>' literal value.
@@ -435,6 +447,20 @@ public enum GenJDKLevel implements Enumerator
public static final int JDK190 = 15;
/**
+ * The '<em><b>JDK200</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #JDK200_LITERAL
+ * @model literal="20.0"
+ * @generated
+ * @ordered
+ */
+ public static final int JDK200 = 16;
+
+ /**
* An array of all the '<em><b>Gen JDK Level</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -459,6 +485,7 @@ public enum GenJDKLevel implements Enumerator
JDK170_LITERAL,
JDK180_LITERAL,
JDK190_LITERAL,
+ JDK200_LITERAL,
};
/**
@@ -539,6 +566,7 @@ public enum GenJDKLevel implements Enumerator
case JDK170: return JDK170_LITERAL;
case JDK180: return JDK180_LITERAL;
case JDK190: return JDK190_LITERAL;
+ case JDK200: return JDK200_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 dcbbeefc2..15af7bdad 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
@@ -378,7 +378,19 @@ public enum GenRuntimeVersion implements Enumerator
* @generated
* @ordered
*/
- EMF231(29, "EMF231", "2.31");
+ EMF231(29, "EMF231", "2.31"),
+ /**
+ * The '<em><b>EMF232</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #EMF232_VALUE
+ * @generated
+ * @ordered
+ */
+ EMF232(30, "EMF232", "2.32");
/**
* The '<em><b>EMF22</b></em>' literal value.
@@ -779,6 +791,20 @@ public enum GenRuntimeVersion implements Enumerator
public static final int EMF231_VALUE = 29;
/**
+ * The '<em><b>EMF232</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.32
+ * <!-- end-model-doc -->
+ * @see #EMF232
+ * @model literal="2.32"
+ * @generated
+ * @ordered
+ */
+ public static final int EMF232_VALUE = 30;
+
+ /**
* An array of all the '<em><b>Gen Runtime Version</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -817,6 +843,7 @@ public enum GenRuntimeVersion implements Enumerator
EMF229,
EMF230,
EMF231,
+ EMF232,
};
/**
@@ -911,6 +938,7 @@ public enum GenRuntimeVersion implements Enumerator
case EMF229_VALUE: return EMF229;
case EMF230_VALUE: return EMF230;
case EMF231_VALUE: return EMF231;
+ case EMF232_VALUE: return EMF232;
}
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 0f111925e..ed0e3b781 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
@@ -2991,6 +2991,7 @@ public class GenModelPackageImpl extends EPackageImpl implements GenModelPackage
addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK170_LITERAL);
addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK180_LITERAL);
addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK190_LITERAL);
+ addEEnumLiteral(genJDKLevelEEnum, GenJDKLevel.JDK200_LITERAL);
initEEnum(genRuntimeVersionEEnum, GenRuntimeVersion.class, "GenRuntimeVersion");
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF22);
@@ -3023,6 +3024,7 @@ public class GenModelPackageImpl extends EPackageImpl implements GenModelPackage
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF229);
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF230);
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF231);
+ addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF232);
initEEnum(genRuntimePlatformEEnum, GenRuntimePlatform.class, "GenRuntimePlatform");
addEEnumLiteral(genRuntimePlatformEEnum, GenRuntimePlatform.IDE);
@@ -3060,6 +3062,7 @@ public class GenModelPackageImpl extends EPackageImpl implements GenModelPackage
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2022_03);
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2022_06);
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2022_09);
+ addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2022_12);
initEEnum(genCodeStyleEEnum, GenCodeStyle.class, "GenCodeStyle");
addEEnumLiteral(genCodeStyleEEnum, GenCodeStyle.UNNECESSARY_ELSE);
diff --git a/plugins/org.eclipse.emf.ecore.xcore.exporter/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore.exporter/META-INF/MANIFEST.MF
index 52f25a436..90bc68127 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.exporter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore.exporter/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.emf.ecore.xcore.exporter,
org.eclipse.emf.ecore.xcore.exporter.ui
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.emf.exporter;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.31.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.32.0,3.0.0)";resolution:=optional,
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
org.eclipse.emf.ecore.xcore.ui;bundle-version="[1.22.0,2.0.0)",
org.eclipse.emf.ecore.xcore;bundle-version="[1.23.0,2.0.0)",
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 559ec28e9..3746f6eee 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.6.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.6.0,4.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.codegen.ecore;bundle-version="[2.31.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.32.0,3.0.0)",
org.eclipse.emf.ecore.editor;bundle-version="[2.17.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.31.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.32.0,3.0.0)",
org.eclipse.emf.codegen.ecore.xtext.ui;bundle-version="[1.4.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 a6387e83c..2aa242d94 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
@@ -20,7 +20,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.6.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.codegen.ecore.xtext;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.31.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.32.0,3.0.0)",
org.objectweb.asm;bundle-version="[5.0.0,11.0.0)";resolution:=optional
Import-Package: org.apache.commons.logging;version="[1.0.0,2.0.0)",
org.apache.log4j;version="[1.2.0,2.0.0)"
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 be3f3b02a..dbc9d53ef 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.22.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.31.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.32.0,3.0.0)",
org.eclipse.emf.ecore.xcore;bundle-version="[1.23.0,2.0.0)",
org.eclipse.emf.ecore.xcore.ui;bundle-version="[1.22.0,2.0.0)",
org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,

Back to the top