diff --git a/NOTICE.md b/NOTICE.md index c46734d2aae..62cf9582747 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -48,7 +48,7 @@ Apache Commons Lang (2.4) * License: Apache License, 2.0 -Apache Log4j / Reload4j (1.2.25) +Apache Log4j / Reload4j (1.2.26) * License: Apache License 2.0 diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 6d8701fc553..b4c744e9efa 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -11,12 +11,12 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xbase.ui;bundle-version="2.38.0", - org.hamcrest.core;bundle-version="1.1.0", + org.hamcrest.core;bundle-version="2.2.0", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.emf.ecore, + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.xtend.lib;bundle-version="2.38.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)", @@ -24,8 +24,8 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext.builder.standalone;bundle-version="2.38.0", org.eclipse.xtext.java;bundle-version="2.38.0" Import-Package: jakarta.inject;version="2.0.1", - org.apache.log4j;version="1.2.24", - org.apache.log4j.spi;version="1.2.24", + org.apache.log4j;version="1.2.26", + org.apache.log4j.spi;version="1.2.26", org.junit;version="4.13.2", org.junit.internal;version="4.13.2", org.junit.internal.builders;version="4.13.2", diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index b397048cc54..e679eef8111 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -60,10 +60,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtend.lib;bundle-version="2.38.0", org.eclipse.xtext.smap;bundle-version="2.38.0", - org.apache.ant;bundle-version="1.7.1";resolution:=optional;x-installation:=greedy, + org.apache.ant;bundle-version="1.10.14";resolution:=optional;x-installation:=greedy, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.xtext.xbase.testing;bundle-version="2.38.0";resolution:=optional Bundle-ActivationPolicy: lazy -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtend.core Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtend.core/model/RichStrings.genmodel b/org.eclipse.xtend.core/model/RichStrings.genmodel index e1bb8492ef1..aa11c15cbb9 100644 --- a/org.eclipse.xtend.core/model/RichStrings.genmodel +++ b/org.eclipse.xtend.core/model/RichStrings.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 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.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core" modelName="RichStrings" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false" - runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> + importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false" + runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> RichStrings.ecore diff --git a/org.eclipse.xtend.core/model/Xtend.genmodel b/org.eclipse.xtend.core/model/Xtend.genmodel index 799057d0f74..f80ec840ab5 100644 --- a/org.eclipse.xtend.core/model/Xtend.genmodel +++ b/org.eclipse.xtend.core/model/Xtend.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 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.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core" modelName="Xtend" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false" - runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> + importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false" + runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype"> Xtend.ecore diff --git a/org.eclipse.xtend.doc/META-INF/MANIFEST.MF b/org.eclipse.xtend.doc/META-INF/MANIFEST.MF index 0992b721e2c..4c18d620688 100644 --- a/org.eclipse.xtend.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtend.doc;singleton:=true Bundle-Version: 2.38.0.qualifier Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.help;bundle-version="3.9.100" +Require-Bundle: org.eclipse.help;bundle-version="3.10.300" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF index 071a1c1dd93..9e923864db5 100644 --- a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtend.examples;singleton:=true Bundle-Version: 2.38.0.qualifier -Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", +Require-Bundle: org.eclipse.ui;bundle-version="3.205.100", org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.emf.common.ui;bundle-version="2.20.0" + org.eclipse.emf.common.ui;bundle-version="2.22.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF index 853093bb75c..4e7169fab1d 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Export-Package: extract, observables Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: xtend-annotation-examples -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF index 4088862b04b..a454016bfa8 100644 --- a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.38.0 org.eclipse.xtend.ide.common.highlighting;version="2.38.0";x-friends:="org.eclipse.xtend.ide, org.eclipse.xtend.ide.tests", org.eclipse.xtend.ide.common.outline;version="2.38.0";x-friends:="org.eclipse.xtend.ide" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtend.ide.common Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF index 0221d120778..3f1b256fa69 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtend.ide.swtbot.tests Bundle-Version: 2.38.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.log4j;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", org.junit;version="4.13.2", org.junit.rules;version="4.13.2", org.junit.runner;version="4.13.2", @@ -13,13 +13,13 @@ Import-Package: org.apache.log4j;version="1.2.24", org.junit.runners;version="4.13.2", org.slf4j;resolution:=optional Export-Package: org.eclipse.xtend.ide.tests;version="2.38.0";x-friends:="org.eclipse.xtend.performance.tests" -Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.6.0", - org.eclipse.swtbot.eclipse.finder;bundle-version="2.6.0", - org.eclipse.swtbot.junit4_x;bundle-version="2.6.0", - org.eclipse.swtbot.swt.finder;bundle-version="2.6.0", +Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="4.1.0", + org.eclipse.swtbot.eclipse.finder;bundle-version="4.1.0", + org.eclipse.swtbot.junit4_x;bundle-version="4.1.0", + org.eclipse.swtbot.swt.finder;bundle-version="4.1.0", org.eclipse.xtend.ide;bundle-version="2.38.0", - org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.jdt.ui;bundle-version="3.26.0", + org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.jdt.ui;bundle-version="3.32.0", org.eclipse.xtext.ui;bundle-version="2.38.0", org.hamcrest.library;bundle-version="1.3.0", org.eclipse.xtend.core;bundle-version="2.38.0", diff --git a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF index bda33ca85f7..da9c49a0921 100644 --- a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF @@ -8,22 +8,22 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", - org.eclipse.ui.workbench;bundle-version="3.125.0", + org.eclipse.ui.workbench;bundle-version="3.131.100", org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.pde.core;bundle-version="3.15.100", + org.eclipse.pde.core;bundle-version="3.18.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", - org.apache.ant;bundle-version="1.10.1", + org.apache.ant;bundle-version="1.10.14", org.eclipse.xtend.ide;bundle-version="2.38.0", - org.eclipse.ui.ide;bundle-version="3.13.1", + org.eclipse.ui.ide;bundle-version="3.22.100", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.xbase.ui;bundle-version="2.38.0", org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.jdt.ui;bundle-version="3.26.0", + org.eclipse.jdt.ui;bundle-version="3.32.0", org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.xtext.builder;bundle-version="2.38.0", - org.eclipse.search;bundle-version="3.14.100", - org.eclipse.jdt.core.manipulation;bundle-version="1.16.0", + org.eclipse.search;bundle-version="3.16.100", + org.eclipse.jdt.core.manipulation;bundle-version="1.21.0", org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.xtend.lib;bundle-version="2.38.0", org.eclipse.xtend.ide.tests.data;bundle-version="2.38.0", @@ -36,8 +36,8 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext.ui.testing;bundle-version="2.38.0", org.eclipse.xtext.xbase.testing;bundle-version="2.38.0", org.objectweb.asm -Import-Package: org.apache.log4j;version="1.2.24", - org.apache.log4j.spi;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", + org.apache.log4j.spi;version="1.2.26", org.junit;version="4.13.2", org.junit.rules;version="4.13.2", org.junit.runner;version="4.13.2", diff --git a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF index f7925b39cc0..476121e6902 100644 --- a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF @@ -14,23 +14,23 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext.common.types.ui;bundle-version="2.38.0", org.eclipse.xtext.xbase.ui;bundle-version="2.38.0", org.eclipse.xtend.ide.common;bundle-version="2.38.0";visibility:=reexport, - org.eclipse.ui;bundle-version="3.201.0", + org.eclipse.ui;bundle-version="3.205.100", org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.ui.ide;bundle-version="3.13.1", - org.eclipse.ui.console;bundle-version="3.11.100", + org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.console;bundle-version="3.14.0", org.eclipse.core.filesystem;bundle-version="1.10.300", - org.eclipse.jdt.ui;bundle-version="3.26.0", - org.eclipse.compare;bundle-version="3.8.300", + org.eclipse.jdt.ui;bundle-version="3.32.0", + org.eclipse.compare;bundle-version="3.10.0", org.eclipse.jdt.launching;bundle-version="3.21.100", - org.eclipse.ltk.ui.refactoring;bundle-version="3.12.0";resolution:=optional, + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300";resolution:=optional, org.eclipse.jdt.debug.ui;bundle-version="3.13.300", - org.eclipse.ui.editors;bundle-version="3.14.300", + org.eclipse.ui.editors;bundle-version="3.17.200", org.eclipse.xtend.lib;bundle-version="2.38.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", - org.eclipse.jdt.core.manipulation;bundle-version="1.16.0";resolution:=optional, - org.eclipse.e4.core.services, - org.eclipse.e4.ui.css.swt.theme;bundle-version="0.13.0" -Import-Package: org.apache.log4j;version="1.2.24", + org.eclipse.jdt.core.manipulation;bundle-version="1.21.0";resolution:=optional, + org.eclipse.e4.core.services;bundle-version="2.4.300", + org.eclipse.e4.ui.css.swt.theme;bundle-version="0.14.300" +Import-Package: org.apache.log4j;version="1.2.26", org.osgi.service.event;version="[1.4.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.xtend.ide.XtendActivator diff --git a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF index 9991bb38adb..db51343ac3b 100644 --- a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.xtend.m2e;singleton:=true Bundle-Version: 2.38.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.8.3,3.0.0)";resolution:=optional, +Require-Bundle: org.eclipse.m2e.core;bundle-version="2.6.0";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.38.0", org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.xtend.core;bundle-version="2.38.0", - org.eclipse.m2e.maven.runtime;bundle-version="[1.8.3,4.0.0)";resolution:=optional + org.eclipse.m2e.maven.runtime;bundle-version="3.9.600";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.m2e;version="2.38.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index 7aec9eadda7..e648e9734cf 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtend.ide.tests;bundle-version="2.38.0", org.junit, org.eclipse.emf.mwe.utils;bundle-version="1.15.0", - org.eclipse.ui.editors;bundle-version="3.14.300", + org.eclipse.ui.editors;bundle-version="3.17.200", org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.38.0", @@ -25,5 +25,5 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtend.core;bundle-version="2.38.0", org.eclipse.xtext.testing;bundle-version="2.38.0", org.eclipse.xtext.java;bundle-version="2.38.0", - org.eclipse.ui.ide;bundle-version="3.13.1" + org.eclipse.ui.ide;bundle-version="3.22.100" Automatic-Module-Name: org.eclipse.xtend.performance.tests diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index 7e678baa756..d22e9b139cf 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0";visibility:=reexp com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.37.0";visibility:=reexport, org.eclipse.emf.codegen;bundle-version="2.23.0";visibility:=reexport -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF index ee3525fe3e3..f5f87b0092b 100644 --- a/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.builder.standalone;bundle-version="2.38.0", org.eclipse.xtext.testing;bundle-version="2.38.0", - org.eclipse.emf.ecore, - org.eclipse.emf.common, + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xbase.testlanguages;bundle-version="2.38.0", 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 daa66aa93d8..3049030b088 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="11.0" copyrightFields="false" runtimeVersion="2.29"> + complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36"> 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 931ed4795b3..bb6af6e66d5 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.29" - jdkLevel = "JDK110" + emfRuntimeVersion = "2.36" + jdkLevel = "JDK170" } fragment = grammarAccess.GrammarAccessFragment2 {} fragment = resourceFactory.ResourceFactoryFragment2 {} diff --git a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF index 491a2ca4893..a4943b90f58 100644 --- a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF @@ -7,15 +7,15 @@ Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.common.types;bundle-version="2.38.0", org.eclipse.xtend.lib;bundle-version="2.38.0", org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, - org.eclipse.emf.ecore, - org.eclipse.core.runtime, - org.eclipse.equinox.common + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.equinox.common;bundle-version="3.19.0" Export-Package: org.eclipse.xtext.builder.standalone;version="2.38.0";x-friends:="org.eclipse.xtext.builder.standalone.tests,org.eclipse.xtext.builder.tests", org.eclipse.xtext.builder.standalone.compiler;version="2.38.0";x-friends:="org.eclipse.xtext.builder.standalone.tests,org.eclipse.xtext.builder.tests", org.eclipse.xtext.builder.standalone.incremental;version="2.38.0";x-friends:="org.eclipse.xtext.builder.tests,org.eclipse.xtext.builder.standalone.tests" diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF index 6f7d49b3202..32baccc367c 100644 --- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF @@ -10,18 +10,18 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.ui.editors;bundle-version="3.14.300", - org.eclipse.ui;bundle-version="3.201.0", + org.eclipse.ui.editors;bundle-version="3.17.200", + org.eclipse.ui;bundle-version="3.205.100", org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, org.eclipse.xtext.ui.shared;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ecore;bundle-version="2.38.0", - org.eclipse.ui.ide;bundle-version="3.13.1", + org.eclipse.ui.ide;bundle-version="3.22.100", org.eclipse.xtext.builder.standalone;bundle-version="2.38.0", org.eclipse.xtext.common.types;bundle-version="2.38.0", org.eclipse.xtend.lib;bundle-version="2.38.0", org.eclipse.xtext.common.types.shared;bundle-version="2.38.0", - org.eclipse.pde.ui;bundle-version="3.13.400", + org.eclipse.pde.ui;bundle-version="3.15.100", org.eclipse.xtext.xtext.ui;bundle-version="2.38.0", org.eclipse.xtext.ui.ecore;bundle-version="2.38.0", org.eclipse.xtext.testlanguages;bundle-version="2.38.0", @@ -31,9 +31,9 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.ui.testing;bundle-version="2.38.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.38.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", - org.eclipse.compare;bundle-version="3.8.300", + org.eclipse.compare;bundle-version="3.10.0", org.eclipse.xtext.common.types.eclipse.tests;bundle-version="2.38.0" -Import-Package: org.apache.log4j;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", org.eclipse.xtext.tests;version="2.38.0", org.hamcrest.core;version="1.1.0", org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel b/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel index aee26b3fc2d..cd2cc01c13c 100644 --- a/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel +++ b/org.eclipse.xtext.builder.tests/model/generated/BuilderTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 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.builder.tests/src-gen" modelPluginID="org.eclipse.xtext.builder.tests" forceOverwrite="true" modelName="BuilderTestLanguage" updateClasspath="false" - rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="11.0" - copyrightFields="false" runtimeVersion="2.29"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36"> diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index b385280cde8..c8d4ffa814e 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -50,21 +50,21 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.core.resources;bundle-version="3.20.100";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jface;bundle-version="3.25.0";resolution:=optional;x-installation:=greedy, - org.eclipse.ui;bundle-version="3.201.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jface;bundle-version="3.33.0";resolution:=optional;x-installation:=greedy, + org.eclipse.ui;bundle-version="3.205.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.38.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.forms;bundle-version="3.11.300";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.forms;bundle-version="3.13.200";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.38.0";visibility:=reexport, - org.eclipse.emf.ecore.editor;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.ecore.editor;bundle-version="2.18.0";resolution:=optional;x-installation:=greedy, org.eclipse.debug.core;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.ui;bundle-version="3.16.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.debug.ui;bundle-version="3.18.300";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.jdt.debug;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.console;bundle-version="3.11.100", + org.eclipse.ui.console;bundle-version="3.14.0", org.eclipse.xtext.smap;bundle-version="2.38.0" Bundle-ActivationPolicy: lazy -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Bundle-Activator: org.eclipse.xtext.builder.internal.Activator Automatic-Module-Name: org.eclipse.xtext.builder diff --git a/org.eclipse.xtext.builder/model/BuilderState.genmodel b/org.eclipse.xtext.builder/model/BuilderState.genmodel index 44564a08352..d4a0daed437 100644 --- a/org.eclipse.xtext.builder/model/BuilderState.genmodel +++ b/org.eclipse.xtext.builder/model/BuilderState.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.builder/emf-gen" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.xtext.builder" modelName="BuilderState" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container" testsDirectory="" - importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false" - runtimeVersion="2.29"> + importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false" + runtimeVersion="2.36"> BuilderState.ecore diff --git a/org.eclipse.xtext.builder/model/Trace.genmodel b/org.eclipse.xtext.builder/model/Trace.genmodel index f64d6c04118..077621c7232 100644 --- a/org.eclipse.xtext.builder/model/Trace.genmodel +++ b/org.eclipse.xtext.builder/model/Trace.genmodel @@ -2,8 +2,8 @@ + importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false" + runtimeVersion="2.36"> Trace.ecore diff --git a/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF b/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF index f2073cf9c2c..1f5054e1661 100644 --- a/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Export-Package: org.eclipse.xtext.buildship;version="2.38.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.buildship Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.38.0", org.eclipse.xtext.builder;bundle-version="2.38.0", - org.eclipse.buildship.core;bundle-version="3.0.0";resolution:=optional, + org.eclipse.buildship.core;bundle-version="3.1.9";resolution:=optional, org.eclipse.xtext.ui.shared;bundle-version="2.38.0" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF index a07bfeb4d90..eb031162204 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF @@ -18,20 +18,20 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.38.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.38.0", org.eclipse.xtext.ui.shared;bundle-version="2.38.0", - org.eclipse.ui.editors;bundle-version="3.14.300", - org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.jdt.ui;bundle-version="3.26.0", + org.eclipse.ui.editors;bundle-version="3.17.200", + org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.jdt.ui;bundle-version="3.32.0", org.eclipse.xtext.builder;bundle-version="2.38.0", - org.hamcrest.core;bundle-version="1.1.0", - org.eclipse.ui.ide;bundle-version="3.13.1", + org.hamcrest.core;bundle-version="2.2.0", + org.eclipse.ui.ide;bundle-version="3.22.100", org.eclipse.xtext.common.types.shared;bundle-version="2.38.0", org.eclipse.xtext.ui.testing;bundle-version="2.38.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.38.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, - org.eclipse.compare, + org.eclipse.compare;bundle-version="3.10.0", org.eclipse.xtext.xbase.testing;bundle-version="2.38.0", - org.eclipse.ui.workbench;resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.38.0" Export-Package: org.eclipse.xtext.common.types.access;version="2.38.0", diff --git a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel index 86d325b4cd1..b0d9cb72ffe 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel +++ b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/ContentAssistTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 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.eclipse.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.eclipse.tests" forceOverwrite="true" modelName="ContentAssistTestLanguage" updateClasspath="false" - 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"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> diff --git a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel index 846ba0c11fa..44a6d36e1cc 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel +++ b/org.eclipse.xtext.common.types.eclipse.tests/model/generated/RefactoringTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2024 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.eclipse.tests/src-gen" modelPluginID="org.eclipse.xtext.common.types.eclipse.tests" forceOverwrite="true" modelName="RefactoringTestLanguage" updateClasspath="false" - 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"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> diff --git a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF index 11212f48044..d57b7f7b058 100644 --- a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types.provider;version="2.38.0" Bundle-Activator: org.eclipse.xtext.common.types.provider.TypesEditPlugin$Implementation Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.38.0", - org.eclipse.emf.edit;bundle-version="2.16.0", + org.eclipse.emf.edit;bundle-version="2.21.0", org.eclipse.core.runtime;bundle-version="3.31.0" Automatic-Module-Name: org.eclipse.xtext.common.types.edit diff --git a/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF index 23f61492b6c..5d4e4c892e2 100644 --- a/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Localization: fragment Fragment-Host: org.eclipse.xtext.common.types.shared Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase.ui;bundle-version="2.38.0", - org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional + org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional Bundle-Vendor: %providerName -Import-Package: org.apache.log4j;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", org.eclipse.ui.ide Export-Package: org.eclipse.xtext.common.types.shared.jdt38;version="2.38.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.common.types.shared.jdt38 diff --git a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF index 2f0a69ec760..9bb37dfbbd4 100644 --- a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.debug.core;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.ui;bundle-version="3.16.0";resolution:=optional;x-installation:=greedy, + org.eclipse.debug.ui;bundle-version="3.18.300";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.debug;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy 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 eb8b97a0d57..4bfa178a61f 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, 2024 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="11.0" - copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" 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 64e521ab010..5c1a82b7e45 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, 2024 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="11.0" - copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" 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 a3fa9e9a1f3..402a3241c93 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.29" + emfRuntimeVersion = "2.36" } fragment = grammarAccess.GrammarAccessFragment2 {} fragment = resourceFactory.ResourceFactoryFragment2 {} diff --git a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF index e32a6efd30b..dcd6135e409 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -5,21 +5,21 @@ Bundle-Vendor: %providerName Bundle-Version: 2.38.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.common.types.ui Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.38.0";visibility:=reexport, - org.eclipse.ui;bundle-version="3.201.0", + org.eclipse.ui;bundle-version="3.205.100", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.jdt.ui;bundle-version="3.26.0", - org.eclipse.search;bundle-version="3.14.100", - org.eclipse.ltk.ui.refactoring;bundle-version="3.12.0", - org.eclipse.jdt.core.manipulation;bundle-version="1.16.0", + org.eclipse.jdt.ui;bundle-version="3.32.0", + org.eclipse.search;bundle-version="3.16.100", + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300", + org.eclipse.jdt.core.manipulation;bundle-version="1.21.0", org.eclipse.xtext.smap;bundle-version="2.38.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.edit;bundle-version="2.38.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional -Import-Package: org.apache.log4j;version="1.2.24" + org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional +Import-Package: org.apache.log4j;version="1.2.26" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types.access.jdt;version="2.38.0", org.eclipse.xtext.common.types.ui;version="2.38.0", diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index f845d6b0b1f..d881bf537be 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtend.lib;bundle-version="2.38.0" Import-Package: io.github.classgraph;version="[4.8.176,4.9.0)", org.apache.commons.logging;version="1.0.4";resolution:=optional, - org.apache.log4j;version="1.2.24" + org.apache.log4j;version="1.2.26" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types;version="2.38.0", org.eclipse.xtext.common.types.access;version="2.38.0"; diff --git a/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel b/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel index 107415dd89b..4554f35b8a7 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="11.0" suppressGenModelAnnotations="false" + importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" suppressGenModelAnnotations="false" copyrightFields="false" editPluginID="org.eclipse.xtext.common.types.edit" editorPluginID="org.eclipse.xtext.types.editor" - runtimeVersion="2.29" interfaceNamePattern="" classNamePattern=""> + runtimeVersion="2.36" interfaceNamePattern="" classNamePattern=""> JavaVMTypes.ecore diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 176d2a048d1..717cef202ec 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -203,7 +203,7 @@ ch.qos.reload4j reload4j - 1.2.25 + 1.2.26 org.antlr diff --git a/org.eclipse.xtext.doc/META-INF/MANIFEST.MF b/org.eclipse.xtext.doc/META-INF/MANIFEST.MF index 5915c446bf3..a161f0e3602 100644 --- a/org.eclipse.xtext.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.doc;singleton:=true Bundle-Version: 2.38.0.qualifier Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.help;bundle-version="3.9.100" +Require-Bundle: org.eclipse.help;bundle-version="3.10.300" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index abce01748d1..dcc58756e09 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -13,15 +13,15 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.ecore;bundle-version="2.38.0", org.eclipse.xtext.testlanguages;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.hamcrest.core;bundle-version="1.1.0", + org.hamcrest.core;bundle-version="2.2.0", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.lib;bundle-version="2.38.0", - org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.38.0" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Import-Package: org.apache.log4j;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", org.junit;version="4.13.2", org.junit.rules;version="4.13.2", org.junit.runner;version="4.13.2", diff --git a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF index d15d7c52245..4df22d2c7cb 100644 --- a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Export-Package: org.eclipse.xtext.ecore;version="2.38.0"; org.eclipse.xtext.naming, org.eclipse.xtext.util, org.eclipse.xtext" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtext.ecore Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index 165368238ff..91cf0e4150e 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -26,8 +26,8 @@ Export-Package: org.eclipse.xtext.enumrules;version="2.38.0", org.eclipse.xtext.generator.grammarAccess.services;version="2.38.0", org.eclipse.xtext.metamodelreferencing.tests;version="2.38.0" Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.emf.common, - org.eclipse.emf.ecore, + org.eclipse.emf.common;bundle-version="2.30.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.common.types;bundle-version="2.38.0", 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 9daac3ad412..227a3bf4b7b 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, 2024 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="11.0" - copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" 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 5bdadad0f4a..b21c4032aff 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, 2024 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="11.0" - copyrightFields="false" runtimeVersion="2.29" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" 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 7d63172e883..a1f074d2edc 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, 2024 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="11.0" - copyrightFields="false" runtimeVersion="2.29"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36"> 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 3fe6c8a710a..fe8d466f5fc 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.29" +var emfRuntimeVersion = "2.36" 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 e155b567c0f..94bc9655f68 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="11.0" copyrightFields="false"> + complianceLevel="17.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 11ec13ec676..2e2cc27744f 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="11.0" copyrightFields="false"> + complianceLevel="17.0" copyrightFields="false"> ametamodel.ecore diff --git a/org.eclipse.xtext.full.releng/pom.xml b/org.eclipse.xtext.full.releng/pom.xml index bb858714b42..bacbfa29984 100644 --- a/org.eclipse.xtext.full.releng/pom.xml +++ b/org.eclipse.xtext.full.releng/pom.xml @@ -15,6 +15,7 @@ .. ../org.eclipse.xtext.nodeploy.parent ../org.eclipse.xtext.dev-bom + ../org.eclipse.xtext.relengutil ../org.eclipse.xtext.xbase.lib ../org.eclipse.xtext.xbase.lib.gwt ../org.eclipse.xtend.lib.macro diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index c7e3588ea43..0c999c57bb2 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport, org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", org.aopalliance;bundle-version="1.0.0", com.google.gson;bundle-version="2.10.1" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtext.ide.tests diff --git a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel index f9a96496965..f355d4a4d84 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="IndentationAwareUiTestLanguage" updateClasspath="false" - 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"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel index f7111a25273..ca335d79bb9 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="PartialContentAssistTestLanguage" updateClasspath="false" - 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"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel index ddc659914b3..1c3c86783f2 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel @@ -3,8 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="PartialSerializationTestLanguage" updateClasspath="false" - 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 ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient"> + rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="17.0" + copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel index 341a5277251..365b1963728 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="RenameTestLanguage" updateClasspath="false" 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"> + complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel index 86cd46d7229..3bc8da80611 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="TestLanguage" updateClasspath="false" 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"> + complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel index e4d044bb8ce..288c1f91407 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2019 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.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="WithTransient" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29"> + complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36"> WithTransient.ecore diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 00b8eece7b1..1bd86306c85 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport, org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional, org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional, - org.eclipse.emf.ecore.change;bundle-version="[2.16.0,3)" -Import-Package: org.apache.log4j;version="1.2.24" + org.eclipse.emf.ecore.change;bundle-version="2.16.0" +Import-Package: org.apache.log4j;version="1.2.26" Export-Package: org.eclipse.xtext.ide;version="2.38.0"; x-friends:="org.eclipse.xtend.ide, org.eclipse.xtext.ui, diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index afaf4f4cc20..05e121a26f4 100644 --- a/org.eclipse.xtext.java/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.java/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.jdt.facade;bundle-version="2.38.0" Export-Package: org.eclipse.xtext.java;version="2.38.0", org.eclipse.xtext.java.resource;version="2.38.0" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtext.java Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF index c5d50d5155b..3d6e7106fec 100644 --- a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.37.0" Export-Package: org.eclipse.xtext.jdt.facade;version="2.38.0";x-friends:="org.eclipse.xtext.java" -Import-Package: org.apache.log4j;version="1.2.24" +Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtext.jdt.facade Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 177c3bbec67..eed3941f996 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.testing;bundle-version="2.38.0", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.lib;bundle-version="2.38.0", - org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xtext.generator;bundle-version="2.38.0", org.eclipse.emf.mwe.core;bundle-version="1.15.0", @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Import-Package: org.apache.commons.logging;version="1.2.0", - org.apache.log4j;version="1.2.24", + org.apache.log4j;version="1.2.26", org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)", org.junit.jupiter.api.function;version="[5.1.0,6.0.0)", diff --git a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF index 6f8e1fe782c..63b4a752ad4 100644 --- a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.xtext.m2e;singleton:=true Bundle-Version: 2.38.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.8.0,3.0.0)";resolution:=optional, +Require-Bundle: org.eclipse.m2e.core;bundle-version="2.6.0";resolution:=optional, org.eclipse.xtend.lib;bundle-version="2.38.0", org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.core;resolution:=optional + org.eclipse.m2e.maven.runtime;bundle-version="3.9.600";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.m2e;version="2.38.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml index a13ae2679a6..facbc50a38c 100644 --- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml +++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml @@ -18,18 +18,18 @@ 3.12.300 3.18.200 3.26.100 - 2.24.0 - 2.26.0 - 2.17.0 - 2.26.0 - 2.16.0 - 2.22.0 - 2.29.0 + 2.30.0 + 2.36.0 + 2.21.0 + 2.36.0 + 2.37.0 + 2.23.0 + 2.37.0 1.20.0 1.6.0 1.6.0 - 3.33.0 - 3.18.300 + 3.37.0 + 3.19.0 diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 69c1459f423..cb6a43640ea 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -20,8 +20,8 @@ - - + + diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF index 172b4d80b63..c4cf8147439 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.38.0", org.eclipse.xtext.purexbase.ui;bundle-version="2.38.0", org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext;bundle-version="2.38.0", - org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.38.0", org.eclipse.jdt.core;bundle-version="3.37.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.38.0", org.eclipse.xtext.ui.testing;bundle-version="2.38.0", org.eclipse.xtext.xbase.ui.testing;bundle-version="2.38.0" Import-Package: org.apache.commons.logging, - org.apache.log4j;version="1.2.24", + org.apache.log4j;version="1.2.26", org.hamcrest.core;version="1.1.0", org.junit;version="4.13.2", org.junit.runner;version="4.13.2", diff --git a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF index 4aad01a6a9b..2a8fd7c1ba4 100644 --- a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.38.0", org.eclipse.xtext.xbase.testing;bundle-version="2.38.0", org.junit;bundle-version="4.13.2" Import-Package: org.apache.commons.logging, - org.apache.log4j;version="1.2.24" + org.apache.log4j;version="1.2.26" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.tests;version="2.38.0";x-internal=true, org.eclipse.xtext.purexbase.tests.data;version="2.38.0" diff --git a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF index 9c835c3195c..8a265e7672f 100644 --- a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF @@ -8,21 +8,21 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.38.0";visibility:=reexport, org.eclipse.xtext.purexbase.ide;bundle-version="2.38.0";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.38.0", - org.eclipse.ui.editors;bundle-version="3.14.300", - org.eclipse.ui.ide;bundle-version="3.13.1", + org.eclipse.ui.editors;bundle-version="3.17.200", + org.eclipse.ui.ide;bundle-version="3.22.100", org.eclipse.xtext.ui.shared;bundle-version="2.38.0", - org.eclipse.ui;bundle-version="3.201.0", + org.eclipse.ui;bundle-version="3.205.100", org.eclipse.xtext.builder;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types.ui;bundle-version="2.38.0", org.eclipse.xtext.xbase.ui;bundle-version="2.38.0", org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.38.0", - org.eclipse.compare;bundle-version="3.8.300", + org.eclipse.compare;bundle-version="3.10.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.xtend.lib;bundle-version="2.38.0";resolution:=optional -Import-Package: org.apache.log4j;version="1.2.24", +Import-Package: org.apache.log4j;version="1.2.26", org.apache.commons.logging Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.ui;version="2.38.0", diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF index c057f0ff910..8dd61e6795e 100644 --- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF @@ -8,15 +8,15 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.xbase;bundle-version="2.38.0", org.eclipse.equinox.common;bundle-version="3.19.0", - org.eclipse.emf.ecore, + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtend.lib;bundle-version="2.38.0", - org.eclipse.emf.common, + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.common.types;bundle-version="2.38.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional Import-Package: org.apache.commons.logging, - org.apache.log4j;version="1.2.24" + org.apache.log4j;version="1.2.26" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase;version="2.38.0", org.eclipse.xtext.purexbase.jvmmodel;version="2.38.0", diff --git a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel index 24d3570cc6f..6b93e09bb2a 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, 2023 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="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"> + complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" 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.relengutil/.classpath b/org.eclipse.xtext.relengutil/.classpath new file mode 100644 index 00000000000..a197b3cb4e8 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.xtext.relengutil/.project b/org.eclipse.xtext.relengutil/.project new file mode 100644 index 00000000000..a47c57c06a7 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.project @@ -0,0 +1,28 @@ + + + org.eclipse.xtext.relengutil + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.xtext.relengutil/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.relengutil/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..370ae2c6983 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=ISO-8859-1 diff --git a/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..5bf5367f799 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,23 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch, *.xtend +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=ignore +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 00000000000..16e8b1511a0 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..65b769d0071 --- /dev/null +++ b/org.eclipse.xtext.relengutil/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,117 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_serial_version_id=true +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=false +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Xtext +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_'Xtext' +formatter_settings_version=11 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=1 +org.eclipse.jdt.ui.text.custom_code_templates=