diff --git a/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel b/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel index dc3e4b0428..daa66aa93d 100644 --- a/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel +++ b/org.eclipse.xtext.builder.standalone.tests/model/generated/BuilderTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.builder.standalone.tests/src-gen" modelPluginID="org.eclipse.xtext.builder.standalone.tests" forceOverwrite="true" modelName="BuilderTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> + complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29"> diff --git a/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 b/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 index 749891d732..931ed4795b 100644 --- a/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 +++ b/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 @@ -32,8 +32,8 @@ Workflow { grammarUri = "classpath:/org/eclipse/xtext/builder/tests/BuilderTestLanguage.xtext" fragment = ecore.EMFGeneratorFragment2 { - emfRuntimeVersion = "2.20" - jdkLevel = "JDK80" + emfRuntimeVersion = "2.29" + jdkLevel = "JDK110" } fragment = grammarAccess.GrammarAccessFragment2 {} fragment = resourceFactory.ResourceFactoryFragment2 {} diff --git a/org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF index 3cfbdf068f..0ab6561afc 100644 --- a/org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.testing, org.eclipse.xtext.util, org.eclipse.xtext.common.types, - org.eclipse.emf.ecore;bundle-version="2.20.0", + org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.xtext, org.eclipse.core.resources;bundle-version="3.12.0", org.eclipse.jdt.core;bundle-version="3.13.102", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext.testing, org.eclipse.jdt.launching;bundle-version="3.9.100", org.eclipse.xtext.common.types.ui, org.eclipse.emf.mwe2.launch;bundle-version="2.9.1";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.common;bundle-version="2.17.0", + org.eclipse.emf.common;bundle-version="2.24.0", org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared, org.eclipse.ui.editors;bundle-version="3.11.0", diff --git a/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel b/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel index f51412bcf1..cce6e81604 100644 --- a/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel +++ b/org.eclipse.xtext.common.types.tests/model/generated/ContentAssistTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.common.types.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.tests" forceOverwrite="true" modelName="ContentAssistTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> diff --git a/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel b/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel index 6caccf34e2..c6b492a982 100644 --- a/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel +++ b/org.eclipse.xtext.common.types.tests/model/generated/RefactoringTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.common.types.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.tests" forceOverwrite="true" modelName="RefactoringTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> diff --git a/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 b/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 index 24da03628b..a3fa9e9a1f 100644 --- a/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 +++ b/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 @@ -12,7 +12,7 @@ import org.eclipse.xtext.xtext.generator.* CompositeGeneratorFragment2 { fragment = ecore.EMFGeneratorFragment2 { - emfRuntimeVersion = "2.20" + emfRuntimeVersion = "2.29" } fragment = grammarAccess.GrammarAccessFragment2 {} fragment = resourceFactory.ResourceFactoryFragment2 {} diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index f8d398ab62..3ac9cc7c2d 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 2.30.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.common.types;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: - org.eclipse.emf.ecore;bundle-version="2.20.0", - org.eclipse.emf.common;bundle-version="2.17.0", + org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.common;bundle-version="2.24.0", com.google.inject;bundle-version="5.0.1", org.eclipse.xtext, org.objectweb.asm;bundle-version="[9.4.0,9.5.0)", diff --git a/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel b/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel index 482dab7c0c..107415dd89 100644 --- a/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel +++ b/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel @@ -5,9 +5,9 @@ editorDirectory="/org.eclipse.xtext.types.editor/src" modelPluginID="org.eclipse.xtext.common.types" forceOverwrite="true" modelName="Types" modelPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" rootImplementsInterface="" - importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" suppressGenModelAnnotations="false" + importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" suppressGenModelAnnotations="false" copyrightFields="false" editPluginID="org.eclipse.xtext.common.types.edit" editorPluginID="org.eclipse.xtext.types.editor" - runtimeVersion="2.20" interfaceNamePattern="" classNamePattern=""> + runtimeVersion="2.29" interfaceNamePattern="" classNamePattern=""> JavaVMTypes.ecore diff --git a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel index 7046711006..05058224ef 100644 --- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel +++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests" forceOverwrite="true" modelName="EnumAndReferenceTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel index ee01e9a3d1..071751237b 100644 --- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel +++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests" forceOverwrite="true" modelName="EnumRulesTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums"> diff --git a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel index c813f0a402..65cf18e153 100644 --- a/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel +++ b/org.eclipse.xtext.extras.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.extras.tests/src-gen" modelPluginID="org.eclipse.xtext.extras.tests" forceOverwrite="true" modelName="MultiRuleEnumTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29"> diff --git a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 index 5fd661c402..3fe6c8a710 100644 --- a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 +++ b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 @@ -20,7 +20,7 @@ var backtrackLexer = false var debugGrammar = false var generateDebugData = false var generateStub = false -var emfRuntimeVersion = "2.20" +var emfRuntimeVersion = "2.29" CompositeGeneratorFragment2 { fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject { diff --git a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/enumrules/enums.genmodel b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/enumrules/enums.genmodel index 8194ea2546..e155b567c0 100644 --- a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/enumrules/enums.genmodel +++ b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/enumrules/enums.genmodel @@ -3,7 +3,7 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen" modelPluginID="org.eclipse.xtext.tests" modelName="Enums" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="8.0" copyrightFields="false"> + complianceLevel="11.0" copyrightFields="false"> enums.ecore diff --git a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel index 51e96eda78..11ec13ec67 100644 --- a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel +++ b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel @@ -3,7 +3,7 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.tests/emf-gen" modelPluginID="org.eclipse.xtext.tests" modelName="Ametamodel" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="8.0" copyrightFields="false"> + complianceLevel="11.0" copyrightFields="false"> ametamodel.ecore diff --git a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF index e81eee3aa8..bcbbd6ea45 100644 --- a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF @@ -57,11 +57,11 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport, org.eclipse.xtend;bundle-version="2.2.0";visibility:=reexport, org.eclipse.xpand;bundle-version="2.2.0";visibility:=reexport, org.eclipse.xtend.typesystem.emf;bundle-version="2.2.0";visibility:=reexport, - org.eclipse.emf.codegen.ecore;bundle-version="2.20.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext;resolution:=optional;x-installation:=greedy, de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="2.20.0", - org.eclipse.emf.common;bundle-version="2.17.0", + org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.common;bundle-version="2.24.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.mwe2.lib;bundle-version="2.9.1";resolution:=optional;visibility:=reexport, org.eclipse.xtext.xbase.lib;resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.generator/src-gen/org/eclipse/xtext/generator/parser/antlr/debug/SimpleAntlr.genmodel b/org.eclipse.xtext.generator/src-gen/org/eclipse/xtext/generator/parser/antlr/debug/SimpleAntlr.genmodel index 09e1bae555..8371aaddb2 100644 --- a/org.eclipse.xtext.generator/src-gen/org/eclipse/xtext/generator/parser/antlr/debug/SimpleAntlr.genmodel +++ b/org.eclipse.xtext.generator/src-gen/org/eclipse/xtext/generator/parser/antlr/debug/SimpleAntlr.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.generator/src-gen" editDirectory="/org.eclipse.xtext.generator.edit/src" editorDirectory="/org.eclipse.xtext.generator.editor/src" modelPluginID="org.eclipse.xtext.generator" forceOverwrite="true" modelName="SimpleAntlr" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" editPluginID="org.eclipse.xtext.generator.edit" - editorPluginID="org.eclipse.xtext.generator.editor" runtimeVersion="2.20"> + complianceLevel="11.0" copyrightFields="false" editPluginID="org.eclipse.xtext.generator.edit" + editorPluginID="org.eclipse.xtext.generator.editor" runtimeVersion="2.29"> diff --git a/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/ecore/EMFGeneratorFragment.java b/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/ecore/EMFGeneratorFragment.java index 69c3d35505..15af4d04f7 100644 --- a/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/ecore/EMFGeneratorFragment.java +++ b/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/ecore/EMFGeneratorFragment.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013, 2016 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2013, 2022 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -141,12 +141,12 @@ public class EMFGeneratorFragment extends AbstractGeneratorFragment { private boolean longFileNames = false; - /* Default to 2.20 if available, otherwise #get will return null */ - private GenRuntimeVersion emfRuntimeVerison = GenRuntimeVersion.get(GenRuntimeVersion.EMF220_VALUE); + /* Default to 2.29 if available, otherwise #get will return null */ + private GenRuntimeVersion emfRuntimeVerison = GenRuntimeVersion.get(GenRuntimeVersion.EMF229_VALUE); private boolean suppressLoadInitialization = false; - private GenJDKLevel jdkLevel = GenJDKLevel.JDK80_LITERAL; + private GenJDKLevel jdkLevel = GenJDKLevel.JDK110_LITERAL; private boolean bindEPackageAndEFactory = false; @@ -824,7 +824,7 @@ public void setBasePackage(String basePackage) { /** * Sets the target EMF runtime version to generate for to the specified value. - * Default is 2.20 + * Default is 2.29 * * @param emfRuntimeVersion the EMF runtime version. * @since 2.3 @@ -1012,8 +1012,10 @@ public boolean isSuppressLoadInitialization() { *
  • "JDK60"
    • *
  • "JDK70"
    • *
  • "JDK80"
    • + *
  • "JDK110"
    • + *
  • "JDK170"
    • * - * The default level is "JDK80". + * The default level is "JDK110". * * @since 2.8 */ diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index 07edd72220..4421510a01 100644 --- a/org.eclipse.xtext.java/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.java/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.common.types, org.eclipse.xtend.lib, org.eclipse.jdt.core;bundle-version="3.13.102", - org.eclipse.emf.common;bundle-version="2.17.0", - org.eclipse.emf.ecore;bundle-version="2.20.0" + org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.ecore;bundle-version="2.26.0" Export-Package: org.eclipse.xtext.java, org.eclipse.xtext.java.resource Import-Package: org.apache.log4j;version="1.2.19" diff --git a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel index d6d69b40cf..cdc3af213a 100644 --- a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel +++ b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.purexbase/src-gen" modelPluginID="org.eclipse.xtext.purexbase" forceOverwrite="true" modelName="PureXbase" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> + complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF index 362d241f3e..3b3c515ec1 100644 --- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport, org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional, org.eclipse.xtext.util, - org.eclipse.emf.ecore;bundle-version="2.20.0", - org.eclipse.emf.common;bundle-version="2.17.0", + org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.common;bundle-version="2.24.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types, org.eclipse.xtext.xbase.lib;bundle-version="2.30.0", diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel index 54ac4cc240..62288fe746 100644 --- a/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel +++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/Bug462047Lang.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages" forceOverwrite="true" modelName="Bug462047Lang" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel index 60977dc273..d9cddeedeb 100644 --- a/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel +++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/ContentAssistFragmentTestLang.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages" forceOverwrite="true" modelName="ContentAssistFragmentTestLang" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase"> diff --git a/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel b/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel index 0c3df42a0b..c10e2fb983 100644 --- a/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel +++ b/org.eclipse.xtext.xbase.testlanguages/model/generated/XImportSectionTestLang.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2022 itemis AG (http://www.itemis.eu) and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0" modelDirectory="/org.eclipse.xtext.xbase.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.xbase.testlanguages" forceOverwrite="true" modelName="XImportSectionTestLang" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" + copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index 9926d2fe95..ec538c7f8a 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext.xbase, org.eclipse.xtext.common.types, org.eclipse.xtext.xbase.lib;bundle-version="2.30.0", org.eclipse.xtext.common.types.tests, - org.eclipse.emf.codegen.ecore;bundle-version="2.20.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", org.hamcrest.core;bundle-version="1.3.0", org.eclipse.xtext.builder, org.eclipse.xtext.xbase.testlanguages, diff --git a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF index b46e2d6633..e1abe3525c 100644 --- a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.common.types;visibility:=reexport, org.eclipse.xtext.util, - org.eclipse.emf.ecore;bundle-version="2.20.0", - org.eclipse.emf.common;bundle-version="2.17.0", + org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.common;bundle-version="2.24.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase.lib;bundle-version="2.30.0", org.eclipse.xtend.lib;bundle-version="2.14.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xbase/model/Xbase.genmodel b/org.eclipse.xtext.xbase/model/Xbase.genmodel index 8acb711906..fde711f01b 100644 --- a/org.eclipse.xtext.xbase/model/Xbase.genmodel +++ b/org.eclipse.xtext.xbase/model/Xbase.genmodel @@ -4,9 +4,9 @@ modelDirectory="/org.eclipse.xtext.xbase/emf-gen" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.xtext.xbase" forceOverwrite="true" modelName="Xbase" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" + importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false" editPluginID="org.eclipse.xtext.xbase.edit" editorPluginID="org.eclipse.xtext.xbase.edit" - runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> XAnnotations.ecore Xtype.ecore Xbase.ecore diff --git a/releng/releng-target/xtext-extras.target.target b/releng/releng-target/xtext-extras.target.target index e265c37fb2..3b3b1d2aea 100644 --- a/releng/releng-target/xtext-extras.target.target +++ b/releng/releng-target/xtext-extras.target.target @@ -13,7 +13,7 @@ - +