Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2021-12-16 07:41:01 +0000
committerEd Merks2021-12-16 07:41:01 +0000
commitd9dafc1d3b3c3814dc90e63ef2efa4d7d6a393d6 (patch)
tree14020f7939cde0a090091596bfcfa2038e6f1da5
parenta041c8d608345572cc844e06da2845e028d408a6 (diff)
downloadorg.eclipse.emf-d9dafc1d3b3c3814dc90e63ef2efa4d7d6a393d6.tar.gz
org.eclipse.emf-d9dafc1d3b3c3814dc90e63ef2efa4d7d6a393d6.tar.xz
org.eclipse.emf-d9dafc1d3b3c3814dc90e63ef2efa4d7d6a393d6.zip
[577836] Support GenModel versions for 2023-03 and EMF 2.29
-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.properties8
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore10
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel2
-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/genmodel/GenEclipsePlatformVersion.java31
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java31
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java2
14 files changed, 89 insertions, 15 deletions
diff --git a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
index 1b0b3178d..9e11d9267 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.28.0.qualifier"
+ version="2.29.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 77d45a68a..8960a7c49 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.28.0-SNAPSHOT</version>
+ <version>2.29.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 f524761c7..913a8245b 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.28.0.qualifier"
+ version="2.29.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 3b483b7a5..b62c30b87 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.28.0-SNAPSHOT</version>
+ <version>2.29.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 b7f0057f1..45263c7cd 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.28.0.qualifier
+Bundle-Version: 2.29.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.28.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.29.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.20.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 e8c343713..fec6f7f2e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/plugin.properties
@@ -417,6 +417,8 @@ _UI_GenRuntimeVersion_EMF224_literal = 2.24
_UI_GenRuntimeVersion_EMF225_literal = 2.25
_UI_GenRuntimeVersion_EMF226_literal = 2.26
_UI_GenRuntimeVersion_EMF227_literal = 2.27
+_UI_GenRuntimeVersion_EMF228_literal = 2.28
+_UI_GenRuntimeVersion_EMF229_literal = 2.29
_UI_GenPackage_contentTypeIdentifier_feature = Content Type Identifier
_UI_GenPackage_contentTypeIdentifier_description = A content type identifier against which to register this model's resource factory
@@ -504,6 +506,8 @@ _UI_GenEclipsePlatformVersion_Eclipse_2020_12_literal = 2020-12 - 4.18
_UI_GenEclipsePlatformVersion_Eclipse_2021_03_literal = 2021-03 - 4.19
_UI_GenEclipsePlatformVersion_Eclipse_2021_06_literal = 2021-06 - 4.20
_UI_GenEclipsePlatformVersion_Eclipse_2021_09_literal = 2021-09 - 4.21
+_UI_GenEclipsePlatformVersion_Eclipse_2021_12_literal = 2021-12 - 4.22
+_UI_GenEclipsePlatformVersion_Eclipse_2022_03_literal = 2022-03 - 4.23
_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
@@ -560,6 +564,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_GenRuntimeVersion_EMF228_literal = 2.28
-_UI_GenEclipsePlatformVersion_Eclipse_2021_12_literal = 2021-12
+_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 4211b50d7..60a51d697 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.28.0-SNAPSHOT</version>
+ <version>2.29.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 42bdf5b07..fa47612fe 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.28.0.qualifier
+Bundle-Version: 2.29.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.CodeGenEcorePlugin$Implementation
Bundle-Vendor: %providerName
@@ -23,7 +23,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.jdt.launching;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.25.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.26.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.codegen;bundle-version="[2.22.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
org.eclipse.text;bundle-version="[3.5.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 8e47bf92a..405495701 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.ecore
@@ -655,6 +655,11 @@
<details key="documentation" value="@since 2.28"/>
</eAnnotations>
</eLiterals>
+ <eLiterals name="EMF229" value="27" literal="2.29">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="@since 2.29"/>
+ </eAnnotations>
+ </eLiterals>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="GenRuntimePlatform">
<eLiterals name="IDE"/>
@@ -748,6 +753,11 @@
<details key="documentation" value="@since 2.28"/>
</eAnnotations>
</eLiterals>
+ <eLiterals name="Eclipse_2022_03" value="21" literal="2022-03">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="@since 2.29"/>
+ </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 a56564e32..f64120d1e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
@@ -80,6 +80,7 @@
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF226"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF227"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF228"/>
+ <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimeVersion/EMF229"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="GenModel.ecore#//GenRuntimePlatform">
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenRuntimePlatform/IDE"/>
@@ -114,6 +115,7 @@
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2021_06"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2021_09"/>
<genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2021_12"/>
+ <genEnumLiterals ecoreEnumLiteral="GenModel.ecore#//GenEclipsePlatformVersion/Eclipse_2022_03"/>
</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 ca39bb747..800b8d051 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.28.0-SNAPSHOT</version>
+ <version>2.29.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 4860cce0b..58770f0c4 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
@@ -272,7 +272,20 @@ public enum GenEclipsePlatformVersion implements Enumerator
* @generated
* @ordered
*/
- ECLIPSE_2021_12(20, "Eclipse_2021_12", "2021-12");
+ ECLIPSE_2021_12(20, "Eclipse_2021_12", "2021-12"),
+
+ /**
+ * The '<em><b>Eclipse 2022 03</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.29
+ * <!-- end-model-doc -->
+ * @see #ECLIPSE_2022_03_VALUE
+ * @generated
+ * @ordered
+ */
+ ECLIPSE_2022_03(21, "Eclipse_2022_03", "2022-03");
/**
* The '<em><b>Juno</b></em>' literal value.
@@ -548,6 +561,20 @@ public enum GenEclipsePlatformVersion implements Enumerator
public static final int ECLIPSE_2021_12_VALUE = 20;
/**
+ * The '<em><b>Eclipse 2022 03</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.29
+ * <!-- end-model-doc -->
+ * @see #ECLIPSE_2022_03
+ * @model name="Eclipse_2022_03" literal="2022-03"
+ * @generated
+ * @ordered
+ */
+ public static final int ECLIPSE_2022_03_VALUE = 21;
+
+ /**
* An array of all the '<em><b>Gen Eclipse Platform Version</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -577,6 +604,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
ECLIPSE_2021_06,
ECLIPSE_2021_09,
ECLIPSE_2021_12,
+ ECLIPSE_2022_03,
};
/**
@@ -662,6 +690,7 @@ public enum GenEclipsePlatformVersion implements Enumerator
case ECLIPSE_2021_06_VALUE: return ECLIPSE_2021_06;
case ECLIPSE_2021_09_VALUE: return ECLIPSE_2021_09;
case ECLIPSE_2021_12_VALUE: return ECLIPSE_2021_12;
+ case ECLIPSE_2022_03_VALUE: return ECLIPSE_2022_03;
}
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 958065a50..6106996b1 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
@@ -341,7 +341,20 @@ public enum GenRuntimeVersion implements Enumerator
* @generated
* @ordered
*/
- EMF228(26, "EMF228", "2.28");
+ EMF228(26, "EMF228", "2.28"),
+
+ /**
+ * The '<em><b>EMF229</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.29
+ * <!-- end-model-doc -->
+ * @see #EMF229_VALUE
+ * @generated
+ * @ordered
+ */
+ EMF229(27, "EMF229", "2.29");
/**
* The '<em><b>EMF22</b></em>' literal value.
@@ -700,6 +713,20 @@ public enum GenRuntimeVersion implements Enumerator
public static final int EMF228_VALUE = 26;
/**
+ * The '<em><b>EMF229</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * @since 2.29
+ * <!-- end-model-doc -->
+ * @see #EMF229
+ * @model literal="2.29"
+ * @generated
+ * @ordered
+ */
+ public static final int EMF229_VALUE = 27;
+
+ /**
* An array of all the '<em><b>Gen Runtime Version</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -735,6 +762,7 @@ public enum GenRuntimeVersion implements Enumerator
EMF226,
EMF227,
EMF228,
+ EMF229,
};
/**
@@ -826,6 +854,7 @@ public enum GenRuntimeVersion implements Enumerator
case EMF226_VALUE: return EMF226;
case EMF227_VALUE: return EMF227;
case EMF228_VALUE: return EMF228;
+ case EMF229_VALUE: return EMF229;
}
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 50afb33bf..5df28d572 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
@@ -3006,6 +3006,7 @@ public class GenModelPackageImpl extends EPackageImpl implements GenModelPackage
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF226);
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF227);
addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF228);
+ addEEnumLiteral(genRuntimeVersionEEnum, GenRuntimeVersion.EMF229);
initEEnum(genRuntimePlatformEEnum, GenRuntimePlatform.class, "GenRuntimePlatform");
addEEnumLiteral(genRuntimePlatformEEnum, GenRuntimePlatform.IDE);
@@ -3040,6 +3041,7 @@ public class GenModelPackageImpl extends EPackageImpl implements GenModelPackage
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2021_06);
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2021_09);
addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2021_12);
+ addEEnumLiteral(genEclipsePlatformVersionEEnum, GenEclipsePlatformVersion.ECLIPSE_2022_03);
initEEnum(genCodeStyleEEnum, GenCodeStyle.class, "GenCodeStyle");
addEEnumLiteral(genCodeStyleEEnum, GenCodeStyle.UNNECESSARY_ELSE);

Back to the top