From 577376581c704ce421ee19efb6fffb6056518a00 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 10:56:13 +0100 Subject: [PATCH 01/14] minimal tp 2024-03, removed older platforms --- Jenkinsfile | 18 +-- full-build.sh | 2 +- full-deploy.sh | 2 +- .../pom.xml | 153 ------------------ org.eclipse.xtext.xbase.tests/pom.xml | 153 ------------------ releng/toolchains.xml | 10 -- xtext-r202203.target | 88 ---------- xtext-r202206.target | 87 ---------- xtext-r202209.target | 86 ---------- xtext-r202212.target | 84 ---------- xtext-r202303.target | 84 ---------- xtext-r202306.target | 84 ---------- xtext-r202309.target | 84 ---------- xtext-r202312.target | 84 ---------- 14 files changed, 10 insertions(+), 1009 deletions(-) delete mode 100644 xtext-r202203.target delete mode 100644 xtext-r202206.target delete mode 100644 xtext-r202209.target delete mode 100644 xtext-r202212.target delete mode 100644 xtext-r202303.target delete mode 100644 xtext-r202306.target delete mode 100644 xtext-r202309.target delete mode 100644 xtext-r202312.target diff --git a/Jenkinsfile b/Jenkinsfile index 71852127ee0..ce1faf4b31e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,14 +6,14 @@ pipeline { } parameters { - choice(name: 'TARGET_PLATFORM', choices: ['r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'r202306', 'r202309', 'r202312', 'r202403', 'r202406', 'r202409', 'latest'], description: 'Which Target Platform should be used?') + choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'latest'], description: 'Which Target Platform should be used?') // see https://wiki.eclipse.org/Jenkins#JDK - choice(name: 'JDK_VERSION', choices: [ '11', '17', '21' ], description: 'Which JDK version should be used?') + choice(name: 'JDK_VERSION', choices: [ '17', '21' ], description: 'Which JDK version should be used?') } triggers { parameterizedCron(env.BRANCH_NAME == 'main' ? ''' - H H(0-1) * * * %TARGET_PLATFORM=r202203;JDK_VERSION=17 + H H(0-1) * * * %TARGET_PLATFORM=r202403;JDK_VERSION=17 H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21 ''' : '') } @@ -59,7 +59,6 @@ pipeline { environment { MAVEN_OPTS = "-Xmx1500m" // set all Java versions needed by our toolchains.xml - JAVA_HOME_11_X64 = tool(type:'jdk', name:'temurin-jdk11-latest') JAVA_HOME_17_X64 = tool(type:'jdk', name:'temurin-jdk17-latest') JAVA_HOME_21_X64 = tool(type:'jdk', name:'temurin-jdk21-latest') } @@ -67,7 +66,6 @@ pipeline { xvnc(useXauthority: true) { sh """ ./full-build.sh --tp=${selectedTargetPlatform()} \ - ${javaVersion() == 11 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-11' : ''} \ ${javaVersion() == 17 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-17' : ''} \ ${javaVersion() == 21 ? '-Pstrict-jdk-21' : ''} """ @@ -166,7 +164,7 @@ def eclipseVersion() { /** * The target platform is primarily defined by the build parameter TARGET_PLATFORM. - * But when the build is triggered by upstream with at least Java version 11, 'latest' + * But when the build is triggered by upstream with at least Java version 21, 'latest' * is returned. */ def selectedTargetPlatform() { @@ -174,12 +172,12 @@ def selectedTargetPlatform() { def isUpstream = isTriggeredByUpstream() def javaVersion = javaVersion() - if (isTriggeredByUpstream() && javaVersion>=17) { + if (isTriggeredByUpstream() && javaVersion>=21) { println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}") return 'latest' - } else if (isTriggeredByUpstream() && javaVersion>=11) { - println("Choosing 'r202203' target since this build was triggered by upstream with Java ${javaVersion}") - return 'r202203' + } else if (isTriggeredByUpstream() && javaVersion>=17) { + println("Choosing 'r2024-03' target since this build was triggered by upstream with Java ${javaVersion}") + return 'r2024-03' } else { return tp } diff --git a/full-build.sh b/full-build.sh index 6cecb1cfbb6..2ad9aaa15b1 100755 --- a/full-build.sh +++ b/full-build.sh @@ -17,7 +17,7 @@ while [ "$1" != "" ]; do echo -e "\t-h --help" echo -e "\t--no-tests Skip test execution" echo -e "\t--local-repository= Use local Maven repository" - echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202203,r202206,...,latest)" + echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)" echo "" exit ;; diff --git a/full-deploy.sh b/full-deploy.sh index 6fe0a2dfff6..d7b24e40e44 100755 --- a/full-deploy.sh +++ b/full-deploy.sh @@ -17,7 +17,7 @@ while [ "$1" != "" ]; do echo -e "\t-h --help" echo -e "\t--no-tests Skip test execution" echo -e "\t--local-repository= Use local Maven repository" - echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202203,r202206,...,latest)" + echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)" echo "" exit ;; diff --git a/org.eclipse.xtext.builder.standalone.tests/pom.xml b/org.eclipse.xtext.builder.standalone.tests/pom.xml index 8947a2da42a..ae25fea191f 100644 --- a/org.eclipse.xtext.builder.standalone.tests/pom.xml +++ b/org.eclipse.xtext.builder.standalone.tests/pom.xml @@ -12,157 +12,4 @@ Xtext Standalone Builder Tests Builder infrastructure for Xtext Tests. - - - - xtext-202203 - - - target-platform-classifier - xtext-r202203 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202206 - - - target-platform-classifier - xtext-r202206 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202209 - - - target-platform-classifier - xtext-r202209 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202212 - - - target-platform-classifier - xtext-r202212 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - diff --git a/org.eclipse.xtext.xbase.tests/pom.xml b/org.eclipse.xtext.xbase.tests/pom.xml index 0045545554a..ec4a4722ef8 100644 --- a/org.eclipse.xtext.xbase.tests/pom.xml +++ b/org.eclipse.xtext.xbase.tests/pom.xml @@ -10,158 +10,5 @@ eclipse-test-plugin Xtext Xbase Tests - - - - - xtext-202203 - - - target-platform-classifier - xtext-r202203 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202206 - - - target-platform-classifier - xtext-r202206 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202209 - - - target-platform-classifier - xtext-r202209 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - - xtext-202212 - - - target-platform-classifier - xtext-r202212 - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-plugin - org.eclipse.jdt.compiler.apt - 0.0.0 - - - eclipse-plugin - org.eclipse.jdt.compiler.tool - 0.0.0 - - - - - - - - - diff --git a/releng/toolchains.xml b/releng/toolchains.xml index 304a249d4be..f23efad0afc 100644 --- a/releng/toolchains.xml +++ b/releng/toolchains.xml @@ -2,16 +2,6 @@ - - jdk - - JavaSE-11 - 11 - - - ${env.JAVA_HOME_11_X64} - - jdk diff --git a/xtext-r202203.target b/xtext-r202203.target deleted file mode 100644 index 09bb7cf9c14..00000000000 --- a/xtext-r202203.target +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202206.target b/xtext-r202206.target deleted file mode 100644 index ff853edde0a..00000000000 --- a/xtext-r202206.target +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202209.target b/xtext-r202209.target deleted file mode 100644 index 9f492801305..00000000000 --- a/xtext-r202209.target +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202212.target b/xtext-r202212.target deleted file mode 100644 index b481780f5e0..00000000000 --- a/xtext-r202212.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202303.target b/xtext-r202303.target deleted file mode 100644 index 41021c58cb6..00000000000 --- a/xtext-r202303.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202306.target b/xtext-r202306.target deleted file mode 100644 index 9155775016c..00000000000 --- a/xtext-r202306.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202309.target b/xtext-r202309.target deleted file mode 100644 index 10ebb7684ca..00000000000 --- a/xtext-r202309.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202312.target b/xtext-r202312.target deleted file mode 100644 index ee3ffa7fb18..00000000000 --- a/xtext-r202312.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0a4b482806291c60f3c6b40476e3576a9b4aa3a6 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 11:11:07 +0100 Subject: [PATCH 02/14] removed strict-jdk-11 profile --- pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pom.xml b/pom.xml index 3eaa97af2eb..c2b62ab9f71 100644 --- a/pom.xml +++ b/pom.xml @@ -418,32 +418,6 @@ - - strict-jdk-11 - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - - - - 11 - - - - - - - strict-jdk-17 From 66fa6e9077d692856afdc3238e90c553a839fbb8 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 11:35:16 +0100 Subject: [PATCH 03/14] Wizard minimal Java version is 17 --- .../xtext/wizard/WizardConfigurationTest.java | 19 ++----------------- .../eclipsePlugin.ide/META-INF/MANIFEST.MF | 2 +- .../eclipsePlugin.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../eclipsePlugin.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../eclipsePlugin/META-INF/MANIFEST.MF | 2 +- .../eclipsePluginP2.ide/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../eclipsePluginP2.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../eclipsePluginP2/META-INF/MANIFEST.MF | 2 +- .../full/full.parent/build.gradle | 4 ++-- .../full.parent/full.ide/META-INF/MANIFEST.MF | 2 +- .../full.target/full.target.target | 2 +- .../full.tests/META-INF/MANIFEST.MF | 2 +- .../full.ui.tests/META-INF/MANIFEST.MF | 2 +- .../full.parent/full.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../full.parent/full/META-INF/MANIFEST.MF | 2 +- .../full/full.parent/pom.xml | 6 +++--- .../gradle/gradle.parent/build.gradle | 4 ++-- .../lsGradleApp.parent/build.gradle | 4 ++-- .../lsGradleFatjar.parent/build.gradle | 4 ++-- .../lsMavenApp/lsMavenApp.parent/pom.xml | 4 ++-- .../lsMavenFatjar.parent/pom.xml | 4 ++-- .../lsMavenTychoApp.ide/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoApp.target.target | 2 +- .../lsMavenTychoApp.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../lsMavenTychoApp/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoApp.parent/pom.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoFatjar.target.target | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../lsMavenTychoFatjar/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoFatjar.parent/pom.xml | 6 +++--- .../mavenTycho.ide/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.target.target | 2 +- .../mavenTycho.tests/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.ui.tests/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../mavenTycho/META-INF/MANIFEST.MF | 2 +- .../mavenTycho/mavenTycho.parent/pom.xml | 6 +++--- .../mavenTychoP2.ide/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2.target.target | 2 +- .../mavenTychoP2.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../mavenTychoP2/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2/mavenTychoP2.parent/pom.xml | 6 +++--- .../plainMaven/plainMaven.parent/pom.xml | 4 ++-- .../xtext/ui/wizard/project/Messages.java | 2 +- .../WizardNewXtextProjectCreationPage.java | 6 +++--- .../ui/wizard/project/messages.properties | 2 +- .../wizard/ParentProjectDescriptor.xtend | 6 +----- .../xtext/wizard/WizardConfiguration.java | 2 +- .../wizard/cli/CliProjectsCreatorMain.java | 2 +- .../xtext/wizard/ParentProjectDescriptor.java | 17 ++--------------- 63 files changed, 84 insertions(+), 116 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java index 02d245e92c3..57e9bf6bcda 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java @@ -78,11 +78,10 @@ public void p2AndSdkProjectsAreBuiltWithTychoWhenMavenBuiltIsEnabled() { } @Test - public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabledJ11() { + public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabled() { config.getUiProject().setEnabled(true); config.getP2Project().setEnabled(true); config.setPreferredBuildSystem(BuildSystem.MAVEN); - config.setJavaVersion(JavaVersion.JAVA11); assertTrue(config.needsTychoBuild()); assertTrue(config.getParentProject().pom().getContent().contains("tycho-source-plugin")); assertFalse(config.getParentProject().pom().getContent().contains("tycho-source-feature-plugin")); @@ -351,21 +350,7 @@ public void tychoDoesNotFailOnMissingTests() { } @Test - public void allBuildSystemsUseJava11() { - String parentPom = config.getParentProject().pom().getContent(); - assertTrue(parentPom.contains("11")); - assertTrue(parentPom.contains("11")); - String parentGradle = config.getParentProject().buildGradle().getContent(); - assertTrue(parentGradle.contains("sourceCompatibility = JavaVersion.VERSION_11")); - assertTrue(parentGradle.contains("targetCompatibility = JavaVersion.VERSION_11")); - for (String it : Lists.transform(allJavaProjects(), (ProjectDescriptor it) -> it.manifest())) { - assertTrue(it.contains("Bundle-RequiredExecutionEnvironment: JavaSE-11")); - } - } - - @Test - public void allBuildSystemsUseOtherJava() { - config.setJavaVersion(JavaVersion.JAVA17); + public void allBuildSystemsUseJava17() { String parentPom = config.getParentProject().pom().getContent(); assertTrue(parentPom.contains("17")); assertTrue(parentPom.contains("17")); diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF index de61be541a0..e18a1c24064 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: eclipsePlugin, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF index 39fbcf02382..ab2a9c7e47a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: eclipsePlugin, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF index 3938998f719..618e73f6f1a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: eclipsePlugin.ui, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF index 08b56df532f..639286dbd0b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: eclipsePlugin, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch index e1bc5e0c59c..ebaf9a86941 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF index 4f8b519f695..1a051c5421f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF index fdd777b7ed9..7025373e0f9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: eclipsePluginP2, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF index cdb0e761432..835907feef5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: eclipsePluginP2, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF index f8576415c72..33628f82850 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: eclipsePluginP2.ui, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF index 8d5e0cabea1..e7156af5f46 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: eclipsePluginP2, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch index b36c6a609bf..c1e38cd522e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF index e9a5aee44eb..7c8bc942a54 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle index e42f17dee6c..ead9705cd45 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle @@ -27,8 +27,8 @@ subprojects { version = '1.0.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } configurations.all { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF index ace51a36366..fe092050feb 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: full, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index 4a406b42c79..9f65c4de01c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF index bebf545d948..7cba1214839 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: full, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF index 5626ff83c51..f2df023de96 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: full.ui, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF index b2cd5fde9ad..54555be487f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: full, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch index c5cfb73c3cf..736702582e0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF index 1a895f32df6..c7cfde45891 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml index 7fa8b205b35..e934d04bb81 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml @@ -10,10 +10,10 @@ unspecified 2.20.0 UTF-8 - 11 - 11 + 17 + 17 - 2.7.5 + 4.0.9 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle index 6e8a2580572..65b78e7c612 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle @@ -27,8 +27,8 @@ subprojects { version = '1.0.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } configurations.all { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle index 6ed3ae4755b..a354c606834 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle @@ -27,8 +27,8 @@ subprojects { version = '1.0.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } configurations.all { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle index 98a9cd5b981..020a040ab32 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle @@ -27,8 +27,8 @@ subprojects { version = '1.0.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } configurations.all { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml index d191a234a17..4dc0e94d382 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 11 - 11 + 17 + 17 lsMavenApp diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml index dba22ff82de..c5b133dec5b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 11 - 11 + 17 + 17 lsMavenFatjar diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF index 51bc25fc48a..dbd124654a4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: lsMavenTychoApp, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoApp.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index 0d5e17608f6..3663f37f275 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF index 938212561c6..f68e430b539 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: lsMavenTychoApp, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoApp.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch index 8d98971360b..64370b670bf 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF index da825a824f5..3fc5392e3da 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoApp diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml index 7d3bf26878f..ce48ec95adc 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml @@ -10,10 +10,10 @@ unspecified 2.20.0 UTF-8 - 11 - 11 + 17 + 17 - 2.7.5 + 4.0.9 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF index 10c3b46159a..5a75c5ca2d3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: lsMavenTychoFatjar, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoFatjar.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 2d7b4b17b2e..c845f7eb10f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF index 5ba5cfbe89c..0a645f766fe 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: lsMavenTychoFatjar, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoFatjar.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch index 73aa031e9dc..0273b50d4fe 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF index f56c90f580e..c49478ef2f9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoFatjar diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml index 9dcfd6bd06a..070b2268a51 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml @@ -10,10 +10,10 @@ unspecified 2.20.0 UTF-8 - 11 - 11 + 17 + 17 - 2.7.5 + 4.0.9 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF index 8c2b6f5ad75..c8794f5268c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: mavenTycho, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index 98eed0a069c..10fe7e15296 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF index 57ad1063c19..be4b5598737 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: mavenTycho, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF index 5c225e38b52..20b7ff10d8e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: mavenTycho.ui, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF index 85ce5083364..e141f8d19b4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: mavenTycho, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch index f4910ee6336..bbcd7692f85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF index 5de324e9cac..0a796b99934 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml index cab22c1c13b..42839e418f5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml @@ -10,10 +10,10 @@ unspecified 2.20.0 UTF-8 - 11 - 11 + 17 + 17 - 2.7.5 + 4.0.9 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF index bde943ec7c9..904797657f0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: mavenTychoP2, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index 294ef731b20..5344803dd7e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF index 0f48fbf0a29..318c4fd92a3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: mavenTychoP2, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF index 8969030b857..6ffbe4c2895 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: mavenTychoP2.ui, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF index 12c9e4ade10..8bb47baabe1 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: mavenTychoP2, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch index 421c9e4e209..7618546d4fa 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF index 166b1c0ffd3..11cbcbb9a58 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.16.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml index e0a3bdf64b6..af53b2ede2f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml @@ -10,10 +10,10 @@ unspecified 2.20.0 UTF-8 - 11 - 11 + 17 + 17 - 2.7.5 + 4.0.9 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml index 1c7546c1db7..e79cb7a1a75 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 11 - 11 + 17 + 17 plainMaven diff --git a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/Messages.java b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/Messages.java index d7a4948ff4f..f666dca8a47 100644 --- a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/Messages.java +++ b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/Messages.java @@ -22,7 +22,7 @@ public class Messages extends NLS { public static String WizardNewXtextProjectCreationPage_eeInfo_0; public static String WizardNewXtextProjectCreationPage_eeInfo_1; public static String WizardNewXtextProjectCreationPage_ErrorMessageExtensions; - public static String WizardNewXtextProjectCreationPage_MessageAtLeastJava11; + public static String WizardNewXtextProjectCreationPage_MessageAtLeastJava17; public static String WizardNewXtextProjectCreationPage_ErrorMessageLanguageName; public static String WizardNewXtextProjectCreationPage_ErrorMessageLanguageNameWithoutPackage; public static String WizardNewXtextProjectCreationPage_ErrorMessageProjectName; diff --git a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/WizardNewXtextProjectCreationPage.java b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/WizardNewXtextProjectCreationPage.java index 25e01156032..2e552143846 100644 --- a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/WizardNewXtextProjectCreationPage.java +++ b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/WizardNewXtextProjectCreationPage.java @@ -142,7 +142,7 @@ protected void fillBreeCombo(Combo comboToFill) { availableBrees.add(ee.getId()); } for (JavaVersion supportedVersion : JavaVersion.values()) { - if (supportedVersion.isAtLeast(JavaVersion.JAVA11)) { + if (supportedVersion.isAtLeast(JavaVersion.JAVA17)) { String bree = supportedVersion.getBree(); if (availableBrees.contains(bree)) brees.add(bree); @@ -230,8 +230,8 @@ protected boolean validatePage() { } JavaVersion javaVersion = JavaVersion.fromBree(breeCombo.getText()); if (javaVersion != null) { - if (!javaVersion.isAtLeast(JavaVersion.JAVA11)) { - setErrorMessage(Messages.WizardNewXtextProjectCreationPage_MessageAtLeastJava11); + if (!javaVersion.isAtLeast(JavaVersion.JAVA17)) { + setErrorMessage(Messages.WizardNewXtextProjectCreationPage_MessageAtLeastJava17); return false; } } diff --git a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/messages.properties b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/messages.properties index 5e3608fa945..7f24bdee74d 100644 --- a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/messages.properties +++ b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/messages.properties @@ -16,7 +16,7 @@ WizardNewXtextProjectCreationPage_EEGrTitle=Java version WizardNewXtextProjectCreationPage_eeInfo_0=Selected Execution environment WizardNewXtextProjectCreationPage_eeInfo_1=\ is not properly configured.\n Consider to set a compatible JRE using the 'Environments...' button. WizardNewXtextProjectCreationPage_ErrorMessageExtensions=Extensions contains an invalid pattern:\nOnly word characters are allowed. Multiple extensions must be comma-separated. -WizardNewXtextProjectCreationPage_MessageAtLeastJava11=Selected Java version should be JavaSE-11 or higher. +WizardNewXtextProjectCreationPage_MessageAtLeastJava17=Selected Java version should be JavaSE-17 or higher. WizardNewXtextProjectCreationPage_ErrorMessageLanguageName=Language name should be a valid qualified Java class name.\n WizardNewXtextProjectCreationPage_ErrorMessageLanguageNameWithoutPackage=Language name must contain a package name. WizardNewXtextProjectCreationPage_ErrorMessageProjectName=Project name should be a valid Java package name.\n diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend index c0ee4a81339..549b3b12dbf 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend @@ -72,10 +72,6 @@ class ParentProjectDescriptor extends ProjectDescriptor { def String getTychoVersion() { '4.0.9' } - - def String getTychoVersionJ11() { - '2.7.5' - } def private CharSequence loadResource(String resourcePath) { Resources.toString(class.classLoader.getResource(resourcePath), Charsets.ISO_8859_1) @@ -225,7 +221,7 @@ class ParentProjectDescriptor extends ProjectDescriptor { �javaVersion� �IF config.needsTychoBuild� - �IF config.javaVersion.isAtLeast(JavaVersion.JAVA17)��tychoVersion��ELSE��tychoVersionJ11��ENDIF� + �tychoVersion� diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java index 247463c6c5b..ecec79a9331 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java @@ -41,7 +41,7 @@ public class WizardConfiguration { private boolean needsGradleWrapper = true; - private JavaVersion javaVersion = JavaVersion.JAVA11; + private JavaVersion javaVersion = JavaVersion.JAVA17; private LanguageServer languageServer = LanguageServer.NONE; diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java index 7109c732550..0b8fc8a2813 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java @@ -78,7 +78,7 @@ public enum ProjectType { private LanguageServer languageServer = LanguageServer.NONE; @Option(name = "-javaVersion", usage = "Java Version", handler = OptionHandlers.JavaVersionOptionHandler.class) - private JavaVersion javaVersion = JavaVersion.JAVA11; + private JavaVersion javaVersion = JavaVersion.JAVA17; @Option(name = "-junitVersion", usage = "JUnit Version", handler = OptionHandlers.JUnitVersionOptionHandler.class) private JUnitVersion junitVersion = JUnitVersion.JUNIT_5; diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java index 3e68d535843..1d55a2b0046 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java @@ -18,7 +18,6 @@ import java.util.Set; import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor; import org.eclipse.xtend2.lib.StringConcatenation; -import org.eclipse.xtext.util.JavaVersion; import org.eclipse.xtext.util.XtextVersion; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Exceptions; @@ -109,10 +108,6 @@ public String getTychoVersion() { return "4.0.9"; } - public String getTychoVersionJ11() { - return "2.7.5"; - } - private CharSequence loadResource(final String resourcePath) { try { return Resources.toString(this.getClass().getClassLoader().getResource(resourcePath), Charsets.ISO_8859_1); @@ -573,16 +568,8 @@ public PomFile pom() { _builder.newLine(); _builder.append("\t"); _builder.append(""); - { - boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA17); - if (_isAtLeast) { - String _tychoVersion = this.getTychoVersion(); - _builder.append(_tychoVersion, "\t"); - } else { - String _tychoVersionJ11 = this.getTychoVersionJ11(); - _builder.append(_tychoVersionJ11, "\t"); - } - } + String _tychoVersion = this.getTychoVersion(); + _builder.append(_tychoVersion, "\t"); _builder.append(""); _builder.newLineIfNotEmpty(); _builder.append("\t"); From bf4229afdabe84cc498de21d522e84aabb61b2bc Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 11:42:15 +0100 Subject: [PATCH 04/14] Java 17 minimal requirement --- org.eclipse.xtend.core.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.examples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../projects/xtend-annotation-examples-client/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../xtend-annotation-examples-client/META-INF/MANIFEST.MF | 2 +- .../projects/xtend-annotation-examples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../xtend-annotation-examples/META-INF/MANIFEST.MF | 2 +- .../projects/xtend-euler/.classpath | 2 +- .../xtend-euler/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../projects/xtend-examples/.classpath | 2 +- .../xtend-examples/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../projects/xtend-examples/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide.common/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide.swtbot.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide.tests.data/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.ide.tests.data/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.lib.gwt.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.lib.gwt/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.lib.macro/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.lib.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.lib.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.lib/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.lib/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.m2e/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.m2e/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.maven.archetype/.classpath | 2 +- org.eclipse.xtend.maven.parent/pom.xml | 4 ++-- org.eclipse.xtend.maven.plugin/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 8 ++++---- .../resources/it/install_debug_info/simple_smap/pom.xml | 2 +- .../src/test/resources/it/pom.xml | 4 ++-- org.eclipse.xtend.performance.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.standalone/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.standalone/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.swtbot/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtend.swtbot/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.activities/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.activities/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.builder.standalone.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.builder.standalone/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.builder.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.builder/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.builder/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.buildship/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.buildship/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.eclipse.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.edit/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.shared.jdt38/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.shared/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.common.types.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.common.types/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.eclipse.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ecore/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ecore/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.extras.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.java.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.java/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.java/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.jdt.facade/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.junit5.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.logging/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.logging/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.m2e/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.m2e/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.maven.plugin/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../src/test/resources/it/generate/pom.xml | 4 ++-- .../generate/xcore-auto-mapping/sample-auto.emf/pom.xml | 2 +- .../it/generate/xcore-mapping/sample.emf/pom.xml | 2 +- org.eclipse.xtext.purexbase.eclipse.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.purexbase.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.purexbase.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.purexbase.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.purexbase/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.smap/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.smap/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testing.junit5.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testing.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testing/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.testing/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testlanguages.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testlanguages.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testlanguages/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codemining/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codetemplates.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codetemplates.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codetemplates.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codetemplates/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.ecore/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.shared/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.testing/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui/.classpath | 2 +- org.eclipse.xtext.ui/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.util/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.web.example.entities.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web.example.entities/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web.example.jetty/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web.example.statemachine.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web.example.statemachine/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web.servlet/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.web/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.lib.gwt/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.lib.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.lib/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.testdata/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.testing/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.testlanguages.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.testlanguages.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.testlanguages/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.ui.testing/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.web/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xbase/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.bootstrap/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.bootstrap/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.generator.dependencies/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.generator/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ui.examples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.arithmetics.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.arithmetics.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.arithmetics/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.domainmodel.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.domainmodel.releng/pom.xml | 4 ++-- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.domainmodel.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.domainmodel/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.fowlerdsl.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.fowlerdsl.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.fowlerdsl.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.fowlerdsl/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.example.homeautomation/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../projects/xbase.tutorial/.classpath | 2 +- .../xbase.tutorial/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../projects/xbase.tutorial/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ui.graph.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ui.graph/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.wizard/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext/.classpath | 2 +- org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- pom.xml | 6 +++--- 368 files changed, 625 insertions(+), 625 deletions(-) diff --git a/org.eclipse.xtend.core.tests/.classpath b/org.eclipse.xtend.core.tests/.classpath index 7f67a413999..ebb9a212e23 100644 --- a/org.eclipse.xtend.core.tests/.classpath +++ b/org.eclipse.xtend.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs index da4d30ff67b..bd1eaba251d 100644 --- a/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 56f70728647..1a38d5cc914 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtend Core Tests Bundle-SymbolicName: org.eclipse.xtend.core.tests Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xbase.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.core/.classpath b/org.eclipse.xtend.core/.classpath index 1e8098a1459..db2140f1531 100644 --- a/org.eclipse.xtend.core/.classpath +++ b/org.eclipse.xtend.core/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs index 46b0a0f3765..8fbd8ba0502 100644 --- a/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index f4c8100fbc5..defcaf14d18 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.core;version="2.37.0";x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests,org.eclipse.xtend.core.tests", org.eclipse.xtend.core.compiler;version="2.37.0";x-friends:="org.eclipse.xtend.m2e,org.eclipse.xtend.ide.tests,org.eclipse.xtend.core.tests", org.eclipse.xtend.core.compiler.batch;version="2.37.0", diff --git a/org.eclipse.xtend.examples/.classpath b/org.eclipse.xtend.examples/.classpath index cbd391fd550..c362d17e134 100644 --- a/org.eclipse.xtend.examples/.classpath +++ b/org.eclipse.xtend.examples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.examples/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.examples/.settings/org.eclipse.jdt.core.prefs index f2525a8b922..8c9943d50cc 100644 --- a/org.eclipse.xtend.examples/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.examples/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.classpath b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.classpath index 44e0ca59e44..dc7bac18b79 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.classpath +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF index 1dfeb235e8c..a63d03134e0 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Active Annotations Example Client Bundle-SymbolicName: xtend-annotation-examples-client Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.lib, com.google.guava;bundle-version="[33.3.1,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.classpath b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.classpath index 44e0ca59e44..dc7bac18b79 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.classpath +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 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 a53f83a5b70..d9df3d1d75c 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 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Active Annotations Example Bundle-SymbolicName: xtend-annotation-examples Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.lib, com.google.guava;bundle-version="[33.3.1,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/.classpath b/org.eclipse.xtend.examples/projects/xtend-euler/.classpath index 4bfb9946529..fd6b2a3a126 100644 --- a/org.eclipse.xtend.examples/projects/xtend-euler/.classpath +++ b/org.eclipse.xtend.examples/projects/xtend-euler/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.examples/projects/xtend-euler/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.examples/projects/xtend-euler/.settings/org.eclipse.jdt.core.prefs index 049e42fd35f..502518c4f65 100644 --- a/org.eclipse.xtend.examples/projects/xtend-euler/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.examples/projects/xtend-euler/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.examples/projects/xtend-examples/.classpath b/org.eclipse.xtend.examples/projects/xtend-examples/.classpath index 47ce7cd0756..5bfb3c39906 100644 --- a/org.eclipse.xtend.examples/projects/xtend-examples/.classpath +++ b/org.eclipse.xtend.examples/projects/xtend-examples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.examples/projects/xtend-examples/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.examples/projects/xtend-examples/.settings/org.eclipse.jdt.core.prefs index 049e42fd35f..502518c4f65 100644 --- a/org.eclipse.xtend.examples/projects/xtend-examples/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.examples/projects/xtend-examples/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.examples/projects/xtend-examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-examples/META-INF/MANIFEST.MF index 3468d84c598..c1f0a04a72f 100644 --- a/org.eclipse.xtend.examples/projects/xtend-examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-examples/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtend.lib, org.junit;bundle-version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: xtend-examples Export-Package: example1;x-internal:=true, example2;x-internal:=true, diff --git a/org.eclipse.xtend.ide.common/.classpath b/org.eclipse.xtend.ide.common/.classpath index 4f5319927a1..fc264e5b77a 100644 --- a/org.eclipse.xtend.ide.common/.classpath +++ b/org.eclipse.xtend.ide.common/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.ide.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.ide.common/.settings/org.eclipse.jdt.core.prefs index ca1f1b45f09..e14e7943ecf 100644 --- a/org.eclipse.xtend.ide.common/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.ide.common/.settings/org.eclipse.jdt.core.prefs @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -135,7 +135,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF index 98084b6b964..72a4dd79f98 100644 --- a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.37.0";x-friends:="org.eclipse.xtend.ide", org.eclipse.xtend.ide.common.contentassist.antlr.internal;version="2.37.0";x-friends:="org.eclipse.xtend.ide", org.eclipse.xtend.ide.common.contentassist.javadoc;version="2.37.0";x-friends:="org.eclipse.xtend.ide", diff --git a/org.eclipse.xtend.ide.swtbot.tests/.classpath b/org.eclipse.xtend.ide.swtbot.tests/.classpath index 6bbbe16aa40..4f85cf38ea8 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/.classpath +++ b/org.eclipse.xtend.ide.swtbot.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.ide.swtbot.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.ide.swtbot.tests/.settings/org.eclipse.jdt.core.prefs index 1a456aaafad..09d228f6b7b 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.ide.swtbot.tests/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -113,7 +113,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 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 01ec85614cd..9c226e91ab2 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtend SWT Tests Bundle-SymbolicName: org.eclipse.xtend.ide.swtbot.tests Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.log4j;version="1.2.24", org.junit;version="4.13.2", org.junit.rules;version="4.13.2", diff --git a/org.eclipse.xtend.ide.tests.data/.classpath b/org.eclipse.xtend.ide.tests.data/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtend.ide.tests.data/.classpath +++ b/org.eclipse.xtend.ide.tests.data/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.ide.tests.data/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.ide.tests.data/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtend.ide.tests.data/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.ide.tests.data/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.ide.tests.data/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests.data/META-INF/MANIFEST.MF index 94a535b640a..8016e98606c 100644 --- a/org.eclipse.xtend.ide.tests.data/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests.data/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Plug-in for testing restricted access Bundle-SymbolicName: org.eclipse.xtend.ide.tests.data Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.core.tests.internal;version="2.37.0";x-internal:=true, org.eclipse.xtend.ide.tests.data;version="2.37.0", org.eclipse.xtend.ide.tests.data.bug348446;version="2.37.0", diff --git a/org.eclipse.xtend.ide.tests/.classpath b/org.eclipse.xtend.ide.tests/.classpath index 76b7bef021e..b42222255f0 100644 --- a/org.eclipse.xtend.ide.tests/.classpath +++ b/org.eclipse.xtend.ide.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.ide.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.ide.tests/.settings/org.eclipse.jdt.core.prefs index 1a456aaafad..09d228f6b7b 100644 --- a/org.eclipse.xtend.ide.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.ide.tests/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -113,7 +113,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF index 5bbdc54ae3f..e52d184c200 100644 --- a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtend UI Tests Bundle-SymbolicName: org.eclipse.xtend.ide.tests Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.ide/.classpath b/org.eclipse.xtend.ide/.classpath index 400c36aabfd..46de70a2fa2 100644 --- a/org.eclipse.xtend.ide/.classpath +++ b/org.eclipse.xtend.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.ide/.settings/org.eclipse.jdt.core.prefs index ca1f1b45f09..e14e7943ecf 100644 --- a/org.eclipse.xtend.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.ide/.settings/org.eclipse.jdt.core.prefs @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -135,7 +135,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF index 8d846994a7b..194942c3138 100644 --- a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.e4.ui.css.swt.theme;bundle-version="0.13.0" Import-Package: org.apache.log4j;version="1.2.24", org.osgi.service.event;version="[1.4.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.xtend.ide.XtendActivator Export-Package: org.eclipse.xtend.ide;version="2.37.0";x-internal:=true, org.eclipse.xtend.ide.autoedit;version="2.37.0";x-friends:="org.eclipse.xtend.ide.tests", diff --git a/org.eclipse.xtend.lib.gwt.test/.classpath b/org.eclipse.xtend.lib.gwt.test/.classpath index 914add1f87f..cc4498ebc98 100644 --- a/org.eclipse.xtend.lib.gwt.test/.classpath +++ b/org.eclipse.xtend.lib.gwt.test/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs index 2af1e7b99c9..cf2cd4590a7 100644 --- a/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.lib.gwt/.classpath b/org.eclipse.xtend.lib.gwt/.classpath index 588801fe069..520d407f23a 100644 --- a/org.eclipse.xtend.lib.gwt/.classpath +++ b/org.eclipse.xtend.lib.gwt/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF index edb1043362a..84e17e2f57c 100644 --- a/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib.gwt Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.lib;version="2.37.0" Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.37.0" Automatic-Module-Name: org.eclipse.xtend.lib.gwt diff --git a/org.eclipse.xtend.lib.macro/.classpath b/org.eclipse.xtend.lib.macro/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtend.lib.macro/.classpath +++ b/org.eclipse.xtend.lib.macro/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF index b1b0fe84f69..dbb996ed523 100644 --- a/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib.macro Bundle-Name: Xtend Macro Interfaces Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.lib.macro;version="2.37.0";uses:="org.eclipse.xtend.lib.macro.file,org.eclipse.xtend.lib.macro.services,org.eclipse.xtend.lib.macro.declaration", org.eclipse.xtend.lib.macro.declaration;version="2.37.0";uses:="org.eclipse.xtend.lib.macro.file, org.eclipse.xtend2.lib, org.eclipse.xtend.lib.macro.expression, org.eclipse.xtext.xbase.lib", org.eclipse.xtend.lib.macro.expression;version="2.37.0";uses:="org.eclipse.xtend.lib.macro.declaration", diff --git a/org.eclipse.xtend.lib.tests/.classpath b/org.eclipse.xtend.lib.tests/.classpath index 6a2e478bc10..d53d87c9d7e 100644 --- a/org.eclipse.xtend.lib.tests/.classpath +++ b/org.eclipse.xtend.lib.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.lib.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib.tests/META-INF/MANIFEST.MF index a1bb9582ce9..4ed8dc0d448 100644 --- a/org.eclipse.xtend.lib.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.lib.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtend Library Tests Bundle-SymbolicName: org.eclipse.xtend.lib.tests;singleton:=true Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.xtend.lib.tests Export-Package: org.eclipse.xtend.lib.annotations;version="2.37.0" Require-Bundle: org.junit;bundle-version="4.13.2", diff --git a/org.eclipse.xtend.lib/.classpath b/org.eclipse.xtend.lib/.classpath index 55ec3514b92..a4758fe5ff9 100644 --- a/org.eclipse.xtend.lib/.classpath +++ b/org.eclipse.xtend.lib/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs index 7adc0fb9a0d..d4540a53f99 100644 --- a/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.lib/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib/META-INF/MANIFEST.MF index e6fcf02bbcd..0b9c923d343 100644 --- a/org.eclipse.xtend.lib/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.lib/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib Bundle-Name: Xtend Runtime Library Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.lib;version="2.37.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend.lib.macro", org.eclipse.xtend.lib.annotations;version="2.37.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend2.lib,org.eclipse.xtend.lib.macro" Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtend.m2e/.classpath b/org.eclipse.xtend.m2e/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtend.m2e/.classpath +++ b/org.eclipse.xtend.m2e/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.m2e/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.m2e/.settings/org.eclipse.jdt.core.prefs index f45ce6ff3cf..ce5c3312a88 100644 --- a/org.eclipse.xtend.m2e/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.m2e/.settings/org.eclipse.jdt.core.prefs @@ -9,9 +9,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -21,6 +21,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF index b621247cee7..26af95b0c77 100644 --- a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.8.3,3.0.0)";resolution:= org.eclipse.xtext.builder;bundle-version="2.37.0", org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.m2e.maven.runtime;bundle-version="[1.8.3,4.0.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.m2e;version="2.37.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional Automatic-Module-Name: org.eclipse.xtend.m2e diff --git a/org.eclipse.xtend.maven.archetype/.classpath b/org.eclipse.xtend.maven.archetype/.classpath index 12705cd0336..113d52215a5 100644 --- a/org.eclipse.xtend.maven.archetype/.classpath +++ b/org.eclipse.xtend.maven.archetype/.classpath @@ -5,7 +5,7 @@ - + diff --git a/org.eclipse.xtend.maven.parent/pom.xml b/org.eclipse.xtend.maven.parent/pom.xml index 815c26d44a1..74aadf5c0f6 100644 --- a/org.eclipse.xtend.maven.parent/pom.xml +++ b/org.eclipse.xtend.maven.parent/pom.xml @@ -29,8 +29,8 @@ ISO-8859-1 ISO-8859-1 - 11 - 11 + 17 + 17 false diff --git a/org.eclipse.xtend.maven.plugin/.classpath b/org.eclipse.xtend.maven.plugin/.classpath index c9abc95e998..b45eef85929 100644 --- a/org.eclipse.xtend.maven.plugin/.classpath +++ b/org.eclipse.xtend.maven.plugin/.classpath @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtend.maven.plugin/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.maven.plugin/.settings/org.eclipse.jdt.core.prefs index f8bf6fae56e..c71c499986b 100644 --- a/org.eclipse.xtend.maven.plugin/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.maven.plugin/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ -#Wed Nov 23 19:46:03 CET 2011 +#Wed Nov 23 19:46:03 CET 2017 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtend.maven.plugin/src/test/resources/it/install_debug_info/simple_smap/pom.xml b/org.eclipse.xtend.maven.plugin/src/test/resources/it/install_debug_info/simple_smap/pom.xml index 20f1047c2fb..33046ad0f6a 100755 --- a/org.eclipse.xtend.maven.plugin/src/test/resources/it/install_debug_info/simple_smap/pom.xml +++ b/org.eclipse.xtend.maven.plugin/src/test/resources/it/install_debug_info/simple_smap/pom.xml @@ -15,7 +15,7 @@ org.eclipse.xtend xtend-maven-plugin - 11 + 17 diff --git a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml index 5ac27a96bf6..3b5a4cec022 100644 --- a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml +++ b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml @@ -6,8 +6,8 @@ IT-SNAPSHOT pom - 11 - 11 + 17 + 17 @project.version@ ${xtextVersion} diff --git a/org.eclipse.xtend.performance.tests/.classpath b/org.eclipse.xtend.performance.tests/.classpath index 761e324e982..84b03df8834 100644 --- a/org.eclipse.xtend.performance.tests/.classpath +++ b/org.eclipse.xtend.performance.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.performance.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.performance.tests/.settings/org.eclipse.jdt.core.prefs index 7fce408e2d1..0824379e057 100644 --- a/org.eclipse.xtend.performance.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.performance.tests/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -126,7 +126,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index a758d3020ab..ec0cc0f38ae 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtend Benchmarks Bundle-SymbolicName: org.eclipse.xtend.performance.tests Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", diff --git a/org.eclipse.xtend.standalone/.classpath b/org.eclipse.xtend.standalone/.classpath index cbd391fd550..c362d17e134 100644 --- a/org.eclipse.xtend.standalone/.classpath +++ b/org.eclipse.xtend.standalone/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.standalone/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.standalone/.settings/org.eclipse.jdt.core.prefs index 8034de08aff..5fce54e899a 100644 --- a/org.eclipse.xtend.standalone/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.standalone/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -25,4 +25,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index d57ea4ffb7a..96e3a931baa 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Automatic-Module-Name: org.eclipse.xtend.standalone Bundle-SymbolicName: org.eclipse.xtend.standalone Bundle-Name: Xtend Standalone Bundle -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtend.swtbot/.classpath b/org.eclipse.xtend.swtbot/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtend.swtbot/.classpath +++ b/org.eclipse.xtend.swtbot/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtend.swtbot/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.swtbot/.settings/org.eclipse.jdt.core.prefs index 049e42fd35f..502518c4f65 100644 --- a/org.eclipse.xtend.swtbot/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtend.swtbot/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtend.swtbot/META-INF/MANIFEST.MF b/org.eclipse.xtend.swtbot/META-INF/MANIFEST.MF index dd4988556b2..b1cedae7162 100644 --- a/org.eclipse.xtend.swtbot/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.swtbot/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: org.eclipse.xtend.swtbot Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext Fragment-Host: org.eclipse.swtbot.swt.finder;bundle-version="2.1.1" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.xtend.swtbot diff --git a/org.eclipse.xtext.activities/.classpath b/org.eclipse.xtext.activities/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.activities/.classpath +++ b/org.eclipse.xtext.activities/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.activities/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.activities/.settings/org.eclipse.jdt.core.prefs index 1cecc7ec685..d4c53966413 100644 --- a/org.eclipse.xtext.activities/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.activities/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF index 6c4dece95eb..576b87ec98e 100644 --- a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.activities;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Bundle-Activator: org.eclipse.xtext.activities.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100" diff --git a/org.eclipse.xtext.builder.standalone.tests/.classpath b/org.eclipse.xtext.builder.standalone.tests/.classpath index 6a60c4d6b1b..d184e546c96 100644 --- a/org.eclipse.xtext.builder.standalone.tests/.classpath +++ b/org.eclipse.xtext.builder.standalone.tests/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.builder.standalone.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.builder.standalone.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.builder.standalone.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.builder.standalone.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 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 d08071ed075..e8257d8167d 100644 --- a/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Builder Standalone Tests Bundle-SymbolicName: org.eclipse.xtext.builder.standalone.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.builder.standalone;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.builder.standalone/.classpath b/org.eclipse.xtext.builder.standalone/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.builder.standalone/.classpath +++ b/org.eclipse.xtext.builder.standalone/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.builder.standalone/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.builder.standalone/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.builder.standalone/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.builder.standalone/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF index 8574848c519..eabaf5133f4 100644 --- a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.builder.standalone Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Import-Package: org.apache.log4j;version="1.2.24" Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.builder.tests/.classpath b/org.eclipse.xtext.builder.tests/.classpath index 383ef1f531f..914ce191120 100644 --- a/org.eclipse.xtext.builder.tests/.classpath +++ b/org.eclipse.xtext.builder.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.builder.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.builder.tests/.settings/org.eclipse.jdt.core.prefs index 515ff8c841c..bf16031f00e 100644 --- a/org.eclipse.xtext.builder.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.builder.tests/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF index e0e2212c906..8b5de236e07 100644 --- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Builder Tests Bundle-SymbolicName: org.eclipse.xtext.builder.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.builder;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.26.0", diff --git a/org.eclipse.xtext.builder/.classpath b/org.eclipse.xtext.builder/.classpath index 772c993148b..bbb06ee9973 100644 --- a/org.eclipse.xtext.builder/.classpath +++ b/org.eclipse.xtext.builder/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.builder/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.builder/.settings/org.eclipse.jdt.core.prefs index bb54072de6c..c22678f6b68 100644 --- a/org.eclipse.xtext.builder/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.builder/.settings/org.eclipse.jdt.core.prefs @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index c4b82348a38..392c38aefbc 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.builder;version="2.37.0", org.eclipse.xtext.builder.builderState;version="2.37.0"; x-friends:="org.eclipse.xtext.builder.tests, diff --git a/org.eclipse.xtext.buildship/.classpath b/org.eclipse.xtext.buildship/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.buildship/.classpath +++ b/org.eclipse.xtext.buildship/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.buildship/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.buildship/.settings/org.eclipse.jdt.core.prefs index f45ce6ff3cf..ce5c3312a88 100644 --- a/org.eclipse.xtext.buildship/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.buildship/.settings/org.eclipse.jdt.core.prefs @@ -9,9 +9,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -21,6 +21,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +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.buildship/META-INF/MANIFEST.MF b/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF index 28b6a1443ca..d26f9c8be41 100644 --- a/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.buildship/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.buildship;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.buildship;version="2.37.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.buildship Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.common.types.eclipse.tests/.classpath b/org.eclipse.xtext.common.types.eclipse.tests/.classpath index 8d98b1cc7df..8070ce65dc5 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/.classpath +++ b/org.eclipse.xtext.common.types.eclipse.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types.eclipse.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.eclipse.tests/.settings/org.eclipse.jdt.core.prefs index 08faf643aac..317ad994bea 100755 --- a/org.eclipse.xtext.common.types.eclipse.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.eclipse.tests/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 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 398819314fc..3348dd627a3 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 @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.common.types.eclipse.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.26.0", diff --git a/org.eclipse.xtext.common.types.edit/.classpath b/org.eclipse.xtext.common.types.edit/.classpath index 059859d9976..97f09983da6 100644 --- a/org.eclipse.xtext.common.types.edit/.classpath +++ b/org.eclipse.xtext.common.types.edit/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types.edit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.edit/.settings/org.eclipse.jdt.core.prefs index 0fbc535abe4..d317cf5b91d 100644 --- a/org.eclipse.xtext.common.types.edit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.edit/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -126,7 +126,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 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 d20ebdb7c8a..31c4f5d531f 100644 --- a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.xtext.common.types.edit;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types.provider;version="2.37.0" Bundle-Activator: org.eclipse.xtext.common.types.provider.TypesEditPlugin$Implementation Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.common.types.shared.jdt38/.classpath b/org.eclipse.xtext.common.types.shared.jdt38/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.common.types.shared.jdt38/.classpath +++ b/org.eclipse.xtext.common.types.shared.jdt38/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.core.prefs index 734bf8e6561..ddad0c1f3a9 100644 --- a/org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.core.prefs @@ -5,8 +5,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -89,7 +89,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 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 e05c79feba6..52f6275bb73 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 @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.common.types.shared.jdt38;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Localization: fragment Fragment-Host: org.eclipse.xtext.common.types.shared -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional, org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional diff --git a/org.eclipse.xtext.common.types.shared/.classpath b/org.eclipse.xtext.common.types.shared/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.common.types.shared/.classpath +++ b/org.eclipse.xtext.common.types.shared/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types.shared/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.shared/.settings/org.eclipse.jdt.core.prefs index c7c2e7aeeea..804cefdd35c 100644 --- a/org.eclipse.xtext.common.types.shared/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.shared/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.release=enabled 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 96b704522d8..11cfee8ec67 100644 --- a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.debug.core;bundle-version="3.19.0";resolution:=optional;x-installation:=greedy, org.eclipse.debug.ui;bundle-version="3.16.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.debug;bundle-version="3.19.100";resolution:=optional;x-installation:=greedy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.common.types.shared;version="2.37.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.common.types.shared diff --git a/org.eclipse.xtext.common.types.tests/.classpath b/org.eclipse.xtext.common.types.tests/.classpath index ff2a1be8f14..9b138dcb69d 100644 --- a/org.eclipse.xtext.common.types.tests/.classpath +++ b/org.eclipse.xtext.common.types.tests/.classpath @@ -39,7 +39,7 @@ - + diff --git a/org.eclipse.xtext.common.types.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.tests/.settings/org.eclipse.jdt.core.prefs index 3a393899fe5..532e4e570d6 100644 --- a/org.eclipse.xtext.common.types.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.common.types.ui/.classpath b/org.eclipse.xtext.common.types.ui/.classpath index ebc9028a55f..68820387d68 100644 --- a/org.eclipse.xtext.common.types.ui/.classpath +++ b/org.eclipse.xtext.common.types.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types.ui/.settings/org.eclipse.jdt.core.prefs index 5bf969e60c4..376f56395c4 100755 --- a/org.eclipse.xtext.common.types.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types.ui/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -126,7 +126,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 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 95d774bc241..b11446bf1b4 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0";visibilit org.eclipse.xtext.common.types.edit;bundle-version="2.37.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" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types.access.jdt;version="2.37.0", org.eclipse.xtext.common.types.ui;version="2.37.0", org.eclipse.xtext.common.types.ui.editor;version="2.37.0";x-internal:=true, diff --git a/org.eclipse.xtext.common.types/.classpath b/org.eclipse.xtext.common.types/.classpath index 2f8e921554a..a7f852246ef 100644 --- a/org.eclipse.xtext.common.types/.classpath +++ b/org.eclipse.xtext.common.types/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.common.types/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.common.types/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.common.types/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.common.types/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index 9834b0153c2..c0380cb2163 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.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" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.common.types;version="2.37.0", org.eclipse.xtext.common.types.access;version="2.37.0"; x-friends:="org.eclipse.xtext.common.types.tests, diff --git a/org.eclipse.xtext.eclipse.tests/.classpath b/org.eclipse.xtext.eclipse.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.eclipse.tests/.classpath +++ b/org.eclipse.xtext.eclipse.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.eclipse.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.eclipse.tests/.settings/org.eclipse.jdt.core.prefs index fadd92f57cc..6ca427f33be 100644 --- a/org.eclipse.xtext.eclipse.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.eclipse.tests/.settings/org.eclipse.jdt.core.prefs @@ -27,9 +27,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -137,7 +137,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index 7c4220c3d25..19df4ba1cc2 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.eclipse.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", diff --git a/org.eclipse.xtext.ecore/.classpath b/org.eclipse.xtext.ecore/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.ecore/.classpath +++ b/org.eclipse.xtext.ecore/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ecore/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ecore/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.ecore/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ecore/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF index b3f81b5b478..1c5a86f0e45 100644 --- a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ecore;version="2.37.0"; uses:="org.eclipse.emf.ecore, diff --git a/org.eclipse.xtext.extras.tests/.classpath b/org.eclipse.xtext.extras.tests/.classpath index 4dd9b380e7e..7895e18a647 100644 --- a/org.eclipse.xtext.extras.tests/.classpath +++ b/org.eclipse.xtext.extras.tests/.classpath @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.extras.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.extras.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.extras.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.extras.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index e1279c12c60..561c051e811 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext Extras Runtime Tests Bundle-SymbolicName: org.eclipse.xtext.extras.tests;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.enumrules;version="2.37.0", org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage;version="2.37.0", diff --git a/org.eclipse.xtext.ide.tests/.classpath b/org.eclipse.xtext.ide.tests/.classpath index c7d2d0068bd..0509050f770 100644 --- a/org.eclipse.xtext.ide.tests/.classpath +++ b/org.eclipse.xtext.ide.tests/.classpath @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index db2b800bc9b..027443228e8 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext IDE Tests Bundle-SymbolicName: org.eclipse.xtext.ide.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtext.ide/.classpath b/org.eclipse.xtext.ide/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.ide/.classpath +++ b/org.eclipse.xtext.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs index 814aef3a6d0..ffa33a7f6f3 100644 --- a/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 07d34288185..9a0f9138350 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext IDE Core Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtext.java.tests/.classpath b/org.eclipse.xtext.java.tests/.classpath index 97f3cc1aea4..03bcc4db69d 100644 --- a/org.eclipse.xtext.java.tests/.classpath +++ b/org.eclipse.xtext.java.tests/.classpath @@ -7,7 +7,7 @@ - + diff --git a/org.eclipse.xtext.java.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.java.tests/.settings/org.eclipse.jdt.core.prefs index 1f7c4cb604d..3e3b6b5107a 100644 --- a/org.eclipse.xtext.java.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.java.tests/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -101,4 +101,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.java/.classpath b/org.eclipse.xtext.java/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.java/.classpath +++ b/org.eclipse.xtext.java/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.java/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.java/.settings/org.eclipse.jdt.core.prefs index ca26705b2b6..ca3c44a26b6 100644 --- a/org.eclipse.xtext.java/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.java/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -8,7 +8,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index b09db8e49ef..4c1d810e8ea 100644 --- a/org.eclipse.xtext.java/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.java/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Java Language Bundle-SymbolicName: org.eclipse.xtext.java Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.jdt.facade/.classpath b/org.eclipse.xtext.jdt.facade/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.jdt.facade/.classpath +++ b/org.eclipse.xtext.jdt.facade/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.jdt.facade/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.jdt.facade/.settings/org.eclipse.jdt.core.prefs index ca26705b2b6..ca3c44a26b6 100644 --- a/org.eclipse.xtext.jdt.facade/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.jdt.facade/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -8,7 +8,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF index 918f91b8570..e4f1dbf4679 100644 --- a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext JDT Facade Bundle-SymbolicName: org.eclipse.xtext.jdt.facade Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.29.0" Export-Package: org.eclipse.xtext.jdt.facade;version="2.37.0";x-friends:="org.eclipse.xtext.java" Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.junit5.tests/.classpath b/org.eclipse.xtext.junit5.tests/.classpath index b5519095830..f69c88ac79c 100644 --- a/org.eclipse.xtext.junit5.tests/.classpath +++ b/org.eclipse.xtext.junit5.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index de6473fc3bf..e98dcb3b4d0 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.junit5.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.mwe.utils;bundle-version="1.14.0", org.eclipse.emf.ecore;bundle-version="2.26.0", diff --git a/org.eclipse.xtext.logging/.classpath b/org.eclipse.xtext.logging/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.logging/.classpath +++ b/org.eclipse.xtext.logging/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.logging/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.logging/.settings/org.eclipse.jdt.core.prefs index 1cecc7ec685..d4c53966413 100644 --- a/org.eclipse.xtext.logging/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.logging/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF index f42d392db2a..34f5dca118c 100644 --- a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Fragment-Host: org.apache.log4j;bundle-version="[1.2.24,1.3.0)" Bundle-SymbolicName: org.eclipse.xtext.logging;singleton:=true Bundle-Vendor: %providerName Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.core.runtime;bundle-version="3.24.100", org.osgi.framework;version="1.5.0" Export-Package: org.eclipse.xtext.logging;version="2.37.0";x-internal:=true diff --git a/org.eclipse.xtext.m2e/.classpath b/org.eclipse.xtext.m2e/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.m2e/.classpath +++ b/org.eclipse.xtext.m2e/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.m2e/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.m2e/.settings/org.eclipse.jdt.core.prefs index 93bc8b07976..9161db8569b 100644 --- a/org.eclipse.xtext.m2e/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.m2e/.settings/org.eclipse.jdt.core.prefs @@ -9,16 +9,16 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF index 5c0d827ab8d..8598d85b94e 100644 --- a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.8.0,3.0.0)";resolution:= org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,4.0.0)";resolution:=optional, org.eclipse.jdt.core;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.m2e;version="2.37.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional Automatic-Module-Name: org.eclipse.xtext.m2e diff --git a/org.eclipse.xtext.maven.plugin/.classpath b/org.eclipse.xtext.maven.plugin/.classpath index 682297a0fd5..ff604306498 100644 --- a/org.eclipse.xtext.maven.plugin/.classpath +++ b/org.eclipse.xtext.maven.plugin/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs index 50c431bdf78..b3894b2286b 100644 --- a/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 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 1b14fd20fbe..a13ae2679a6 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 @@ -10,8 +10,8 @@ https://ci.eclipse.org/xtext UTF-8 - 11 - 11 + 17 + 17 @project.version@ diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/pom.xml index f7d79c1f6ef..dfe6e1e4877 100644 --- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/pom.xml +++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/pom.xml @@ -65,7 +65,7 @@ of the source directories in Eclipse or Maven --> ${basedir}/model - 11 + 17 true diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml index 3cdbc3cef12..7319d74f43c 100644 --- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml +++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml @@ -62,7 +62,7 @@ of the source directories in Eclipse or Maven --> ${basedir}/model - 11 + 17 sample.emf diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/.classpath b/org.eclipse.xtext.purexbase.eclipse.tests/.classpath index ffd6a2d2a39..24cafb0be3b 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/.classpath +++ b/org.eclipse.xtext.purexbase.eclipse.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.purexbase.eclipse.tests/.settings/org.eclipse.jdt.core.prefs index 4ea1f004704..5d2da72a432 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.purexbase.eclipse.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -99,4 +99,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 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 db812071329..d7822ccc07b 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Import-Package: org.apache.commons.logging, org.junit.runner.notification;version="4.13.2", org.junit.runners;version="4.13.2", org.junit.runners.model;version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.test;version="2.37.0";x-internal:=true, org.eclipse.xtext.purexbase.ui.tests;version="2.37.0";x-internal=true Automatic-Module-Name: org.eclipse.xtext.purexbase.eclipse.tests diff --git a/org.eclipse.xtext.purexbase.ide/.classpath b/org.eclipse.xtext.purexbase.ide/.classpath index 6a60c4d6b1b..d184e546c96 100644 --- a/org.eclipse.xtext.purexbase.ide/.classpath +++ b/org.eclipse.xtext.purexbase.ide/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.purexbase.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.purexbase.ide/.settings/org.eclipse.jdt.core.prefs index ca26705b2b6..ca3c44a26b6 100644 --- a/org.eclipse.xtext.purexbase.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.purexbase.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -8,7 +8,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF index 071fbcceba2..3b720e00265 100644 --- a/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0", org.eclipse.xtext.ide;bundle-version="2.37.0", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.ide;version="2.37.0";x-internal:=true, org.eclipse.xtext.purexbase.ide.contentassist.antlr;version="2.37.0", org.eclipse.xtext.purexbase.ide.contentassist.antlr.internal;version="2.37.0" diff --git a/org.eclipse.xtext.purexbase.tests/.classpath b/org.eclipse.xtext.purexbase.tests/.classpath index 32490a53bdd..dc4f952faf7 100644 --- a/org.eclipse.xtext.purexbase.tests/.classpath +++ b/org.eclipse.xtext.purexbase.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.purexbase.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.purexbase.tests/.settings/org.eclipse.jdt.core.prefs index 4ea1f004704..5d2da72a432 100644 --- a/org.eclipse.xtext.purexbase.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.purexbase.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -99,4 +99,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF index 069e195cad6..80c7c8db47c 100644 --- a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0", org.junit;bundle-version="4.13.2" Import-Package: org.apache.commons.logging, org.apache.log4j;version="1.2.24" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.tests;version="2.37.0";x-internal=true, org.eclipse.xtext.purexbase.tests.data;version="2.37.0" Automatic-Module-Name: org.eclipse.xtext.purexbase.tests diff --git a/org.eclipse.xtext.purexbase.ui/.classpath b/org.eclipse.xtext.purexbase.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.purexbase.ui/.classpath +++ b/org.eclipse.xtext.purexbase.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.purexbase.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.purexbase.ui/.settings/org.eclipse.jdt.core.prefs index 05bb8dba35f..b1a9d7fda06 100644 --- a/org.eclipse.xtext.purexbase.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.purexbase.ui/.settings/org.eclipse.jdt.core.prefs @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF index d7675f27bbe..9a5bc4f77c2 100644 --- a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0";visibility:= org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24", org.apache.commons.logging -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase.ui;version="2.37.0", org.eclipse.xtext.purexbase.ui.autoedit;version="2.37.0", org.eclipse.xtext.purexbase.ui.contentassist;version="2.37.0", diff --git a/org.eclipse.xtext.purexbase/.classpath b/org.eclipse.xtext.purexbase/.classpath index 09d61c312c8..c19732f3262 100644 --- a/org.eclipse.xtext.purexbase/.classpath +++ b/org.eclipse.xtext.purexbase/.classpath @@ -7,7 +7,7 @@ - + diff --git a/org.eclipse.xtext.purexbase/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.purexbase/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.purexbase/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.purexbase/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF index bce35239bbd..0ce2b86555c 100644 --- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.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" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.purexbase;version="2.37.0", org.eclipse.xtext.purexbase.jvmmodel;version="2.37.0", org.eclipse.xtext.purexbase.parser.antlr;version="2.37.0", diff --git a/org.eclipse.xtext.smap/.classpath b/org.eclipse.xtext.smap/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.smap/.classpath +++ b/org.eclipse.xtext.smap/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.smap/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.smap/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.smap/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.smap/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.smap/META-INF/MANIFEST.MF b/org.eclipse.xtext.smap/META-INF/MANIFEST.MF index 7831d51ce05..e00ba89e4ff 100644 --- a/org.eclipse.xtext.smap/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.smap/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext JSR-45 SMAP installer Bundle-SymbolicName: org.eclipse.xtext.smap Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.smap;version="2.37.0";x-friends:="org.eclipse.xtext.builder" Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0" Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.testing.junit5.tests/.classpath b/org.eclipse.xtext.testing.junit5.tests/.classpath index 0b92385dc98..6a66965814f 100644 --- a/org.eclipse.xtext.testing.junit5.tests/.classpath +++ b/org.eclipse.xtext.testing.junit5.tests/.classpath @@ -5,7 +5,7 @@ - + diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF index c6c93d983c9..8f15082328d 100644 --- a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.testing.junit5.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.ide;bundle-version="2.37.0";visibility:=reexport, org.eclipse.lsp4j;resolution:=optional, diff --git a/org.eclipse.xtext.testing.tests/.classpath b/org.eclipse.xtext.testing.tests/.classpath index 0b92385dc98..6a66965814f 100644 --- a/org.eclipse.xtext.testing.tests/.classpath +++ b/org.eclipse.xtext.testing.tests/.classpath @@ -5,7 +5,7 @@ - + diff --git a/org.eclipse.xtext.testing.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.testing.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testing.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF index 118e36f0ad4..4d115960cf8 100644 --- a/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.testing.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.ide;bundle-version="2.37.0";visibility:=reexport, org.eclipse.lsp4j;resolution:=optional, diff --git a/org.eclipse.xtext.testing/.classpath b/org.eclipse.xtext.testing/.classpath index 1aef3eb4ba3..3395e05a232 100644 --- a/org.eclipse.xtext.testing/.classpath +++ b/org.eclipse.xtext.testing/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF index 137b248e8c0..38b89542a5d 100644 --- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.testing;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.testing;version="2.37.0", org.eclipse.xtext.testing.builder;version="2.37.0", org.eclipse.xtext.testing.extensions;version="2.37.0", diff --git a/org.eclipse.xtext.testlanguages.ide/.classpath b/org.eclipse.xtext.testlanguages.ide/.classpath index 21034590966..85979723de8 100644 --- a/org.eclipse.xtext.testlanguages.ide/.classpath +++ b/org.eclipse.xtext.testlanguages.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs index 814aef3a6d0..ffa33a7f6f3 100644 --- a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF index 5e50d3b496c..831c4e178af 100644 --- a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Common Xtext Testlanguages for UI and Runtime - IDE Features Bundle-SymbolicName: org.eclipse.xtext.testlanguages.ide;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;version="2.37.0";x-internal:=true, diff --git a/org.eclipse.xtext.testlanguages.ui/.classpath b/org.eclipse.xtext.testlanguages.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.testlanguages.ui/.classpath +++ b/org.eclipse.xtext.testlanguages.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs index 8dcd26bf19e..af307448506 100644 --- a/org.eclipse.xtext.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF index c2c22bba8b4..c0922d7b266 100644 --- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Import-Package: org.apache.log4j;version="1.2.24", org.junit.runners;version="4.13.2", org.junit.runner.manipulation;version="4.13.2", org.junit.runner.notification;version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.testlanguages.backtracking.ui;version="2.37.0", org.eclipse.xtext.testlanguages.backtracking.ui.contentassist;version="2.37.0", org.eclipse.xtext.testlanguages.backtracking.ui.labeling;version="2.37.0", diff --git a/org.eclipse.xtext.testlanguages/.classpath b/org.eclipse.xtext.testlanguages/.classpath index 21034590966..85979723de8 100644 --- a/org.eclipse.xtext.testlanguages/.classpath +++ b/org.eclipse.xtext.testlanguages/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index 76ea79f43d2..6c9011850f8 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: org.apache.log4j;version="1.2.24", org.junit.runner.notification;version="4.13.2", org.junit.runners;version="4.13.2", org.junit.runners.model;version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.testlanguages;version="2.37.0";x-internal:=true, org.eclipse.xtext.testlanguages.backtracking;version="2.37.0", org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage;version="2.37.0", diff --git a/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath index d20da4a31f6..45da354b41f 100644 --- a/org.eclipse.xtext.tests/.classpath +++ b/org.eclipse.xtext.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 4c7b01f4715..39631a0376e 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.mwe.utils;bundle-version="1.14.0", org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, diff --git a/org.eclipse.xtext.ui.codemining/.classpath b/org.eclipse.xtext.ui.codemining/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.ui.codemining/.classpath +++ b/org.eclipse.xtext.ui.codemining/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.codemining/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.codemining/.settings/org.eclipse.jdt.core.prefs index 21e63d2a063..0f7f13de33e 100644 --- a/org.eclipse.xtext.ui.codemining/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.codemining/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 encoding/=ISO-8859-1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF index 20a5dbf5b89..f40a622623b 100644 --- a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.codemining;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: org.eclipse.xtext.ui.codemining -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.codemining;version="2.37.0";x-internal:=true Require-Bundle: org.eclipse.equinox.common, org.eclipse.xtext;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ui.codetemplates.ide/.classpath b/org.eclipse.xtext.ui.codetemplates.ide/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/org.eclipse.xtext.ui.codetemplates.ide/.classpath +++ b/org.eclipse.xtext.ui.codetemplates.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.codetemplates.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.codetemplates.ide/.settings/org.eclipse.jdt.core.prefs index c7c2e7aeeea..804cefdd35c 100644 --- a/org.eclipse.xtext.ui.codetemplates.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.codetemplates.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF index f9b0304792d..40f36aa043f 100644 --- a/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates.ide Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.37.0", org.eclipse.xtext.ui.codetemplates;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" diff --git a/org.eclipse.xtext.ui.codetemplates.tests/.classpath b/org.eclipse.xtext.ui.codetemplates.tests/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/.classpath +++ b/org.eclipse.xtext.ui.codetemplates.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.codetemplates.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.codetemplates.tests/.settings/org.eclipse.jdt.core.prefs index 70586bab96d..a06fb68a7ef 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.codetemplates.tests/.settings/org.eclipse.jdt.core.prefs @@ -15,9 +15,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -106,6 +106,6 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +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.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF index fdd2b08278d..6f0ae6765bd 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: org.junit;version="4.13.2", org.junit.runners;version="4.13.2", org.junit.runners.model;version="4.13.2", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.codetemplates.tests;version="2.37.0";x-internal=true, org.eclipse.xtext.ui.codetemplates.ui.tests;version="2.37.0";x-internal=true Bundle-Vendor: %providerName diff --git a/org.eclipse.xtext.ui.codetemplates.ui/.classpath b/org.eclipse.xtext.ui.codetemplates.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.ui.codetemplates.ui/.classpath +++ b/org.eclipse.xtext.ui.codetemplates.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.codetemplates.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.codetemplates.ui/.settings/org.eclipse.jdt.core.prefs index ba85eb2a0e4..ee528c15f3a 100755 --- a/org.eclipse.xtext.ui.codetemplates.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.codetemplates.ui/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF index 488a91ac5f8..89a2d79e31b 100644 --- a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.37.0";visib org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0" Import-Package: org.apache.log4j;version="1.2.24" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.codetemplates.ui;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.ui.codetemplates.ui.contentassist;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.ui.codetemplates.ui.evaluator;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", diff --git a/org.eclipse.xtext.ui.codetemplates/.classpath b/org.eclipse.xtext.ui.codetemplates/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.ui.codetemplates/.classpath +++ b/org.eclipse.xtext.ui.codetemplates/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.codetemplates/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.codetemplates/.settings/org.eclipse.jdt.core.prefs index ba85eb2a0e4..ee528c15f3a 100755 --- a/org.eclipse.xtext.ui.codetemplates/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.codetemplates/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF index 23182987447..458b32d8769 100644 --- a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0" Import-Package: org.apache.commons.logging, org.apache.log4j;version="1.2.24" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.codetemplates;version="2.37.0";x-friends:="org.eclipse.xtext.ui.codetemplates.ide,org.eclipse.xtext.ui.codetemplates.ui", org.eclipse.xtext.ui.codetemplates.conversion;version="2.37.0";x-internal:=true, org.eclipse.xtext.ui.codetemplates.formatting;version="2.37.0";x-internal:=true, diff --git a/org.eclipse.xtext.ui.ecore/.classpath b/org.eclipse.xtext.ui.ecore/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.ui.ecore/.classpath +++ b/org.eclipse.xtext.ui.ecore/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.ecore/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.ecore/.settings/org.eclipse.jdt.core.prefs index cd8d812e39f..d9e9ff9ea05 100644 --- a/org.eclipse.xtext.ui.ecore/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.ecore/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF index 8c56f640267..4259b9d007a 100644 --- a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", org.eclipse.xtext.ecore;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.emf.ecore.editor;bundle-version="2.17.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.ui.ecore;version="2.37.0" diff --git a/org.eclipse.xtext.ui.shared/.classpath b/org.eclipse.xtext.ui.shared/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.ui.shared/.classpath +++ b/org.eclipse.xtext.ui.shared/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.shared/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.shared/.settings/org.eclipse.jdt.core.prefs index bcdd6250778..c00745ecae5 100644 --- a/org.eclipse.xtext.ui.shared/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.shared/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF index 4b765564e3c..fdcdd9d3229 100644 --- a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0";resolution:=optiona org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional;x-installation:=greedy, org.eclipse.core.expressions;bundle-version="3.8.100" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ui.shared;version="2.37.0", org.eclipse.xtext.ui.shared.internal;version="2.37.0";x-friends:="org.eclipse.xtext.builder.tests, diff --git a/org.eclipse.xtext.ui.testing/.classpath b/org.eclipse.xtext.ui.testing/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.ui.testing/.classpath +++ b/org.eclipse.xtext.ui.testing/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.testing/.settings/org.eclipse.jdt.core.prefs index a868cfcca8f..7ad593c960b 100644 --- a/org.eclipse.xtext.ui.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.testing/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF index 7608cbac78b..3a0289bdab3 100644 --- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext UI Testing Infrastructure Bundle-SymbolicName: org.eclipse.xtext.ui.testing Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.testing;version="2.37.0", org.eclipse.xtext.ui.testing.util;version="2.37.0" Import-Package: org.apache.log4j;version="1.2.24";resolution:=optional, diff --git a/org.eclipse.xtext.ui.tests/.classpath b/org.eclipse.xtext.ui.tests/.classpath index 0c5deafb84a..230b40d990d 100644 --- a/org.eclipse.xtext.ui.tests/.classpath +++ b/org.eclipse.xtext.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs index 08faf643aac..317ad994bea 100644 --- a/org.eclipse.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF index eb5d97e5378..07b19171850 100644 --- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext Core UI Tests Bundle-SymbolicName: org.eclipse.xtext.ui.tests;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.core.filesystem;bundle-version="1.9.300", org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400", diff --git a/org.eclipse.xtext.ui/.classpath b/org.eclipse.xtext.ui/.classpath index ebc9028a55f..68820387d68 100644 --- a/org.eclipse.xtext.ui/.classpath +++ b/org.eclipse.xtext.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 643a7f3ff95..9a12463d9a0 100644 --- a/org.eclipse.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF index 0be7e2b576c..742c1d45e1c 100644 --- a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF @@ -150,7 +150,7 @@ Export-Package: org.eclipse.xtext.common.ui.contentassist;version="2.37.0", org.eclipse.xtext.xbase.ui, org.eclipse.xtext.ui.shared, org.eclipse.xtext.builder" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.util/.classpath b/org.eclipse.xtext.util/.classpath index 00eb2121b1d..2b7013fff54 100644 --- a/org.eclipse.xtext.util/.classpath +++ b/org.eclipse.xtext.util/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs index 052ee6edbeb..20cc7b58804 100644 --- a/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 3698c1e9a24..5bec75f1d20 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Utility Bundle-SymbolicName: org.eclipse.xtext.util Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.util;version="2.37.0"; uses:="org.eclipse.emf.ecore.resource, org.apache.log4j, diff --git a/org.eclipse.xtext.web.example.entities.ide/.classpath b/org.eclipse.xtext.web.example.entities.ide/.classpath index 7cf964c9342..87ed94578d3 100644 --- a/org.eclipse.xtext.web.example.entities.ide/.classpath +++ b/org.eclipse.xtext.web.example.entities.ide/.classpath @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.web.example.entities.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.example.entities.ide/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.example.entities.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.example.entities.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web.example.entities/.classpath b/org.eclipse.xtext.web.example.entities/.classpath index f707ba9a11b..5fd765f7820 100644 --- a/org.eclipse.xtext.web.example.entities/.classpath +++ b/org.eclipse.xtext.web.example.entities/.classpath @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.web.example.entities/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.example.entities/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.example.entities/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.example.entities/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web.example.jetty/.classpath b/org.eclipse.xtext.web.example.jetty/.classpath index cde02684a90..3e47195eccb 100644 --- a/org.eclipse.xtext.web.example.jetty/.classpath +++ b/org.eclipse.xtext.web.example.jetty/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.eclipse.xtext.web.example.jetty/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.example.jetty/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.example.jetty/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.example.jetty/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web.example.statemachine.ide/.classpath b/org.eclipse.xtext.web.example.statemachine.ide/.classpath index 7cf964c9342..87ed94578d3 100644 --- a/org.eclipse.xtext.web.example.statemachine.ide/.classpath +++ b/org.eclipse.xtext.web.example.statemachine.ide/.classpath @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.web.example.statemachine.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.example.statemachine.ide/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.example.statemachine.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.example.statemachine.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web.example.statemachine/.classpath b/org.eclipse.xtext.web.example.statemachine/.classpath index f707ba9a11b..5fd765f7820 100644 --- a/org.eclipse.xtext.web.example.statemachine/.classpath +++ b/org.eclipse.xtext.web.example.statemachine/.classpath @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.web.example.statemachine/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.example.statemachine/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.example.statemachine/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.example.statemachine/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web.servlet/.classpath b/org.eclipse.xtext.web.servlet/.classpath index 3721ade03c2..ab334eedafa 100644 --- a/org.eclipse.xtext.web.servlet/.classpath +++ b/org.eclipse.xtext.web.servlet/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.web.servlet/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web.servlet/.settings/org.eclipse.jdt.core.prefs index f545d066fe3..f5924b01a39 100644 --- a/org.eclipse.xtext.web.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.web/.classpath b/org.eclipse.xtext.web/.classpath index c7e7423218a..9453f9b722f 100644 --- a/org.eclipse.xtext.web/.classpath +++ b/org.eclipse.xtext.web/.classpath @@ -21,7 +21,7 @@ - + diff --git a/org.eclipse.xtext.web/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.web/.settings/org.eclipse.jdt.core.prefs index 574d2e442f3..77f1313a3a8 100644 --- a/org.eclipse.xtext.web/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.web/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,5 +13,5 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.eclipse.xtext.xbase.ide/.classpath b/org.eclipse.xtext.xbase.ide/.classpath index 6723d213715..12f247e2bff 100644 --- a/org.eclipse.xtext.xbase.ide/.classpath +++ b/org.eclipse.xtext.xbase.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.ide/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xbase.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF index 0b1053616d0..9bb52c81550 100644 --- a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xbase Generic IDE Services Bundle-Vendor: Eclipse Xtext Bundle-SymbolicName: org.eclipse.xtext.xbase.ide;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xbase.lib.gwt/.classpath b/org.eclipse.xtext.xbase.lib.gwt/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.xbase.lib.gwt/.classpath +++ b/org.eclipse.xtext.xbase.lib.gwt/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs index 052ee6edbeb..20cc7b58804 100644 --- a/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF index d7dc6f2e96d..c25d129e4f3 100644 --- a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.lib.gwt Bundle-Version: 2.37.0.qualifier Export-Package: org.eclipse.xtend2.lib;version="2.37.0", org.eclipse.xtext.xbase.lib;version="2.37.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: com.google.guava;bundle-version="[33.3.1,34.0.0)" Bundle-Vendor: %Vendor-Name Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt diff --git a/org.eclipse.xtext.xbase.lib.tests/.classpath b/org.eclipse.xtext.xbase.lib.tests/.classpath index 1b817db9691..941d2125c49 100644 --- a/org.eclipse.xtext.xbase.lib.tests/.classpath +++ b/org.eclipse.xtext.xbase.lib.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs index 3a393899fe5..532e4e570d6 100644 --- a/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.lib/.classpath b/org.eclipse.xtext.xbase.lib/.classpath index 32e521e2994..db814aeb693 100644 --- a/org.eclipse.xtext.xbase.lib/.classpath +++ b/org.eclipse.xtext.xbase.lib/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF index 945ae6a0a50..f43c607515f 100644 --- a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xbase Runtime Library Bundle-SymbolicName: org.eclipse.xtext.xbase.lib Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend2.lib;version="2.37.0", org.eclipse.xtext.xbase.lib;version="2.37.0", org.eclipse.xtext.xbase.lib.internal;version="2.37.0";x-internal:="true", diff --git a/org.eclipse.xtext.xbase.testdata/.classpath b/org.eclipse.xtext.xbase.testdata/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.xbase.testdata/.classpath +++ b/org.eclipse.xtext.xbase.testdata/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.testdata/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.testdata/.settings/org.eclipse.jdt.core.prefs index f2525a8b922..8c9943d50cc 100644 --- a/org.eclipse.xtext.xbase.testdata/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.testdata/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF index be9e3bcdc54..9108c15fa2a 100644 --- a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xbase Test Data Bundle-Vendor: Eclipse Xtext Bundle-SymbolicName: org.eclipse.xtext.xbase.testdata;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xbase.testing/.classpath b/org.eclipse.xtext.xbase.testing/.classpath index c9a860ca3ac..dcd1a7d2c76 100644 --- a/org.eclipse.xtext.xbase.testing/.classpath +++ b/org.eclipse.xtext.xbase.testing/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.testing/.settings/org.eclipse.jdt.core.prefs index f2525a8b922..8c9943d50cc 100644 --- a/org.eclipse.xtext.xbase.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.testing/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF index f8841298db1..47e7b5af75c 100644 --- a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testing;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xbase.testlanguages.ide/.classpath b/org.eclipse.xtext.xbase.testlanguages.ide/.classpath index 39dea85fbd0..101f8502017 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ide/.classpath +++ b/org.eclipse.xtext.xbase.testlanguages.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF index 80457d2fbd7..44b508c3248 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.37.0", org.eclipse.xtext.ide;bundle-version="2.37.0", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.xbase.testlanguages.bug462047.ide;version="2.37.0", org.eclipse.xtext.xbase.testlanguages.bug462047.ide.contentassist.antlr;version="2.37.0", org.eclipse.xtext.xbase.testlanguages.bug462047.ide.contentassist.antlr.internal;version="2.37.0", diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/.classpath b/org.eclipse.xtext.xbase.testlanguages.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/.classpath +++ b/org.eclipse.xtext.xbase.testlanguages.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs index 1a43829927f..78d53c7f0f7 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.testlanguages.ui/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF index 29debc18a6b..a2ea0755556 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.13.2", org.junit.runners.model;version="4.13.2", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.xbase.testlanguages.bug462047.ui;version="2.37.0";x-internal:=true, org.eclipse.xtext.xbase.testlanguages.bug462047.ui.contentassist;version="2.37.0", org.eclipse.xtext.xbase.testlanguages.ui;version="2.37.0", diff --git a/org.eclipse.xtext.xbase.testlanguages/.classpath b/org.eclipse.xtext.xbase.testlanguages/.classpath index 6a60c4d6b1b..d184e546c96 100644 --- a/org.eclipse.xtext.xbase.testlanguages/.classpath +++ b/org.eclipse.xtext.xbase.testlanguages/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.xbase.testlanguages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.testlanguages/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xbase.testlanguages/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.testlanguages/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF index 19955eb1abc..e0f9fb75c2d 100644 --- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: org.apache.log4j, org.junit.runner.notification;version="4.13.2", org.junit.runners;version="4.13.2", org.junit.runners.model;version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.xbase.testlanguages;version="2.37.0", org.eclipse.xtext.xbase.testlanguages.bug462047;version="2.37.0", org.eclipse.xtext.xbase.testlanguages.bug462047.bug462047;version="2.37.0", diff --git a/org.eclipse.xtext.xbase.tests/.classpath b/org.eclipse.xtext.xbase.tests/.classpath index 5d2e0905506..0ac3dbd9998 100644 --- a/org.eclipse.xtext.xbase.tests/.classpath +++ b/org.eclipse.xtext.xbase.tests/.classpath @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtext.xbase.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.tests/.settings/org.eclipse.jdt.core.prefs index cb7cea341a0..d552ac6e151 100644 --- a/org.eclipse.xtext.xbase.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.tests/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index aeabda74362..7c78ee5e2d9 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xbase Runtime Tests Bundle-SymbolicName: org.eclipse.xtext.xbase.tests;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xbase.ui.testing/.classpath b/org.eclipse.xtext.xbase.ui.testing/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.xbase.ui.testing/.classpath +++ b/org.eclipse.xtext.xbase.ui.testing/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.ui.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.ui.testing/.settings/org.eclipse.jdt.core.prefs index c911f51fcb8..034598ac151 100644 --- a/org.eclipse.xtext.xbase.ui.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.ui.testing/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -137,7 +137,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF index d823cb55770..b1a2809de6f 100644 --- a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.xtext.xbase.ui.testing Bundle-Version: 2.37.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.ui;bundle-version="2.37.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.xbase.ui.tests/.classpath b/org.eclipse.xtext.xbase.ui.tests/.classpath index f575316d9d2..a699ffcfc57 100644 --- a/org.eclipse.xtext.xbase.ui.tests/.classpath +++ b/org.eclipse.xtext.xbase.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.ui.tests/.settings/org.eclipse.jdt.core.prefs index 195f34c403b..4a4be172cc3 100644 --- a/org.eclipse.xtext.xbase.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF index d356a069e3a..6939caa46e3 100644 --- a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xbase UI Tests Bundle-SymbolicName: org.eclipse.xtext.xbase.ui.tests Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0", diff --git a/org.eclipse.xtext.xbase.ui/.classpath b/org.eclipse.xtext.xbase.ui/.classpath index ec447d3d158..b146e6108e9 100644 --- a/org.eclipse.xtext.xbase.ui/.classpath +++ b/org.eclipse.xtext.xbase.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.ui/.settings/org.eclipse.jdt.core.prefs index 1c6bc568457..551cd1c7449 100644 --- a/org.eclipse.xtext.xbase.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.ui/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -135,7 +135,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF index b8fbc2a6491..bc2b6daaedd 100644 --- a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reex org.eclipse.core.expressions;bundle-version="3.8.100", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.37.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.xtext.xbase.ui.internal.XbaseActivator Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.xbase.annotations.ui;version="2.37.0";x-internal:=true, diff --git a/org.eclipse.xtext.xbase.web/.classpath b/org.eclipse.xtext.xbase.web/.classpath index c7e7423218a..9453f9b722f 100644 --- a/org.eclipse.xtext.xbase.web/.classpath +++ b/org.eclipse.xtext.xbase.web/.classpath @@ -21,7 +21,7 @@ - + diff --git a/org.eclipse.xtext.xbase.web/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.web/.settings/org.eclipse.jdt.core.prefs index 574d2e442f3..77f1313a3a8 100644 --- a/org.eclipse.xtext.xbase.web/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase.web/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,5 +13,5 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.eclipse.xtext.xbase/.classpath b/org.eclipse.xtext.xbase/.classpath index a807e52ac16..1806da033e8 100644 --- a/org.eclipse.xtext.xbase/.classpath +++ b/org.eclipse.xtext.xbase/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xbase/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xbase/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xbase/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF index b74dbbbfe6a..1b27ad80c86 100644 --- a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0";visibility:=reexport, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.xbase;version="2.37.0", org.eclipse.xtext.xbase.annotations;version="2.37.0";x-friends:="org.eclipse.xtext.xbase.ide,org.eclipse.xtext.xbase.tests", org.eclipse.xtext.xbase.annotations.formatting;version="2.37.0";x-internal:=true, diff --git a/org.eclipse.xtext.xtext.bootstrap/.classpath b/org.eclipse.xtext.xtext.bootstrap/.classpath index 1db08c6b4ce..8d8612144fb 100644 --- a/org.eclipse.xtext.xtext.bootstrap/.classpath +++ b/org.eclipse.xtext.xtext.bootstrap/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.bootstrap/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.bootstrap/META-INF/MANIFEST.MF index 92a9b91baec..5229fc5467f 100644 --- a/org.eclipse.xtext.xtext.bootstrap/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.bootstrap/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Bootstrap project for the Xtext language Bundle-SymbolicName: org.eclipse.xtext.xtext.bootstrap;singleton:=true Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.xtext.xtext.bootstrap Export-Package: org.eclipse.xtext.xtext.bootstrap;version="2.37.0" Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xtext.generator.dependencies/.classpath b/org.eclipse.xtext.xtext.generator.dependencies/.classpath index cbd391fd550..c362d17e134 100644 --- a/org.eclipse.xtext.xtext.generator.dependencies/.classpath +++ b/org.eclipse.xtext.xtext.generator.dependencies/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.generator.dependencies/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.generator.dependencies/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xtext.generator.dependencies/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.generator.dependencies/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF index 89ec78d4368..64e3e911eb0 100644 --- a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.xtext.xtext.generator.dependencies;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: Xtext Generator Dependencies Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.xtext.generator/.classpath b/org.eclipse.xtext.xtext.generator/.classpath index 0a3b82d4d56..bea6a600af4 100644 --- a/org.eclipse.xtext.xtext.generator/.classpath +++ b/org.eclipse.xtext.xtext.generator/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 21e932fae92..b937e3127c6 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.xtext.xtext.generator;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: Xtext Generator 2 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.xtext.ide/.classpath b/org.eclipse.xtext.xtext.ide/.classpath index dc2e20e923f..e0104bedbaf 100644 --- a/org.eclipse.xtext.xtext.ide/.classpath +++ b/org.eclipse.xtext.xtext.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF index b5df09035e1..e416ecc3128 100644 --- a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext Language IDE Support Bundle-SymbolicName: org.eclipse.xtext.xtext.ide;singleton:=true Bundle-Version: 2.37.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.37.0" diff --git a/org.eclipse.xtext.xtext.ui.examples/.classpath b/org.eclipse.xtext.xtext.ui.examples/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/.settings/org.eclipse.jdt.core.prefs index 88c4138a358..10de63f2688 100644 --- a/org.eclipse.xtext.xtext.ui.examples/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF index 1e4ba7e3a00..8f29228136a 100644 --- a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.ui.ide;bundle-version="3.13.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.xtext.xtext.ui.examples;version="2.37.0";x-internal:=true diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF index 84d3b4b7537..404c5f9bd8a 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.example.arithmetics, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.arithmetics.ide;x-internal:=true, org.eclipse.xtext.example.arithmetics.ide.contentassist.antlr, org.eclipse.xtext.example.arithmetics.ide.contentassist.antlr.internal diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/META-INF/MANIFEST.MF index e9cd2b6c93f..b8e08eae9d3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.example.arithmetics, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.junit;bundle-version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.arithmetics.tests;x-internal=true, org.eclipse.xtext.example.arithmetics.tests.interpreter;x-internal:=true Import-Package: org.hamcrest.core, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/META-INF/MANIFEST.MF index 759d8291273..3d06651f10a 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.testing, org.eclipse.xtext.ui.testing, org.junit;bundle-version="4.13.2" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.arithmetics.ui.tests;x-internal=true, org.eclipse.xtext.example.arithmetics.ui.tests.autoedit;x-internal:=true, org.eclipse.xtext.example.arithmetics.ui.tests.codemining;x-internal:=true, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.settings/org.eclipse.jdt.core.prefs index 814923a50cd..a5d0fa85a9c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/META-INF/MANIFEST.MF index 3f2a5b18d8d..79713401358 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.compare, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" Import-Package: org.apache.log4j, org.eclipse.xtext.ui.codemining;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.arithmetics.ui;x-internal:=true, org.eclipse.xtext.example.arithmetics.ui.autoedit;x-internal:=true, org.eclipse.xtext.example.arithmetics.ui.codemining;x-internal:=true, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF index b5c670a0456..1e051eccc5c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.arithmetics, org.eclipse.xtext.example.arithmetics.arithmetics, org.eclipse.xtext.example.arithmetics.arithmetics.impl, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF index 1da1e0c6d09..9a2338599cc 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.example.domainmodel, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.domainmodel.ide;x-internal:=true, org.eclipse.xtext.example.domainmodel.ide.contentassist.antlr, org.eclipse.xtext.example.domainmodel.ide.contentassist.antlr.internal diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml index edd40909729..79978984787 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml @@ -21,8 +21,8 @@ - 11 - 11 + 17 + 17 4.0.9 ${project.groupId} diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.classpath index 5ff541c3fe7..37e9e802fca 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.settings/org.eclipse.jdt.core.prefs index 7e481eda04f..47ded52f6e3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF index 6db8d91d2f4..926b59581b5 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.example.domainmodel, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.testing, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.domainmodel.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.classpath index 5ff541c3fe7..37e9e802fca 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs index 7e481eda04f..47ded52f6e3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF index 01d7b6d3276..5d64f0d094b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.domainmodel.ui.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.classpath index 3412d98104b..d0f0ae0b74b 100755 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.settings/org.eclipse.jdt.core.prefs index 5e93b8885f8..549f9c0c580 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -128,7 +128,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF index 174bde57e0d..25b9bfaf5a9 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtext.xbase.ui Import-Package: org.apache.log4j, org.eclipse.xtext.ui.codemining;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.domainmodel.ui.autoedit, org.eclipse.xtext.example.domainmodel.ui.contentassist, org.eclipse.xtext.example.domainmodel.ui.editor, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.classpath index 5ff541c3fe7..37e9e802fca 100755 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.settings/org.eclipse.jdt.core.prefs index 7f624811123..cf601e0eced 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -133,7 +133,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF index 719751ab832..8f67a948630 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.domainmodel, org.eclipse.xtext.example.domainmodel.domainmodel, org.eclipse.xtext.example.domainmodel.domainmodel.impl, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.settings/org.eclipse.jdt.core.prefs index 6044e30fb1a..6caf657859f 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF index ce656351649..af876fe60cc 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ide, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.fowlerdsl.ide;x-internal:=true, org.eclipse.xtext.example.fowlerdsl.ide.contentassist.antlr, org.eclipse.xtext.example.fowlerdsl.ide.contentassist.antlr.internal diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF index 830992a1e00..81368925bcf 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.example.fowlerdsl, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.junit, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.fowlerdsl.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.classpath index 13b68c0cea7..c752995f2c3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.settings/org.eclipse.jdt.core.prefs index 7e481eda04f..47ded52f6e3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF index 8b332dd9ce0..302107e5456 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.testing, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.fowlerdsl.ui.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.classpath index 5ff541c3fe7..37e9e802fca 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF index e2afc819a86..fca5034f935 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ui.shared, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.fowlerdsl.ui;x-internal:=true, org.eclipse.xtext.example.fowlerdsl.ui.contentassist;x-internal:=true, org.eclipse.xtext.example.fowlerdsl.ui.folding;x-internal:=true, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.classpath index 399404d3c35..0ffe82aa350 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF index 0b7756f6f0c..699822d9443 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.fowlerdsl, org.eclipse.xtext.example.fowlerdsl.formatting2, org.eclipse.xtext.example.fowlerdsl.generator, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.settings/org.eclipse.jdt.core.prefs index 6044e30fb1a..6caf657859f 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF index ddf2e0ccb49..3f124a5a7b7 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.example.homeautomation, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.homeautomation.ide;x-internal:=true, org.eclipse.xtext.example.homeautomation.ide.contentassist.antlr, org.eclipse.xtext.example.homeautomation.ide.contentassist.antlr.internal, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.settings/org.eclipse.jdt.core.prefs index 6044e30fb1a..6caf657859f 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF index 7d92a014742..892a2be61a1 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtext.example.homeautomation, org.eclipse.xtext.xbase.testing, org.junit;bundle-version="4.13.2", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.homeautomation.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.classpath index 13b68c0cea7..c752995f2c3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.settings/org.eclipse.jdt.core.prefs index 7e481eda04f..47ded52f6e3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF index ed1eeebbf90..e59c0ee5fd0 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.homeautomation.ui.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.13.2", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.settings/org.eclipse.jdt.core.prefs index 6044e30fb1a..6caf657859f 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF index b68a0661eba..b461ec14c00 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.ui Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.homeautomation.ui.contentassist, org.eclipse.xtext.example.homeautomation.ui.editor, org.eclipse.xtext.example.homeautomation.ui.internal, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.classpath index 5ff541c3fe7..37e9e802fca 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.settings/org.eclipse.jdt.core.prefs index ba2b4a8327c..4fdfb14e5ac 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -98,4 +98,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF index a8f24f62fdc..2e53294307c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.example.homeautomation, org.eclipse.xtext.example.homeautomation.formatting2, org.eclipse.xtext.example.homeautomation.jvmmodel, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.classpath b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.classpath +++ b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.settings/org.eclipse.jdt.core.prefs index f4d933e4eb7..9154beff79e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/META-INF/MANIFEST.MF index 7cb6b09de6c..e484898c744 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/xbase.tutorial/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xbase Tutorial Bundle-SymbolicName: xbase.tutorial Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase.lib Automatic-Module-Name: xbase.tutorial Export-Package: .;x-internal:=true, diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/.classpath b/org.eclipse.xtext.xtext.ui.graph.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.graph.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.graph.tests/.settings/org.eclipse.jdt.core.prefs index 7fdfe9aebd9..ca44839a04a 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.graph.tests/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -102,7 +102,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF index 9cd0ab15b33..316a0f76a2f 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Syntax Diagram View Tests Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.graph.tests Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xtext.ui.graph;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xtext.ui.graph/.classpath b/org.eclipse.xtext.xtext.ui.graph/.classpath index e801ebfb468..81fe078c20c 100644 --- a/org.eclipse.xtext.xtext.ui.graph/.classpath +++ b/org.eclipse.xtext.xtext.ui.graph/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.graph/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.graph/.settings/org.eclipse.jdt.core.prefs index cd8d812e39f..d9e9ff9ea05 100644 --- a/org.eclipse.xtext.xtext.ui.graph/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.graph/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF index 3bb32515457..89688d2e9c4 100644 --- a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.graph;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.xtext.ui.graph;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.actions;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.bundle;version="2.37.0", diff --git a/org.eclipse.xtext.xtext.ui.tests/.classpath b/org.eclipse.xtext.xtext.ui.tests/.classpath index 97ebc084ddc..3f979b90a8a 100644 --- a/org.eclipse.xtext.xtext.ui.tests/.classpath +++ b/org.eclipse.xtext.xtext.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs index 7fdfe9aebd9..ca44839a04a 100644 --- a/org.eclipse.xtext.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -102,7 +102,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF index a06d57a69a3..0567e7d9ad3 100644 --- a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Xtext Editor UI Tests Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xtext.ui/.classpath b/org.eclipse.xtext.xtext.ui/.classpath index 3412d98104b..d0f0ae0b74b 100644 --- a/org.eclipse.xtext.xtext.ui/.classpath +++ b/org.eclipse.xtext.xtext.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ui/.settings/org.eclipse.jdt.core.prefs index d80e00a67f3..e334f8cab46 100644 --- a/org.eclipse.xtext.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate @@ -124,7 +124,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF index 586a5c307dd..d4d605be0d6 100644 --- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.xtext.ide;bundle-version="2.37.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext.ui.editor.hierarchy;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.launcher;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.ui;version="2.37.0";x-friends:="org.eclipse.xtext.xtext.ui.tests", diff --git a/org.eclipse.xtext.xtext.wizard/.classpath b/org.eclipse.xtext.xtext.wizard/.classpath index ad0e9332730..518e4f37513 100644 --- a/org.eclipse.xtext.xtext.wizard/.classpath +++ b/org.eclipse.xtext.xtext.wizard/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index b59139a2f27..347ae634687 100644 --- a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Wizard Bundle-SymbolicName: org.eclipse.xtext.xtext.wizard Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: gradlew;version="2.37.0";x-internal:=true, org.eclipse.xtext.xtext.wizard;version="2.37.0";x-friends:="org.eclipse.xtext.tests,org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.wizard.cli;version="2.37.0";x-friends:="org.eclipse.xtext.tests", diff --git a/org.eclipse.xtext/.classpath b/org.eclipse.xtext/.classpath index 71b5d126ed6..b4cf6288358 100644 --- a/org.eclipse.xtext/.classpath +++ b/org.eclipse.xtext/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs index 18ec620d9e0..52469363592 100644 --- a/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled @@ -20,7 +20,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index f184785e26c..4156f77e4c9 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtext;version="2.37.0", org.eclipse.xtext.build;version="2.37.0"; x-friends:="org.eclipse.xtext.testing, diff --git a/pom.xml b/pom.xml index c2b62ab9f71..ed432cc3752 100644 --- a/pom.xml +++ b/pom.xml @@ -127,9 +127,9 @@ ISO-8859-1 4.0.9 - 11 - 11 - 11 + 17 + 17 + 17 false 3.3.0 From 5c089c263047c53fb3fbcdb37e4eae4cf3e75485 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 13:34:29 +0100 Subject: [PATCH 05/14] updated strictfp tests Also updated the byte code of Methods.class inside the testData.jar: it is now compiled with Java 17 --- .../access/impl/AbstractTypeProviderTest.java | 24 +----------------- .../access/impl/AbstractTypeProviderTest.java | 6 +---- .../common/types/testSetups/testData.jar | Bin 56264 -> 55010 bytes .../access/impl/AbstractTypeProviderTest.java | 14 +++++----- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java index 4ae5c0c6592..7f1aec22871 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java +++ b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java @@ -85,8 +85,8 @@ import org.eclipse.xtext.common.types.testSetups.Bug427098; import org.eclipse.xtext.common.types.testSetups.Bug428340; import org.eclipse.xtext.common.types.testSetups.Bug456328; -import org.eclipse.xtext.common.types.testSetups.CallableThrowsExceptions; import org.eclipse.xtext.common.types.testSetups.Bug470767; +import org.eclipse.xtext.common.types.testSetups.CallableThrowsExceptions; import org.eclipse.xtext.common.types.testSetups.ClassContainingEnum; import org.eclipse.xtext.common.types.testSetups.ClassWithVarArgs; import org.eclipse.xtext.common.types.testSetups.DeprecatedMembers; @@ -104,7 +104,6 @@ import org.eclipse.xtext.common.types.testSetups.StaticNestedTypes; import org.eclipse.xtext.common.types.testSetups.TestAnnotation; import org.eclipse.xtext.common.types.testSetups.TestAnnotation.Annotated; -import org.eclipse.xtext.util.JavaRuntimeVersion; import org.eclipse.xtext.common.types.testSetups.TestAnnotationWithDefaults; import org.eclipse.xtext.common.types.testSetups.TestAnnotationWithStringDefault; import org.eclipse.xtext.common.types.testSetups.TestConstants; @@ -112,7 +111,6 @@ import org.eclipse.xtext.common.types.testSetups.TypeWithInnerAnnotation; import org.eclipse.xtext.common.types.testSetups.TypeWithInnerEnum; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -2003,26 +2001,6 @@ public void testStrictFpType() { // strictfp on class declarations is not reflected } - @Test - public void testMethods_publicStrictFpMethod_01() { - // strictfp has no effect since Java 17 https://openjdk.org/jeps/306 - // and it doesn't seem to be present at runtime in 17+ - // see also https://bugs.eclipse.org/bugs/show_bug.cgi?id=545510#c6 - // for sure, it fails with Java 21 - Assume.assumeFalse("Ignored on Java 21 and later", JavaRuntimeVersion.isJava21OrLater()); - String typeName = Methods.class.getName(); - JvmGenericType type = (JvmGenericType) getTypeProvider().findTypeByName(typeName); - JvmOperation method = getMethodFromType(type, Methods.class, "publicStrictFpMethod()"); - assertSame(type, method.getDeclaringType()); - assertFalse(method.isAbstract()); - assertFalse(method.isFinal()); - assertFalse(method.isStatic()); - assertFalse(method.isSynchronized()); - assertTrue(method.isStrictFloatingPoint()); // it fails with Java 21 - JvmType methodType = method.getReturnType().getType(); - assertEquals("void", methodType.getIdentifier()); - } - @Test public void publicNativeMethod() { String typeName = Methods.class.getName(); diff --git a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java index 98e882848d3..b26bc161b49 100644 --- a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java +++ b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java @@ -104,7 +104,6 @@ import org.eclipse.xtext.common.types.testSetups.StaticNestedTypes; import org.eclipse.xtext.common.types.testSetups.TestAnnotation; import org.eclipse.xtext.common.types.testSetups.TestAnnotation.Annotated; -import org.eclipse.xtext.util.JavaRuntimeVersion; import org.eclipse.xtext.common.types.testSetups.TestAnnotationWithDefaults; import org.eclipse.xtext.common.types.testSetups.TestAnnotationWithStringDefault; import org.eclipse.xtext.common.types.testSetups.TestConstants; @@ -112,7 +111,6 @@ import org.eclipse.xtext.common.types.testSetups.TypeWithInnerAnnotation; import org.eclipse.xtext.common.types.testSetups.TypeWithInnerEnum; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -2026,8 +2024,6 @@ public void testMethods_publicStrictFpMethod_01() { // strictfp has no effect since Java 17 https://openjdk.org/jeps/306 // and it doesn't seem to be present at runtime in 17+ // see also https://bugs.eclipse.org/bugs/show_bug.cgi?id=545510#c6 - // for sure, it fails with Java 21 - Assume.assumeFalse("Ignored on Java 21 and later", JavaRuntimeVersion.isJava21OrLater()); String typeName = Methods.class.getName(); JvmGenericType type = (JvmGenericType) getTypeProvider().findTypeByName(typeName); JvmOperation method = getMethodFromType(type, Methods.class, "publicStrictFpMethod()"); @@ -2036,7 +2032,7 @@ public void testMethods_publicStrictFpMethod_01() { assertFalse(method.isFinal()); assertFalse(method.isStatic()); assertFalse(method.isSynchronized()); - assertTrue(method.isStrictFloatingPoint()); // it fails with Java 21 + assertFalse(method.isStrictFloatingPoint()); // not available anymore since Java 17 JvmType methodType = method.getReturnType().getType(); assertEquals("void", methodType.getIdentifier()); } diff --git a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/testSetups/testData.jar b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/testSetups/testData.jar index ad488cbe3790a4b47270837163db9ab3d7dc1a51..ca7e6c4e13abb3776d82161c0004f84a79677f2e 100644 GIT binary patch delta 4979 zcmZWsdpuRy9zSP0goERK2x;F;qz*?3G-XtZ`WAr`WSV^GIlk1MD-8S2cy46ZNo)c86O31D8C-};&3E0+% zVK8MXWY!pxm!|r1aVaadhG#WmvUb8MxmdGS3g`27F^t~;brD2#r1}>bb5|cY0 zxyeBc{U8Q?TN{#QX~0b&X!*wRF^|V9;*-iL9^9z$WibgE7}XA&5Cn8y0PJj0A#qbT zbMbp@_|9)Dn!TlnmTj{R>c*60Z<2r*J@}4E&;8dA%DY*o*ZpDr}v&A|4p5cZF zYxiIKZv=Hu1-y37fJ5FYWUgNdw~ziA_eZRma``Y(OA3c*bz&Oe$Sv?{;yS&VXfqjO zv6La@flIk2iKnmaWxA$}Ca$1kYeyo3mdk6L&?1H^RclCSnF21s&9b9$5Ty$}q>$-s zK$1hE-W#_v^qWqmEgYmc1smS7~xN4*s)Ct(e+y7QFI3vh=JWFEu*-R zdk~BZ+j+H5gmUQZov}rHCT+%^`gSdA`-p2jk~>1 zDylk~F-Zs}S;$n2SBM6D8UHh#DR}7ZN%(Na|V#E|uy7V}5nP z7-;u0pZPJ{!lk1jK5$MaDQe_H~X=!1$fSleK!bKn)>ilI0 z@%!=dEJz_N{iSS6-F{>au`Mafh~ZZJo6nF}5n_%|GvML@j$IH;c3W$HT?w9wEE>ZNRBVll114$i3(H zh@maY8m}jFaxYh(TUF9Q=M}?PRSTa?$n)pwETh8WwGjV^fb7`zp0bTs#=>d$nv=!b z-MKFP(m+~-E(HRHSmb~CwsNMQ?nUD76w8<9ee9J3+P&&f@!dGc>{B5fh2e6{1*jf7 zmm-p1^!}pa_lx0Nu{A8{Hw1c5yZlV`i;2P4T1p&N#@}sN{t63=$JY2F-J~RAzlaOA z^;%Q!EL2-iq_TKBS6Azwq}+$@>3o(D?1#({&Xio0<%}9&7-bE&RrR1@K!v<29WTe; zjVk7*VNRcPPy{)LZgY^WIao?F6y1Y;T7sXcFlZQ5ArHTK|MBY{WQ!+T4u8i5H5_-L zb^?0pQSA5TOqC8faC9=)rnWz&X%$8;S7zB1T`wS}$2W2>kHpDG%bsI#aTtpwCV5(} z$_;b-U72+(s@o}KyFCf~c0HGM8{HQAOqLZ9C_Bx{#PPp2T(jDW$A4O&nI$5cjb;w; z(+yoRaC$P=?8kMZ5RPV%Xf}^MDdmA82)l`=pkj%Dg&du)Jw;gs&BaddFR+=D+PaedJ^rgdD*4*TBIb~OxplUy_tI+DUum6+O((E}X z2hD_YwIU0A9yOKdobn2480cJlAiP84?dshIR?)8OmKwBOEK-?TpQjk{uQXf3#x>#qIc-N1eK zHRQw^LHx2SgAYyD=2YIHua7GgHeY>c(w*Jy9#?oYy5_gPTr}!m9#!&jPoG(>_B5kl z{J1?P+P)Vqg>6xbk1RYtWVWe!(bkeo)mc6~rEB#Xx4u{vDKs6-GP}KF-#zcv^=W^< z(h9o&pyASM&&I#YPFHjcJlZ6FUTJ#vt@}t_)|M|$SqA^Dw7{R8CuMus15ft(;vOcl z9ASn*+iH`{lHkCgCQt26{=2*-A;DgC`;t8am*uy9wcO5PmR_?`Zu%6H#UZtU>+ME~ ztC61Q9WS%!(;LaddDrhfJAbKoU&%R-3(N2D5-XA>wIv@f)De4Gt&oh~%Bva9+CP6$ zb63PPdq?l$QYl&d$}*-k_JoNWv^P}!9QG(KVN&-{;9r^H2fx^Cf44h(o2rISbhAaBzw+Z{Od^Ps}Psoyn_6H#caE#yf%gR@X=`Yklu5b zN>l3`#hSP*ad@`mV&bkC+m69^xj<7b;~_ZyWB95@7cEO`Xubmk*GTZG zV2*3eTAKR93_kUq$vhB5HY?&|)~);CpN;AWb7&Mz!z<7fp4T$jen;VNG*tFYXI=yl z_JbA*SN=d#D<&ZX2~<=W!kv#a6krUY@~s6_)=MGHQly~pKTlK3EM@U^;naDYd!Y@5 zl~!o&3_~3Ph|bf*;h)J-UPn{=t--6+zOY^!*E;nyl`;(tT_C9*FHNn;L{#Ac+$$ar=p;2IwqSA+Z`3*-9d%DJ-pPB;`A;Aw+5!lISn+GIuon(f&ym^ z$hg4>FQ8E32%l!yfnFoi&&iE6|03`kBsh$!!3#H2h2jo3($qX0rP)4d!$u9ooMufl zKM#h{F}{h}i0w@@<>!VQ;i3@X6$%Huu&FlS>Z_%oh`2~o9X{-~&Gpk(P;{cAV2-Sz z>R=im1Zgva{NrYtGMLLM$^$1UcvPX{J3n@BB7+ojOlYC0D1Y#3iA48xK#> zhbY!Ep_Qf<%*TE4M#~&rqy{79q!1Zy3@=)l?0=xJDwO5nqBdg`B(>30LKq82+O7$k zmuV_M8b;+$i)Bhnv|ij!Q{OLT8S&L+W-FUfa5a*(Q2Rtj!BujJrY0|E6=M^#o`w8f z{b5k%@#f+e^TXfsXbe3I)Y#BQmubp)6+#Vzt}X`qeiQ_)#?l?2D`6beU1Nkw9W-_E zKeBUUE@MYF3e{s-m_r>?(MqF}rbwKu5N68Ne~;$FaLeO)eSm`h1tu~Khl$6>!B8hd z^OqRqVG^6mugmCtgb#Brk2i-CVPGxG&@&swvJwWmXliW=iz6&u1RjG-32r~qRCy{| zDl+Z}3Ky+^kGQs)>9&41a`Q8=%kom_bQTJ4rQ@NQ3D>(Bt4Ao->+~rx8^xIV|bsZ&wG~UIw;PFHQX? zmre65-%J6}X;l1_hk*jo%Dj)Jw7+6EZEPfE5Eh`Yc{>X6WeNO#n({4RFD#8c2C_ya zp)hU-T1^u*M{(}pUFDzD$U;wUVRdLPr#=A#tL~euF}*qKtOiTbCu!t6BO*& z%?9xpV6LU80h-?myZR-v5tG5vJwQ_)d*2gPIw(fr+(DYk*{9GXG0u~$H7Xp6Ww@+i zKFh)IYc%CpBD-?6;oLRGvK56@r7{L79;zAFX=?p9Y{IAIMhf^3qoSn@`!*BaTxUY4 z-=L}7BQkF5L)r~S_&Ey2$5`P{H<(*`6a}Tn*?40E9#eYqO`3`d+6%t z!rlYty&fLCP+u9o_)X)b%QySp^}Sb%N$t~#O}lAr^vxS(Q{y=+8dm)Aaf#!WDL>o^ zn^1q^cv3OfeneOdOTG_D+P&n?&-Z*gjRK~mcAi~bn3F6ni^r@%Y+YeednZ-W&+NyCUdtQnu<7%QoMt5BA-b;U|7A zl~0@(KP0z!oR09s^tB7jc7Ny4Hsp1^C7U&T;YC+>UyUPXrpcl;Rq;ElHp>RnAC;7pj7Vg`x8S~TGHfmqa~0;37zC}- zjXUAMU|>}mxJPOSl?pZJ*e2$DhZ+#K8z+Z1Yops<0kIJHfWL_yq-0CDvSA(qHK8b3 zJh2$kMMDKH&=Mkp8^zk(+~I1(cWLRRKo#_@tU{5#GOoTdt zU#gTdv`HgDBlm|cTZ2Jmd_Dei%r$wYu}osN;rF~BtA;fT%l(&kT7+7Zq`K+N%Ja5y ziLB{(V)|=K?Sku^^m*Y#i{+idSJMJ7Jv)(fKSeQaY)-WE-U#PU@1Ar?m9#noj9KQ* zo{Fp^0ic?7E$y0R(e4?0wylKF-_ufu<~ggsG;VDlo~!92kOwV2_WiM^2S1uE%uOC4 z_;Xmerm6bQo3|Vdnw?h-`Z-kV_Nzr^A&maC+PlH78(Tj6E#Jhb4Lcl|P*7&`F+$-L zuB-AiW5N9P+?2MF836|>&Zm~O&Q=w-JKY^BGh+W}WfyoopK{-3YF^z#c78+IF59Yy zwU3X-{dFts<%T2O8Fj`!)%oj%dTVOO1>`56i|URoT)t#eK|<5`XZk(0&w_qx*?Y)V zrCZo%-PzstPt?`GtZ~fy&%KSSI=$SE-zd8`ND;+ZT^ASsd-HAc>3crPrTO!Qw{JL= zpV%fSPO@HKUg@6_IQOH^iRxK- zXf<_N-#@?Yy63scxla}6T=d_YmPOpW-z(f+l)joF1HRkQNaMfQuyM3u0!K0nnR`{a zC$^i(6i!}Ub}LE@xUP}=hPU~=g+sVloIkJYP zUN}avs$>J;PQ8@dC^IHgVhhh7=pyU}KSj=PTr`S%JZ1)Q>8Vv>H4$}dsmtnBV<2VR zTg2pcCOmnJljp}{a^TtNyn zr%oOlh6UPAq)&UAsj zDzrFlZ-1hWDrnzHYN1Ni0i?W`vJEuJ&!gj2pFdr$!h9U~O8S#Za(8B|AVE)m>Ko>V zNHM>^c+a4)Qj0s}+d>Ej=goJ1Fgf)bAT)F={g44h0rgj5y|Dh*?97@nMmU5c2 z!w9Zb=Gqg0I9GbC1fGOYW);gd&5;oGeVetOTBzQ`tGy`S&H`O-VsHv^Zn?O6Nh~^_ zMoDqaAwp%8mNztLRwL>?k8+|zWV%3|AoOJ4*YskF+i8k`M6t3uT*|^2Ql5wpO~K*l zkDpq?)%>&}=NsBcni&6b|GgS);ua0s6orUnq6txp@1gRs;$*{l^gD|$of9oxc7!#F zsZ!gUWsF`w@VZ%$o97MIKX#+axb?&OYX}SFRrAQz5$oUD`Wge# z+LH3xnrjEhiz|%VLjt_<=ycD*0P{pNKzIUOipf`Y=1f3{4u#5?>w78h_76 z#cHY`Lls}I#XU&MCUtWhJgI9pD(CSRi0}TLdUNh!@?fGbc=qT!^2xl*7cYz!&o5Pz z=%V*JhIb+L8eZoLFJfizxIx05T1O|#YQdaHGFd(Rm&~jGXy|amf0;^%9rV5S)ERxZ z{J;2|V*O~6;8lAc3vC3Z6QDQ5l&YXxG59p9bFLe&lF+R|2dB0o)Juh4H$|fX7rmKY zqJKLgv`OW9s8jL~v#-?SEVfvah}YrrZ$nTSPL<@dosoVU-A!7yZdom6GMLX~DfsUW z;yN-)37IyvVXyZi89iEUI?XYqgSZEog9wqxyOj(7MPwvJ0&&^XtjalNQ8KmdRjr;F zkG2t?5#+ROZq|T*x3wX*R35E*1+j?)>y0=g&T0osyk3|eZDNSHS3Dm%eFN;;`46fN zN&X&t3qcXQDws3`-vGwk>s=ls#UJ|6Tlj0w(2XeE!9RzRvmJIA)gT9uA8$=gx_1dlz4YqJs>PW4QM%;Z*4zoiS=5Mw`=23$pZJu?q)89N z5r?-w?YCWu4(n*_eR=Uj81FLMW5fU<*`a76ELA*uZ;3)H8v44j9n7Du4LjSUoZ69K zVsLpyF9e~%d}uR6st zpKM|4sbEqVlP_-zJa1os_}AN!keWXhJdf+c5nGAI7u_2>5*;5P0vU7`>O)8g%XHeK zM@LYUm{XG1Q1oF86^%O0^PYK{Wv~vUp!mvwk>~hYoJFy#1B%DM^D!FGp^$)eDf*iT z$1}%6d?|00fg+hBHpmCcYWO@vXIQ~ING%%$erISIAo>i;>~*0L__u>4$q?o`O5o!e zF*9K@mev{H3_PF3Wh|5CMy;EjzO*gK)H+dK$a+C10Z3^0TJm-7o zStfBA<~#v z>6Lu3)EP^DSYJm=!25!j3ICaT+^#^)dav9fSJ6e+Kssjxf*5KB} z7sjs%_xiuM>Ryyu4gTD<8wv3jaBMTn$g}CzZf@om;4q3ZbI?KtubNHxVQ66)<9!1Y zxNE2OK%cgvDkitTM*LzLwzABa17DHRflaM^?Wbl-K+!5@JPy(nlCurqb1TnN`wGi6 zAL2&|PjUZe Date: Tue, 29 Oct 2024 16:13:04 +0100 Subject: [PATCH 06/14] updated EMF deps in BOM and MANIFESTs --- org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.core/META-INF/MANIFEST.MF | 2 +- .../xtend-annotation-examples/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.standalone/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.builder/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.dev-bom/pom.xml | 12 ++++++------ org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.java/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase/META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext/META-INF/MANIFEST.MF | 6 +++--- 33 files changed, 56 insertions(+), 56 deletions(-) diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 1a38d5cc914..80b5834df10 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.hamcrest.core;bundle-version="1.1.0", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.equinox.common;bundle-version="3.16.0", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.emf.ecore, org.eclipse.xtext.builder;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index defcaf14d18..172cd151d56 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -51,7 +51,7 @@ Export-Package: org.eclipse.xtend.core;version="2.37.0";x-friends:="org.eclipse. org.eclipse.xtend.core.xtend.impl;version="2.37.0";x-internal:=true, org.eclipse.xtend.core.xtend.util;version="2.37.0";x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext;bundle-version="2.37.0", 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 d9df3d1d75c..509af2f0d15 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 @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtext, org.eclipse.xtext.xbase.testing, org.eclipse.jdt.core, - org.eclipse.emf.codegen;bundle-version="2.22.0", + org.eclipse.emf.codegen;bundle-version="2.23.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.equinox.common Export-Package: extract, diff --git a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF index e52d184c200..4e6cd683def 100644 --- a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.pde.core;bundle-version="3.15.100", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.apache.ant;bundle-version="1.10.1", org.eclipse.xtend.ide;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index ec0cc0f38ae..4d05ed298fa 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtend.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index 96e3a931baa..27827b1e48a 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-Version: 2.37.0.qualifier Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0";visibility:=reexport, com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport, - org.eclipse.emf.codegen;bundle-version="2.22.0";visibility:=reexport + org.eclipse.emf.codegen;bundle-version="2.23.0";visibility:=reexport Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF index 8b5de236e07..e46b84785bf 100644 --- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.builder;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.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.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui;bundle-version="3.201.0", diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index 392c38aefbc..a2136736f24 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -46,7 +46,7 @@ Export-Package: org.eclipse.xtext.builder;version="2.37.0", org.eclipse.xtext.builder.trace.impl;version="2.37.0";x-internal:=true, org.eclipse.xtext.builder.trace.util;version="2.37.0";x-internal:=true Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, 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 3348dd627a3..c7cfdaae28f 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 @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.16.100", @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.jdt.launching;bundle-version="3.19.500", org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", 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 b11446bf1b4..fb9dfcf8575 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.common.types.ui Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.core.runtime;bundle-version="3.24.100", diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index c0380cb2163..317620596db 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.common.types;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext;bundle-version="2.37.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)", org.eclipse.xtend.lib;bundle-version="2.37.0" diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 4e911deda70..57e9a9e0bab 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -208,32 +208,32 @@ org.eclipse.emf org.eclipse.emf.codegen.ecore - 2.29.0 + 2.37.0 org.eclipse.emf org.eclipse.emf.codegen - 2.22.0 + 2.23.0 org.eclipse.emf org.eclipse.emf.common - 2.24.0 + 2.30.0 org.eclipse.emf org.eclipse.emf.ecore.change - 2.14.0 + 2.16.0 org.eclipse.emf org.eclipse.emf.ecore.xmi - 2.16.0 + 2.37.0 org.eclipse.emf org.eclipse.emf.ecore - 2.26.0 + 2.36.0 org.eclipse.emf diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index 19df4ba1cc2..5fdcb0e01e3 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtext.ecore;bundle-version="2.37.0", org.eclipse.xtext.testlanguages;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 9a0f9138350..b7c1b542760 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.equinox.common;bundle-version="3.16.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.14.0,3)" + org.eclipse.emf.ecore.change;bundle-version="[2.16.0,3)" Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.ide;version="2.37.0"; x-friends:="org.eclipse.xtend.ide, diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index 4c1d810e8ea..13c116c94e9 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;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.jdt.core;bundle-version="3.29.0", - org.eclipse.emf.common;bundle-version="2.24.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.common;bundle-version="2.30.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.jdt.facade;bundle-version="2.37.0" Export-Package: org.eclipse.xtext.java;version="2.37.0", org.eclipse.xtext.java.resource;version="2.37.0" diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index e98dcb3b4d0..8653386ad49 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.mwe.utils;bundle-version="1.14.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index 6c9011850f8..90c6a1bd2bd 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -7,9 +7,9 @@ Bundle-SymbolicName: org.eclipse.xtext.testlanguages; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xtext.generator;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, + 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.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 39631a0376e..f3880fa51dd 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.mwe.utils;bundle-version="1.14.0", - org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF index 6f0ae6765bd..c14e8b95e60 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.37.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.37.0", org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, diff --git a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF index 458b32d8769..c96b0d859fa 100644 --- a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates;singleton:=true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + 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.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0" diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF index 3a0289bdab3..05894a3c8c3 100644 --- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional, org.eclipse.jdt.launching;bundle-version="3.19.500";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder.standalone;bundle-version="2.37.0", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional, + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional, org.eclipse.pde.core;bundle-version="3.15.100";resolution:=optional, org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional, org.eclipse.core.filesystem, diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF index 07b19171850..73af69d7ce3 100644 --- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xtext.ui;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui;bundle-version="3.201.0", org.eclipse.xtext.builder;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 5bec75f1d20..8933ffbd607 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -45,7 +45,7 @@ Export-Package: org.eclipse.xtext.util;version="2.37.0"; org.eclipse.xtext.xtext.ui, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.tests" -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", com.google.guava;bundle-version="[33.3.1,34.0.0)";visibility:=reexport, com.google.inject;bundle-version="7.0.0";visibility:=reexport, com.google.guava.failureaccess;bundle-version="[1.0.2,2.0.0)";visibility:=reexport, diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF index e0f9fb75c2d..f5022c32c82 100644 --- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testlanguages; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.37.0";resolution:=optional;visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + 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.common.types;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index 7c78ee5e2d9..7ef66efe658 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.37.0", org.eclipse.xtext.xbase.testing;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.hamcrest.core;bundle-version="1.3.0", org.eclipse.xtext.xbase.testlanguages;bundle-version="2.37.0", org.eclipse.core.runtime;bundle-version="3.24.100", diff --git a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF index 1b27ad80c86..30142f14a06 100644 --- a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + 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.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF index 64e3e911eb0..815e06ac3e3 100644 --- a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optiona org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xtext.generator;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";visibility:=reexport, + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.14.0";visibility:=reexport, org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";visibility:=reexport, org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";visibility:=reexport, diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index b937e3127c6..1459fe6df67 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";x-installation:=greedy org.eclipse.xtext.xbase.lib;bundle-version="2.37.0";visibility:=reexport;x-installation:=greedy, org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.xtext.ecore;bundle-version="2.37.0", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";visibility:=reexport;x-installation:=greedy, - org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport;x-installation:=greedy, + org.eclipse.emf.ecore;bundle-version="2.36.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional, org.eclipse.equinox.common;bundle-version="3.16.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF index 89688d2e9c4..5dc9ff04f26 100644 --- a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Export-Package: org.eclipse.xtext.xtext.ui.graph;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.figures.primitives;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.trafo;version="2.37.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.emf.ecore;bundle-version="2.26.0", + org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.ui;bundle-version="3.201.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.16.100", diff --git a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF index 0567e7d9ad3..3eeaa7f7fbe 100644 --- a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.emf.common;bundle-version="2.24.0", + org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF index d4d605be0d6..2d0ea7b2023 100644 --- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.debug.ui;bundle-version="3.16.0", org.eclipse.help;bundle-version="3.9.100", - org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", + org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.eclipse.core.expressions;bundle-version="3.8.100", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index 347ae634687..285f34b1e49 100644 --- a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Import-Package: org.apache.log4j;version="1.2.24", Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional, org.eclipse.xtext.util;bundle-version="2.37.0", - org.eclipse.emf.ecore;bundle-version="2.26.0" + org.eclipse.emf.ecore;bundle-version="2.36.0" Automatic-Module-Name: org.eclipse.xtext.xtext.wizard Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index 4156f77e4c9..b0476e69d6f 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -202,9 +202,9 @@ Export-Package: org.eclipse.xtext;version="2.37.0", org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.ecoreInference;version="2.37.0";x-friends:="org.eclipse.xtext.extras.tests,org.eclipse.xtext.tests", org.eclipse.xtext.xtext.parser;version="2.37.0";x-friends:="org.eclipse.xtext.eclipse.tests" -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, - org.eclipse.emf.common;bundle-version="2.24.0", +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.37.0";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, + org.eclipse.emf.common;bundle-version="2.30.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.emf.mwe.core;bundle-version="1.14.0";resolution:=optional;visibility:=reexport, From 34fc3bbb360cefeca68bfefe340a503370f01ebc Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 29 Oct 2024 18:52:20 +0100 Subject: [PATCH 07/14] updated Eclipse deps in BOM and MANIFESTs --- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.xtend.core/META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.xtend.ide/META-INF/MANIFEST.MF | 8 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 8 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../META-INF/MANIFEST.MF | 6 +- org.eclipse.xtext.dev-bom/pom.xml | 117 ++++++++---------- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ecore/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 4 +- org.eclipse.xtext.java/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 2 +- .../eclipsePlugin/META-INF/MANIFEST.MF | 2 +- .../eclipsePluginP2/META-INF/MANIFEST.MF | 2 +- .../full.parent/full/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoApp/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoFatjar/META-INF/MANIFEST.MF | 2 +- .../mavenTycho/META-INF/MANIFEST.MF | 2 +- .../mavenTychoJ17/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2J17/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2J21/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.xtext.ui/META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 10 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../wizard/RuntimeProjectDescriptor.xtend | 2 +- .../wizard/RuntimeProjectDescriptor.java | 2 +- org.eclipse.xtext/META-INF/MANIFEST.MF | 4 +- 72 files changed, 180 insertions(+), 199 deletions(-) diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 80b5834df10..28f282696d5 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", org.hamcrest.core;bundle-version="1.1.0", - org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.equinox.common;bundle-version="3.16.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.16.100", + org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.emf.ecore, org.eclipse.xtext.builder;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.xtext.builder.standalone;bundle-version="2.37.0", org.eclipse.xtext.java;bundle-version="2.37.0", org.eclipse.draw2d diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index 172cd151d56..b7756f6079d 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -50,13 +50,13 @@ Export-Package: org.eclipse.xtend.core;version="2.37.0";x-friends:="org.eclipse. org.eclipse.xtend.core.tests", org.eclipse.xtend.core.xtend.impl;version="2.37.0";x-internal:=true, org.eclipse.xtend.core.xtend.util;version="2.37.0";x-internal:=true -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.xtext.smap;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF index 8fb72044a8f..3f699795b78 100644 --- a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtend.examples;singleton:=true Bundle-Version: 2.37.0.qualifier Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.emf.common.ui;bundle-version="2.20.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF index 72a4dd79f98..c0b95d40554 100644 --- a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext.ide;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xbase.ide;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional + org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.37.0";x-friends:="org.eclipse.xtend.ide", org.eclipse.xtend.ide.common.contentassist.antlr.internal;version="2.37.0";x-friends:="org.eclipse.xtend.ide", diff --git a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF index 4e6cd683def..6bbd929cc44 100644 --- a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF @@ -9,22 +9,22 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0", - org.eclipse.core.resources;bundle-version="3.16.100", - org.eclipse.jdt.core;bundle-version="3.29.0", + 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.emf.codegen.ecore;bundle-version="2.37.0", org.apache.ant;bundle-version="1.10.1", org.eclipse.xtend.ide;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.jdt.ui;bundle-version="3.26.0", - org.eclipse.jdt.launching;bundle-version="3.19.500", + org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.xtext.builder;bundle-version="2.37.0", org.eclipse.search;bundle-version="3.14.100", org.eclipse.jdt.core.manipulation;bundle-version="1.16.0", - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.xtend.ide.tests.data;bundle-version="2.37.0", org.eclipse.xtext.ide;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF index 194942c3138..8d954a3903e 100644 --- a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF @@ -15,15 +15,15 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0", org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", org.eclipse.xtend.ide.common;bundle-version="2.37.0";visibility:=reexport, org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + 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.core.filesystem;bundle-version="1.9.300", + 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.launching;bundle-version="3.19.500", + org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.ltk.ui.refactoring;bundle-version="3.12.0";resolution:=optional, - org.eclipse.jdt.debug.ui;bundle-version="3.12.600", + org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index 4d05ed298fa..1befbf1a1f5 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", - org.eclipse.core.resources;bundle-version="3.16.100", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.ide.tests;bundle-version="2.37.0", org.junit, org.eclipse.emf.mwe.utils;bundle-version="1.14.0", diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index 27827b1e48a..20ea5f8ea26 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0";visibility:=reexport, com.google.inject;bundle-version="7.0.0";visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.29.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" diff --git a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF index 576b87ec98e..bbddd616507 100644 --- a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Bundle-Activator: org.eclipse.xtext.activities.Activator -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100" +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0" Export-Package: org.eclipse.xtext.activities;version="2.37.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.activities diff --git a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF index eabaf5133f4..dd2b38e6e7c 100644 --- a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, org.eclipse.emf.ecore, org.eclipse.core.runtime, org.eclipse.equinox.common diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF index e46b84785bf..dc3174960ba 100644 --- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ecore;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index a2136736f24..079e3a62d9e 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -47,21 +47,21 @@ Export-Package: org.eclipse.xtext.builder;version="2.37.0", org.eclipse.xtext.builder.trace.util;version="2.37.0";x-internal:=true Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, + 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.xtext.ui;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.launching;bundle-version="3.19.500";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.xtext.xbase.lib;bundle-version="2.37.0";visibility:=reexport, org.eclipse.emf.ecore.editor;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.core;bundle-version="3.19.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.jdt.debug;bundle-version="3.19.100";resolution:=optional;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.xtext.smap;bundle-version="2.37.0" Bundle-ActivationPolicy: lazy 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 c7cfdaae28f..ea1e763b410 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 @@ -10,10 +10,10 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.core.resources;bundle-version="3.16.100", - org.eclipse.jdt.core;bundle-version="3.29.0", - org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.jdt.launching;bundle-version="3.19.500", + org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.37.0", 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 31c4f5d531f..6ca5520711c 100644 --- a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Export-Package: org.eclipse.xtext.common.types.provider;version="2.37.0" Bundle-Activator: org.eclipse.xtext.common.types.provider.TypesEditPlugin$Implementation Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.emf.edit;bundle-version="2.16.0", - org.eclipse.core.runtime;bundle-version="3.24.100" + 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/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF index 11cfee8ec67..04828247f22 100644 --- a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF @@ -6,16 +6,16 @@ Bundle-SymbolicName: org.eclipse.xtext.common.types.shared;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Activator: org.eclipse.xtext.common.types.shared.Activator Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.xtext.builder;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", - org.eclipse.debug.core;bundle-version="3.19.0";resolution:=optional;x-installation:=greedy, + 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.jdt.debug;bundle-version="3.19.100";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 Export-Package: org.eclipse.xtext.common.types.shared;version="2.37.0";x-internal:=true 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 fb9dfcf8575..3677072e96c 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-SymbolicName: org.eclipse.xtext.common.types.ui Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0";visibility:=reexport, org.eclipse.ui;bundle-version="3.201.0", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.core.resources;bundle-version="3.16.100", + 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.37.0", org.eclipse.jdt.ui;bundle-version="3.26.0", org.eclipse.search;bundle-version="3.14.100", diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 57e9a9e0bab..51dc8859255 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -125,7 +125,12 @@ git@github.com:eclipse/xtext.git - 3.33.0 + 1.10.2 + 5.10.2 + 2.20.0 + 1.14.0 + 0.23.1 + 3.37.0 ISO-8859-1 @@ -178,7 +183,7 @@ io.github.classgraph classgraph - 4.8.179 + 4.8.177 javax.annotation @@ -238,32 +243,32 @@ org.eclipse.emf org.eclipse.emf.mwe.core - 1.14.0 + ${org.eclipse.emf.mwe-version} org.eclipse.emf org.eclipse.emf.mwe.utils - 1.14.0 + ${org.eclipse.emf.mwe-version} org.eclipse.emf org.eclipse.emf.mwe2.language - 2.20.0 + ${org.eclipse.emf.mwe2-version} org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.20.0 + ${org.eclipse.emf.mwe2-version} org.eclipse.emf org.eclipse.emf.mwe2.lib - 2.20.0 + ${org.eclipse.emf.mwe2-version} org.eclipse.emf org.eclipse.emf.mwe2.runtime - 2.20.0 + ${org.eclipse.emf.mwe2-version} org.eclipse.jdt @@ -278,122 +283,122 @@ org.eclipse.jdt org.eclipse.jdt.debug - 3.20.100 + 3.21.300 org.eclipse.jdt org.eclipse.jdt.launching - 3.19.900 + 3.21.100 org.eclipse.lsp4j org.eclipse.lsp4j.debug - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j.generator - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j.jsonrpc.debug - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j.jsonrpc - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j.websocket.jakarta - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j.websocket - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.lsp4j org.eclipse.lsp4j - 0.23.1 + ${org.eclipse.lsp4j-version} org.eclipse.platform org.eclipse.core.commands - 3.10.400 + 3.12.0 org.eclipse.platform org.eclipse.core.contenttype - 3.8.200 + 3.9.300 org.eclipse.platform org.eclipse.core.expressions - 3.8.200 + 3.9.300 org.eclipse.platform org.eclipse.core.filesystem - 1.9.500 + 1.10.300 org.eclipse.platform org.eclipse.core.jobs - 3.13.300 + 3.15.200 org.eclipse.platform org.eclipse.core.resources - 3.18.200 + 3.20.100 org.eclipse.platform org.eclipse.core.runtime - 3.26.100 + 3.31.0 org.eclipse.platform org.eclipse.core.variables - 3.5.100 + 3.6.300 org.eclipse.platform org.eclipse.debug.core - 3.20.100 + 3.21.300 org.eclipse.platform org.eclipse.equinox.app - 1.6.200 + 1.7.0 org.eclipse.platform org.eclipse.equinox.common - 3.17.100 + 3.19.0 org.eclipse.platform org.eclipse.equinox.preferences - 3.10.200 + 3.11.0 org.eclipse.platform org.eclipse.equinox.registry - 3.11.200 + 3.12.0 org.eclipse.platform org.eclipse.osgi - 3.18.300 + 3.19.0 org.eclipse.platform org.eclipse.text - 3.12.300 + 3.14.0 org.eclipse.xtext @@ -408,42 +413,42 @@ org.junit.jupiter junit-jupiter-api - 5.10.0 + ${junit-jupiter-version} org.junit.jupiter junit-jupiter-engine - 5.10.0 + ${junit-jupiter-version} + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter-version} org.junit.platform junit-platform-commons - 1.10.0 + ${junit-platform-version} org.junit.platform junit-platform-engine - 1.10.0 + ${junit-platform-version} org.junit.platform junit-platform-launcher - 1.10.0 + ${junit-platform-version} org.junit.platform junit-platform-runner - 1.10.0 + ${junit-platform-version} org.junit.platform junit-platform-suite-api - 1.10.0 - - - org.junit.vintage - junit-vintage-engine - 5.10.0 + ${junit-platform-version} org.opentest4j @@ -501,30 +506,6 @@ - - - java-21 - - - java-21 - - - - - 3.37.0 - - diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index 5fdcb0e01e3..4c181860fe0 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.hamcrest.core;bundle-version="1.1.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF index 1c5a86f0e45..7e1d57f0e13 100644 --- a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Ecore Support Bundle-SymbolicName: org.eclipse.xtext.ecore;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index 561c051e811..b01ed656df8 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Export-Package: org.eclipse.xtext.enumrules;version="2.37.0", Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtext.ecore;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index 027443228e8..280aac5b356 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xtext.generator;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.ide;bundle-version="2.37.0", org.junit;bundle-version="4.13.2", org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional, diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index b7c1b542760..2b29a2c3242 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Localization: plugin Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, + 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)" diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index 13c116c94e9..0247215ea42 100644 --- a/org.eclipse.xtext.java/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.java/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.jdt.facade;bundle-version="2.37.0" diff --git a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF index e4f1dbf4679..5aa264be559 100644 --- a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.jdt.facade Bundle-Version: 2.37.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.jdt.core;bundle-version="3.29.0" +Require-Bundle: org.eclipse.jdt.core;bundle-version="3.37.0" Export-Package: org.eclipse.xtext.jdt.facade;version="2.37.0";x-friends:="org.eclipse.xtext.java" Import-Package: org.apache.log4j;version="1.2.24" Automatic-Module-Name: org.eclipse.xtext.jdt.facade diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 8653386ad49..947d9bdb698 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF index 34f5dca118c..cba471e9cec 100644 --- a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.xtext.logging;singleton:=true Bundle-Vendor: %providerName Bundle-Version: 2.37.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.core.runtime;bundle-version="3.24.100", +Import-Package: org.eclipse.core.runtime;bundle-version="3.31.0", org.osgi.framework;version="1.5.0" Export-Package: org.eclipse.xtext.logging;version="2.37.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.logging 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 d7822ccc07b..e48665f46bc 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-SymbolicName: org.eclipse.xtext.purexbase.eclipse.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0", org.eclipse.xtext.purexbase.ui;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF index 80c7c8db47c..76979d0ce78 100644 --- a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.purexbase.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.xbase.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF index 9a5bc4f77c2..4797338d0b8 100644 --- a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF @@ -16,11 +16,11 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.37.0";visibility:= org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.37.0", org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", - org.eclipse.jdt.debug.ui;bundle-version="3.12.600", + org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24", org.apache.commons.logging diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF index 0ce2b86555c..6d3e5826705 100644 --- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.xtext.purexbase; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0", - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.emf.ecore, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF index c0922d7b266..f61a76f3b51 100644 --- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;bundle-version="2.37.0";visibili org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtend.lib;bundle-version="2.37.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xbase.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index f3880fa51dd..0424f707162 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF index 1a051c5421f..c643786df2d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: eclipsePlugin; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePlugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF index 7c8bc942a54..2693f069487 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: eclipsePluginP2; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: eclipsePluginP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF index c7cfde45891..f22014b038b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: full; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: full diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF index 3fc5392e3da..7b454d583a7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: lsMavenTychoApp; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoApp diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF index c49478ef2f9..c6d2e9e2ed5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: lsMavenTychoFatjar; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: lsMavenTychoFatjar diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF index 0a796b99934..cab540663e2 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: mavenTycho; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTycho diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF index fc17baf335a..45fe5e25369 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: mavenTychoJ17; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoJ17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF index 11cbcbb9a58..3187a3c513b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: mavenTychoP2; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF index e64b8b66acb..88f03a88b6b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: mavenTychoP2J17; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: mavenTychoP2J17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/META-INF/MANIFEST.MF index b27e3d4e191..e00c7e6a4e2 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-SymbolicName: mavenTychoP2J21; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: mavenTychoP2J21 diff --git a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF index c14e8b95e60..fddb981c340 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.37.0", org.eclipse.ui;bundle-version="3.201.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.ui;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.xbase.testing;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF index 89a2d79e31b..3f6d37a733d 100644 --- a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.37.0";visib org.eclipse.ui;bundle-version="3.201.0", org.eclipse.xtext.builder;bundle-version="2.37.0", org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400", - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.ui.navigator;bundle-version="3.10.200", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ide;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF index 4259b9d007a..c1974f4b07c 100644 --- a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-Activator: org.eclipse.xtext.ui.ecore.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.ecore;bundle-version="2.37.0";visibility:=reexport, diff --git a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF index fdcdd9d3229..97a9a76ae78 100644 --- a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF @@ -8,11 +8,11 @@ Bundle-Activator: org.eclipse.xtext.ui.shared.internal.Activator Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional;x-installation:=greedy, - org.eclipse.core.expressions;bundle-version="3.8.100" + org.eclipse.core.expressions;bundle-version="3.9.300" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ui.shared;version="2.37.0", diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF index 05894a3c8c3..2cf76f3745d 100644 --- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF @@ -20,11 +20,11 @@ Import-Package: org.apache.log4j;version="1.2.24";resolution:=optional, org.junit.runners.model;version="4.13.2" Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional, - org.eclipse.jdt.launching;bundle-version="3.19.500";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder.standalone;bundle-version="2.37.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional, org.eclipse.pde.core;bundle-version="3.15.100";resolution:=optional, diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF index 73af69d7ce3..89aaeedda37 100644 --- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.tests;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", - org.eclipse.core.filesystem;bundle-version="1.9.300", + org.eclipse.core.filesystem;bundle-version="1.10.300", org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400", org.eclipse.ui.ide;bundle-version="3.13.1", - org.eclipse.jdt.core;bundle-version="3.29.0", - org.eclipse.jdt.launching;bundle-version="3.19.500", + org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xtext.ui;bundle-version="2.37.0", @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.testlanguages.ui;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.junit;bundle-version="4.13.2";resolution:=optional, - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.xtext.ui.testing;bundle-version="2.37.0", org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional, org.eclipse.compare, diff --git a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF index 742c1d45e1c..e4aa4379806 100644 --- a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.ui;singleton:=true Bundle-Version: 2.37.0.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.16.100";visibility:=reexport, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0";visibility:=reexport, + org.eclipse.core.resources;bundle-version="3.20.100";visibility:=reexport, org.eclipse.ui;bundle-version="3.201.0";visibility:=reexport, org.eclipse.ui.editors;bundle-version="3.14.300";visibility:=reexport, org.eclipse.jface.text;bundle-version="3.20.0";visibility:=reexport, @@ -14,16 +14,16 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100";visibility:=r org.eclipse.ui.views;bundle-version="3.11.100", org.eclipse.emf.edit.ui;bundle-version="2.17.0";visibility:=reexport, org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.search;bundle-version="3.14.100";resolution:=optional;x-installation:=greedy, org.eclipse.ltk.core.refactoring;bundle-version="3.12.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.ltk.ui.refactoring;bundle-version="3.12.0";resolution:=optional;x-installation:=greedy, org.eclipse.compare;bundle-version="3.8.300";resolution:=optional;x-installation:=greedy, org.eclipse.team.core;bundle-version="3.9.300";resolution:=optional;x-installation:=greedy, org.eclipse.team.ui;bundle-version="3.9.200";resolution:=optional;x-installation:=greedy, - org.eclipse.core.filesystem;bundle-version="1.9.300";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.launching;bundle-version="3.19.500";resolution:=optional;x-installation:=greedy, + org.eclipse.core.filesystem;bundle-version="1.10.300";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.ui.forms;bundle-version="3.11.300", org.eclipse.xtend.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF index 47e7b5af75c..32b81c5c60e 100644 --- a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF @@ -8,10 +8,10 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="3.37.0";visibility:=reexport, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100" + org.eclipse.core.runtime;bundle-version="3.31.0" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.xbase.testing;version="2.37.0", org.eclipse.xtext.xbase.testing.evaluation;version="2.37.0";x-friends:="org.eclipse.xtext.xbase.tests,org.eclipse.xtext.purexbase.tests,org.eclipse.xtend.core.tests", diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF index a2ea0755556..fb77910caf2 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testlanguages.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtext.xbase.testlanguages.ide;bundle-version="2.37.0", - org.eclipse.jdt.debug.ui;bundle-version="3.12.600", + org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.13.1", @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.37.0";vi org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.37.0", org.eclipse.compare;bundle-version="3.8.300", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index 7ef66efe658..4a69dc4b5a2 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.37.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.hamcrest.core;bundle-version="1.3.0", org.eclipse.xtext.xbase.testlanguages;bundle-version="2.37.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.xbase.testdata;bundle-version="2.37.0", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0", org.junit;bundle-version="4.13.2", diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF index b1a2809de6f..a8a74154f97 100644 --- a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-Version: 2.37.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.core.resources;bundle-version="3.20.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.ui;bundle-version="2.37.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.xbase.ui;bundle-version="2.37.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.ui.testing;bundle-version="2.37.0" Export-Package: org.eclipse.xtext.xbase.ui.testing;version="2.37.0";x-friends:="org.eclipse.xtext.xbase.ui.tests" diff --git a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF index 6939caa46e3..e17a1910cb0 100644 --- a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF @@ -8,10 +8,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0", - org.eclipse.core.resources;bundle-version="3.16.100", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.xbase;bundle-version="2.37.0", org.eclipse.xtext.xbase.ui;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF index bc2b6daaedd..1647a8a60b6 100644 --- a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF @@ -14,21 +14,21 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.37.0";visibility:=reex org.eclipse.xtext.common.types.ui;bundle-version="2.37.0", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.ui;bundle-version="3.26.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core.manipulation;bundle-version="1.16.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.shared;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.37.0", org.eclipse.jdt.junit;bundle-version="3.14.0";resolution:=optional, - org.eclipse.jdt.debug.ui;bundle-version="3.12.600";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.debug.ui;bundle-version="3.13.300";resolution:=optional;x-installation:=greedy, org.eclipse.debug.ui;bundle-version="3.16.0";resolution:=optional;x-installation:=greedy, org.eclipse.pde.ui;bundle-version="3.13.400";resolution:=optional, org.eclipse.search;bundle-version="3.14.100", org.eclipse.ltk.ui.refactoring;bundle-version="3.12.0";resolution:=optional;x-installation:=greedy, - org.eclipse.core.filesystem;bundle-version="1.9.300", - org.eclipse.jdt.debug;bundle-version="3.19.100", - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.core.filesystem;bundle-version="1.10.300", + org.eclipse.jdt.debug;bundle-version="3.21.300", + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.xtext.xbase.ide;bundle-version="2.37.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.37.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 1459fe6df67..3a20fa74a6f 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0";x-installation:=greedy org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, com.google.gson;bundle-version="2.10.1";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.xtext.generator;version="2.37.0", diff --git a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF index 8f29228136a..e634c65c270 100644 --- a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF @@ -4,9 +4,9 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.examples;singleton:=true Bundle-Version: 2.37.0.qualifier Require-Bundle: org.eclipse.ui;bundle-version="3.201.0", - org.eclipse.core.runtime;bundle-version="3.24.100", + org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.emf.common.ui;bundle-version="2.20.0", - org.eclipse.core.resources;bundle-version="3.16.100", + org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.ui.ide;bundle-version="3.13.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF index 1e051eccc5c..231c7a3e20b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext, org.eclipse.xtext.xbase, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF index 5d64f0d094b..1b14f59cc42 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel.ui.tests;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.jdt.core;bundle-version="3.29.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.example.domainmodel, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF index 25b9bfaf5a9..14221cfd355 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.compare;bundle-version="3.8.300", - org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.debug.ui;bundle-version="3.12.600", + org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.ui;bundle-version="3.201.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.13.1", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF index 8f67a948630..f9a88c2a85c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext, org.eclipse.xtext.common.types, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF index 302107e5456..638a4e6657a 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.example.fowlerdsl.ui, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF index 699822d9443..30a566db2d3 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext, org.eclipse.xtext.xbase, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF index e59c0ee5fd0..f4bff02cfcf 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.example.homeautomation.ui.tests;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", - org.eclipse.jdt.core;bundle-version="3.29.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.example.homeautomation.ui, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF index b461ec14c00..263bbaa1046 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.37.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.example.homeautomation.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.compare;bundle-version="3.8.300", - org.eclipse.jdt.debug.ui;bundle-version="3.12.600", + org.eclipse.jdt.debug.ui;bundle-version="3.13.300", org.eclipse.ui, org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui.ide;bundle-version="3.13.1", diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF index 2e53294307c..25f273d1772 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.equinox.common;bundle-version="3.16.0", + org.eclipse.equinox.common;bundle-version="3.19.0", org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext, org.eclipse.xtext.common.types, diff --git a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF index 5dc9ff04f26..875b1bf5343 100644 --- a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF @@ -13,11 +13,11 @@ Export-Package: org.eclipse.xtext.xtext.ui.graph;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.figures.layouts;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.figures.primitives;version="2.37.0", org.eclipse.xtext.xtext.ui.graph.trafo;version="2.37.0" -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.ui;bundle-version="3.201.0", org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.core.resources;bundle-version="3.16.100", + org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.draw2d;bundle-version="3.10.100" diff --git a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF index 3eeaa7f7fbe..88e7a45b24e 100644 --- a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.jdt.ui, org.eclipse.xtext.testing;bundle-version="2.37.0", org.eclipse.xtext.xtext.ui;bundle-version="2.37.0", diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF index 2d0ea7b2023..efa53e4bd31 100644 --- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Version: 2.37.0.qualifier Bundle-Activator: org.eclipse.xtext.xtext.ui.Activator Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.ui.ide;bundle-version="3.13.1", - org.eclipse.jdt.core;bundle-version="3.29.0", + org.eclipse.jdt.core;bundle-version="3.37.0", org.eclipse.debug.ui;bundle-version="3.16.0", org.eclipse.help;bundle-version="3.9.100", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", - org.eclipse.core.expressions;bundle-version="3.8.100", + org.eclipse.core.expressions;bundle-version="3.9.300", org.eclipse.xtext.ui.shared;bundle-version="2.37.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.ui;bundle-version="3.201.0", @@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.core.databinding.beans;bundle-version="1.8.0", org.eclipse.core.databinding.property;bundle-version="1.9.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.37.0", - org.eclipse.jdt.launching;bundle-version="3.19.500", + org.eclipse.jdt.launching;bundle-version="3.21.100", org.eclipse.xtext.xtext.ide;bundle-version="2.37.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index ab44dd21889..1a48533490f 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -80,7 +80,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { deps += new ExternalDependency => [ p2 [ bundleId = "org.eclipse.equinox.common" - version = "3.16.0" + version = "3.19.0" ] ] if (!isEclipsePluginProject && config.needsMavenBuild) { diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 339c19e6548..4367a06b696 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -110,7 +110,7 @@ public Set getExternalDependencies() { final Procedure1 _function = (ExternalDependency it) -> { final Procedure1 _function_1 = (ExternalDependency.P2Coordinates it_1) -> { it_1.setBundleId("org.eclipse.equinox.common"); - it_1.setVersion("3.16.0"); + it_1.setVersion("3.19.0"); }; it.p2(_function_1); }; diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index b0476e69d6f..5cf7f4fe7c2 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -210,9 +210,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.37.0";visibility:=re org.eclipse.emf.mwe.core;bundle-version="1.14.0";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.14.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.util;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtend.lib;bundle-version="2.37.0", - org.eclipse.equinox.common;bundle-version="3.16.0" + org.eclipse.equinox.common;bundle-version="3.19.0" Import-Package: org.apache.log4j;version="1.2.24",org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.xtext.internal.Activator From 0c251d3bad21b9c11b0182907b3f072d504f8a18 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Wed, 30 Oct 2024 07:57:55 +0100 Subject: [PATCH 08/14] updated project wizard tests --- .../wizard/cli/CliWizardIntegrationTest.java | 15 +- .../mavenTychoJ17.target/pom.xml | 15 - .../mavenTychoJ17.ui/META-INF/MANIFEST.MF | 17 - .../mavenTychoJ17.ui/pom.xml | 21 -- .../.launch/Launch Runtime Eclipse.launch | 34 -- .../mavenTychoJ17/META-INF/MANIFEST.MF | 12 - .../META-INF/MANIFEST.MF | 8 +- .../mavenTychoJUnit5.ide}/build.properties | 0 .../mavenTychoJUnit5.ide}/pom.xml | 6 +- .../mavenTychoJUnit5.target.target} | 4 +- .../mavenTychoJUnit5.target}/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 8 +- .../mavenTychoJUnit5.tests}/build.properties | 0 .../mavenTychoJUnit5.tests}/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 8 +- .../build.properties | 0 .../mavenTychoJUnit5.ui.tests}/pom.xml | 6 +- .../mavenTychoJUnit5.ui}/META-INF/MANIFEST.MF | 10 +- .../mavenTychoJUnit5.ui}/build.properties | 0 .../mavenTychoJUnit5.ui}/pom.xml | 6 +- .../mavenTychoJUnit5.web}/pom.xml | 10 +- ...Dsl (mydsl) Language Infrastructure.launch | 6 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../mavenTychoJUnit5}/META-INF/MANIFEST.MF | 6 +- .../mavenTychoJUnit5}/build.properties | 0 .../mavenTychoJUnit5}/pom.xml | 18 +- .../src/mydsl/GenerateMyDsl.mwe2 | 2 +- .../mavenTychoJUnit5}/src/mydsl/MyDsl.xtext | 0 .../mavenTychoJUnit5.parent}/pom.xml | 24 +- .../mavenTychoP2J17.feature/build.properties | 1 - .../mavenTychoP2J17.feature/feature.xml | 23 -- .../mavenTychoP2J17.feature/pom.xml | 15 - .../mavenTychoP2J17.ide/META-INF/MANIFEST.MF | 12 - .../mavenTychoP2J17.ide/build.properties | 6 - .../mavenTychoP2J17.ide/pom.xml | 21 -- .../mavenTychoP2J17.repository/category.xml | 11 - .../mavenTychoP2J17.repository/pom.xml | 15 - .../mavenTychoP2J17.target.target | 35 -- .../META-INF/MANIFEST.MF | 13 - .../mavenTychoP2J17.tests/build.properties | 6 - .../mavenTychoP2J17.tests/pom.xml | 21 -- .../META-INF/MANIFEST.MF | 15 - .../mavenTychoP2J17.ui.tests/build.properties | 6 - .../mavenTychoP2J17.ui.tests/pom.xml | 28 -- .../mavenTychoP2J17.ui/build.properties | 7 - .../mavenTychoP2J17.web/pom.xml | 130 -------- ...Dsl (mydsl) Language Infrastructure.launch | 18 -- .../mavenTychoP2J17/build.properties | 9 - .../mavenTychoP2J17/pom.xml | 102 ------ .../src/mydsl/GenerateMyDsl.mwe2 | 57 ---- .../mavenTychoP2J17/src/mydsl/MyDsl.xtext | 9 - .../mavenTychoP2J17.parent/pom.xml | 302 ------------------ 52 files changed, 69 insertions(+), 1043 deletions(-) delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide}/META-INF/MANIFEST.MF (57%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide}/pom.xml (78%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target} (96%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target}/pom.xml (73%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests}/META-INF/MANIFEST.MF (67%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests}/pom.xml (78%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests}/META-INF/MANIFEST.MF (69%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests}/pom.xml (83%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui}/META-INF/MANIFEST.MF (68%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui}/pom.xml (79%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web}/pom.xml (93%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch (56%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/.launch/Launch Runtime Eclipse.launch (96%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/META-INF/MANIFEST.MF (70%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/pom.xml (82%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/src/mydsl/GenerateMyDsl.mwe2 (97%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17 => mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5}/src/mydsl/MyDsl.xtext (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ17/mavenTychoJ17.parent => mavenTychoJUnit5/mavenTychoJUnit5.parent}/pom.xml (93%) delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java index dd7808d2aea..871cd8eb7ef 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java @@ -139,7 +139,7 @@ public static void main(String[] args) { project.getIdeProject().setEnabled(true); project.getWebProject().setEnabled(true); }), CliWizardIntegrationTest.newProjectConfig(project -> { - project.setBaseName("mavenTychoJ17"); + project.setBaseName("mavenTychoJUnit5"); project.setPreferredBuildSystem(BuildSystem.MAVEN); project.setSourceLayout(SourceLayout.PLAIN); project.setProjectLayout(ProjectLayout.HIERARCHICAL); @@ -148,7 +148,6 @@ public static void main(String[] args) { project.getUiProject().getTestProject().setEnabled(true); project.getIdeProject().setEnabled(true); project.getWebProject().setEnabled(true); - project.setJavaVersion(JavaVersion.JAVA17); project.setJunitVersion(JUnitVersion.JUNIT_5); }), CliWizardIntegrationTest.newProjectConfig(project -> { project.setBaseName("gradle"); @@ -189,18 +188,6 @@ public static void main(String[] args) { project.getIdeProject().setEnabled(true); project.getWebProject().setEnabled(true); project.getP2Project().setEnabled(true); - }), CliWizardIntegrationTest.newProjectConfig(project -> { - project.setBaseName("mavenTychoP2J17"); - project.setJavaVersion(JavaVersion.JAVA17); - project.setPreferredBuildSystem(BuildSystem.MAVEN); - project.setSourceLayout(SourceLayout.PLAIN); - project.setProjectLayout(ProjectLayout.HIERARCHICAL); - project.getRuntimeProject().getTestProject().setEnabled(true); - project.getUiProject().setEnabled(true); - project.getUiProject().getTestProject().setEnabled(true); - project.getIdeProject().setEnabled(true); - project.getWebProject().setEnabled(true); - project.getP2Project().setEnabled(true); }), CliWizardIntegrationTest.newProjectConfig(project -> { project.setBaseName("mavenTychoP2J21"); project.setJavaVersion(JavaVersion.JAVA21); diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml deleted file mode 100644 index 672263289cb..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - mavenTychoJ17 - mavenTychoJ17.parent - 1.0.0-SNAPSHOT - - mavenTychoJ17.target - eclipse-target-definition - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF deleted file mode 100644 index f25aeaacf74..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ17.ui -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ17.ui; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ17, - mavenTychoJ17.ide, - org.eclipse.xtext.ui, - org.eclipse.xtext.ui.shared, - org.eclipse.xtext.ui.codetemplates.ui, - org.eclipse.ui.editors;bundle-version="3.14.300", - org.eclipse.ui.ide;bundle-version="3.18.500" -Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoJ17.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml deleted file mode 100644 index 2f264d09676..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - mavenTychoJ17 - mavenTychoJ17.parent - 1.0.0-SNAPSHOT - - mavenTychoJ17.ui - eclipse-plugin - - - - - org.eclipse.xtend - xtend-maven-plugin - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch deleted file mode 100644 index 7ed8b311286..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF deleted file mode 100644 index 45fe5e25369..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ17 -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ17; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext, - org.eclipse.xtext.xbase, - org.eclipse.equinox.common;bundle-version="3.19.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoJ17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF similarity index 57% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF index 8243e467549..003d900c169 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ17.ide +Bundle-Name: mavenTychoJUnit5.ide Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ17.ide; singleton:=true +Bundle-SymbolicName: mavenTychoJUnit5.ide; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ17, +Require-Bundle: mavenTychoJUnit5, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoJ17.ide +Automatic-Module-Name: mavenTychoJUnit5.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml similarity index 78% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml index e58886513ef..a30a19e2fad 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ17 - mavenTychoJ17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoJ17.ide + mavenTychoJUnit5.ide eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target similarity index 96% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target index 65aaaeb2bc9..5dec1c4b771 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml similarity index 73% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml index b7d32dbe43d..96846a124a0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J17 - mavenTychoP2J17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoP2J17.target + mavenTychoJUnit5.target eclipse-target-definition diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF similarity index 67% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF index 89e8fc9f55d..8a2a28649a9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ17.tests +Bundle-Name: mavenTychoJUnit5.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ17.tests; singleton:=true +Bundle-SymbolicName: mavenTychoJUnit5.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ17, +Require-Bundle: mavenTychoJUnit5, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoJ17.tests +Automatic-Module-Name: mavenTychoJUnit5.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml similarity index 78% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml index 488cada2944..fc66ddd113e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ17 - mavenTychoJ17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoJ17.tests + mavenTychoJUnit5.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF similarity index 69% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF index ea474a3589d..9386cb0fec8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ17.ui.tests +Bundle-Name: mavenTychoJUnit5.ui.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ17.ui.tests; singleton:=true +Bundle-SymbolicName: mavenTychoJUnit5.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ17.ui, +Require-Bundle: mavenTychoJUnit5.ui, org.eclipse.xtext.testing, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.testing, @@ -13,4 +13,4 @@ Require-Bundle: mavenTychoJ17.ui, Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoJ17.ui.tests +Automatic-Module-Name: mavenTychoJUnit5.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml similarity index 83% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml index 561f8d0a3e6..fa595136364 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ17 - mavenTychoJ17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoJ17.ui.tests + mavenTychoJUnit5.ui.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF similarity index 68% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF index f8530c0918a..d3b4d29673b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J17.ui +Bundle-Name: mavenTychoJUnit5.ui Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J17.ui; singleton:=true +Bundle-SymbolicName: mavenTychoJUnit5.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J17, - mavenTychoP2J17.ide, +Require-Bundle: mavenTychoJUnit5, + mavenTychoJUnit5.ide, org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared, org.eclipse.xtext.ui.codetemplates.ui, @@ -14,4 +14,4 @@ Require-Bundle: mavenTychoP2J17, org.eclipse.ui.ide;bundle-version="3.18.500" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoP2J17.ui +Automatic-Module-Name: mavenTychoJUnit5.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml similarity index 79% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml index e0104a8dd61..166436c8ff6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J17 - mavenTychoP2J17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoP2J17.ui + mavenTychoJUnit5.ui eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml similarity index 93% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml index 5de436f751f..294ff03aa8f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ17 - mavenTychoJ17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoJ17.web + mavenTychoJUnit5.web war @@ -76,12 +76,12 @@ ${project.groupId} - mavenTychoJ17 + mavenTychoJUnit5 ${project.version} ${project.groupId} - mavenTychoJ17.ide + mavenTychoJUnit5.ide ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch similarity index 56% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch index 3550ebf55ee..168c8ee3568 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch @@ -1,7 +1,7 @@ - + @@ -10,9 +10,9 @@ - + - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch similarity index 96% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch index 1726442757e..428fea84685 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch @@ -4,7 +4,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF similarity index 70% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF index 88f03a88b6b..dd7b80fccef 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J17 +Bundle-Name: mavenTychoJUnit5 Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J17; singleton:=true +Bundle-SymbolicName: mavenTychoJUnit5; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.19.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoP2J17 +Automatic-Module-Name: mavenTychoJUnit5 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml similarity index 82% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml index 77e57ba24bc..25c6885996c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ17 - mavenTychoJ17.parent + mavenTychoJUnit5 + mavenTychoJUnit5.parent 1.0.0-SNAPSHOT - mavenTychoJ17 + mavenTychoJUnit5 eclipse-plugin @@ -55,37 +55,37 @@ - ${basedir}/../mavenTychoJ17/src-gen/ + ${basedir}/../mavenTychoJUnit5/src-gen/ **/* - ${basedir}/../mavenTychoJ17.tests/src-gen/ + ${basedir}/../mavenTychoJUnit5.tests/src-gen/ **/* - ${basedir}/../mavenTychoJ17.ide/src-gen/ + ${basedir}/../mavenTychoJUnit5.ide/src-gen/ **/* - ${basedir}/../mavenTychoJ17.ui/src-gen/ + ${basedir}/../mavenTychoJUnit5.ui/src-gen/ **/* - ${basedir}/../mavenTychoJ17.ui.tests/src-gen/ + ${basedir}/../mavenTychoJUnit5.ui.tests/src-gen/ **/* - ${basedir}/../mavenTychoJ17.web/src-gen/ + ${basedir}/../mavenTychoJUnit5.web/src-gen/ **/* diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2 similarity index 97% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2 index 52723250b3e..2e292080ce6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2 @@ -10,7 +10,7 @@ Workflow { component = XtextGenerator { configuration = { project = StandardProjectConfig { - baseName = "mavenTychoJ17" + baseName = "mavenTychoJUnit5" rootPath = rootPath runtimeTest = { enabled = true diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/MyDsl.xtext similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/MyDsl.xtext diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml similarity index 93% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml index b1b2f9d64ce..03b7744105c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - mavenTychoJ17 + mavenTychoJUnit5 1.0.0-SNAPSHOT - mavenTychoJ17.parent + mavenTychoJUnit5.parent pom unspecified - 2.20.0 + 2.20.0.M1 UTF-8 17 17 @@ -21,13 +21,13 @@ - mavenTychoJ17 - mavenTychoJ17.ide - mavenTychoJ17.ui - mavenTychoJ17.web - mavenTychoJ17.target - mavenTychoJ17.tests - mavenTychoJ17.ui.tests + mavenTychoJUnit5 + mavenTychoJUnit5.ide + mavenTychoJUnit5.ui + mavenTychoJUnit5.web + mavenTychoJUnit5.target + mavenTychoJUnit5.tests + mavenTychoJUnit5.ui.tests @@ -55,8 +55,8 @@ - mavenTychoJ17 - mavenTychoJ17.target + mavenTychoJUnit5 + mavenTychoJUnit5.target ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties deleted file mode 100644 index 64f93a9f0b7..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml deleted file mode 100644 index a594f450cde..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/pom.xml deleted file mode 100644 index 7bf9f99a37f..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.feature - eclipse-feature - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF deleted file mode 100644 index bcdf274dec0..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J17.ide -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J17.ide; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J17, - org.eclipse.xtext.ide, - org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoP2J17.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties deleted file mode 100644 index 5c6bbf99f08..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/ -bin.excludes = **/*.xtend diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml deleted file mode 100644 index e421285ee68..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.ide - eclipse-plugin - - - - - org.eclipse.xtend - xtend-maven-plugin - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml deleted file mode 100644 index 2b86ad4eb24..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml deleted file mode 100644 index 1ebadced4ae..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.repository - eclipse-repository - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target deleted file mode 100644 index 0f08c7bd9ea..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 0ee7da797ca..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J17.tests -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J17.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J17, - org.junit;bundle-version="4.13.2", - org.eclipse.xtext.testing, - org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoP2J17.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties deleted file mode 100644 index 5c6bbf99f08..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/ -bin.excludes = **/*.xtend diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml deleted file mode 100644 index 17380a6eec5..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.tests - eclipse-test-plugin - - - - - org.eclipse.xtend - xtend-maven-plugin - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 108ca97aa67..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J17.ui.tests -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J17.ui.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J17.ui, - org.junit;bundle-version="4.13.2", - org.eclipse.xtext.testing, - org.eclipse.xtext.ui.testing, - org.eclipse.xtext.xbase.testing, - org.eclipse.xtext.xbase.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: mavenTychoP2J17.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties deleted file mode 100644 index 5c6bbf99f08..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/ -bin.excludes = **/*.xtend diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml deleted file mode 100644 index 2f0b2637af6..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.ui.tests - eclipse-test-plugin - - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.eclipse.tycho - tycho-surefire-plugin - - true - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties deleted file mode 100644 index 323f56c513d..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/,\ - plugin.xml -bin.excludes = **/*.xtend diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml deleted file mode 100644 index c549a3c67e5..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml +++ /dev/null @@ -1,130 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17.web - war - - - src - - - src - - **/*.java - **/*.xtend - - - - - - org.eclipse.xtend - xtend-maven-plugin - - - maven-war-plugin - 3.3.2 - - WebRoot - false - - - - org.eclipse.jetty - jetty-maven-plugin - 11.0.23 - - WebRoot - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - - add-source - initialize - - add-source - add-resource - - - - src-gen - - - - src-gen - - **/*.java - - - - - - - - - - - - - ${project.groupId} - mavenTychoP2J17 - ${project.version} - - - ${project.groupId} - mavenTychoP2J17.ide - ${project.version} - - - org.eclipse.xtext - org.eclipse.xtext.xbase.web - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.web.servlet - ${xtextVersion} - - - org.eclipse.xtend - org.eclipse.xtend.lib - ${xtextVersion} - - - org.webjars - requirejs - 2.3.7 - - - org.webjars - jquery - 3.6.0 - - - org.webjars - ace - 1.3.3 - - - org.eclipse.jetty - jetty-annotations - 11.0.23 - provided - - - org.slf4j - slf4j-simple - 2.0.5 - provided - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch deleted file mode 100644 index 294b34e4742..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties deleted file mode 100644 index 8fa43cc640f..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = .,\ - META-INF/,\ - plugin.xml -bin.excludes = **/*.mwe2,\ - **/*.xtend -additional.bundles = org.eclipse.xtext.xtext.generator.dependencies diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml deleted file mode 100644 index 58efec1c15a..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - 4.0.0 - - mavenTychoP2J17 - mavenTychoP2J17.parent - 1.0.0-SNAPSHOT - - mavenTychoP2J17 - eclipse-plugin - - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - - mwe2Launcher - generate-sources - - java - - - - - org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher - - /${project.basedir}/src/mydsl/GenerateMyDsl.mwe2 - -p - rootPath=/${project.basedir}/.. - - compile - true - false - - - - org.eclipse.xtext - xtext-antlr-generator - 2.1.1 - - - - - org.eclipse.xtend - xtend-maven-plugin - - - - org.apache.maven.plugins - maven-clean-plugin - - - - ${basedir}/../mavenTychoP2J17/src-gen/ - - **/* - - - - ${basedir}/../mavenTychoP2J17.tests/src-gen/ - - **/* - - - - ${basedir}/../mavenTychoP2J17.ide/src-gen/ - - **/* - - - - ${basedir}/../mavenTychoP2J17.ui/src-gen/ - - **/* - - - - ${basedir}/../mavenTychoP2J17.ui.tests/src-gen/ - - **/* - - - - ${basedir}/../mavenTychoP2J17.web/src-gen/ - - **/* - - - - ${basedir}/model/generated/ - - - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 deleted file mode 100644 index ab461a5be4e..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 +++ /dev/null @@ -1,57 +0,0 @@ -module mydsl.GenerateMyDsl - -import org.eclipse.xtext.xtext.generator.* -import org.eclipse.xtext.xtext.generator.model.project.* - -var rootPath = ".." - -Workflow { - - component = XtextGenerator { - configuration = { - project = StandardProjectConfig { - baseName = "mavenTychoP2J17" - rootPath = rootPath - runtimeTest = { - enabled = true - } - eclipsePlugin = { - enabled = true - } - eclipsePluginTest = { - enabled = true - } - web = { - enabled = true - } - createEclipseMetaData = true - } - code = { - encoding = "UTF-8" - lineDelimiter = "\n" - fileHeader = "/*\n * generated by Xtext \${version}\n */" - preferXtendStubs = false - } - } - language = StandardLanguage { - name = "mydsl.MyDsl" - fileExtensions = "mydsl" - - serializer = { - generateStub = false - } - validator = { - // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator" - - // Enables several checks on the inferred Jvm model for Xbase languages concerning Java inheritance relations - // composedCheck = "org.eclipse.xtext.xbase.validation.JvmGenericTypeValidator" - - // Generates checks for @Deprecated grammar annotations, an IssueProvider and a corresponding PropertyPage - generateDeprecationValidation = true - } - generator = { - generateXtendStub = true - } - } - } -} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext deleted file mode 100644 index 2576748e6f7..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext +++ /dev/null @@ -1,9 +0,0 @@ -grammar mydsl.MyDsl with org.eclipse.xtext.common.Terminals - -generate myDsl "http://www.MyDsl.mydsl" - -Model: - greetings+=Greeting*; - -Greeting: - 'Hello' name=ID '!'; diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml deleted file mode 100644 index 3c657fc5b3f..00000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml +++ /dev/null @@ -1,302 +0,0 @@ - - 4.0.0 - mavenTychoP2J17 - 1.0.0-SNAPSHOT - mavenTychoP2J17.parent - pom - - - unspecified - 2.20.0 - UTF-8 - 17 - 17 - - 4.0.9 - - - - - - - - mavenTychoP2J17 - mavenTychoP2J17.ide - mavenTychoP2J17.ui - mavenTychoP2J17.web - mavenTychoP2J17.target - mavenTychoP2J17.feature - mavenTychoP2J17.repository - mavenTychoP2J17.tests - mavenTychoP2J17.ui.tests - - - - - org.eclipse.xtext - xtext-dev-bom - ${xtextVersion} - pom - import - - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - - plugin-source - - - - feature-source - - feature-source - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - attach-p2-metadata - package - - p2-metadata - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - mavenTychoP2J17 - mavenTychoP2J17.target - ${project.version} - - - - - macosx - cocoa - x86_64 - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - - - - eclipse-plugin - org.eclipse.xtext.logging - 0.0.0 - - - - eclipse-feature - org.eclipse.rcp - 0.0.0 - - - - - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtextVersion} - - - - compile - xtend-install-debug-info - testCompile - xtend-test-install-debug-info - - - - - ${basedir}/xtend-gen - ${basedir}/xtend-gen - - - - org.apache.maven.plugins - maven-clean-plugin - 3.2.0 - - - - ${basedir}/xtend-gen - - **/* - - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - -err:-forbidden - false - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - - ${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments} - false - false - - - - - - - - codehaus-snapshots - disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478 - http://nexus.codehaus.org/snapshots/ - - false - - - false - - - - - ossrh-snapshots - ossrh-snapshots - - false - - - false - - http://oss.sonatype.org/content/repositories/snapshots - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - false - - - - - - codehaus-snapshots - disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478 - http://nexus.codehaus.org/snapshots/ - - false - - - false - - - - ossrh-snapshots - ossrh-snapshots - - false - - - false - - http://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - false - - - - - - macos - - - mac - - - - - -XstartOnFirstThread - - - - jdk9-or-newer - - [9,) - - - --add-modules=ALL-SYSTEM - - - - - - - From 71b24963d65add9f3590e0fda94d46ba65142d67 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 30 Oct 2024 12:08:51 +0100 Subject: [PATCH 09/14] adapt target platform wizard --- .../xtext/wizard/TargetPlatformProject.xtend | 7 +------ .../xtext/wizard/TargetPlatformProject.java | 16 +++------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index 384b4cc2173..b3c36952ed4 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -10,7 +10,6 @@ package org.eclipse.xtext.xtext.wizard import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.eclipse.xtext.util.JUnitVersion -import org.eclipse.xtext.util.JavaVersion @FinalFieldsConstructor class TargetPlatformProject extends ProjectDescriptor { @@ -61,11 +60,7 @@ class TargetPlatformProject extends ProjectDescriptor { - �IF config.javaVersion.isAtLeast(JavaVersion.JAVA17)� - - �ELSE� - - �ENDIF� + diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index c95fa286222..6b3b61ade7e 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -16,7 +16,6 @@ import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor; import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.util.JUnitVersion; -import org.eclipse.xtext.util.JavaVersion; import org.eclipse.xtext.util.XtextVersion; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.ObjectExtensions; @@ -108,18 +107,9 @@ public CharSequence target() { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); - { - boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA17); - if (_isAtLeast) { - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - } else { - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - } - } + _builder.append("\t\t\t"); + _builder.append(""); + _builder.newLine(); _builder.append("\t\t"); _builder.append(""); _builder.newLine(); From c5cf5ec5b7a8561e470d7fb41c0139be55a9b98f Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 30 Oct 2024 10:22:14 +0100 Subject: [PATCH 10/14] remove no longer needed reflections --- .../tests/builder/BuildAffectionTest.xtend | 205 +++------- .../ide/tests/builder/BuildAffectionTest.java | 361 ++++++------------ .../xtext/builder/impl/Bug486584Test.java | 5 +- .../xtext/builder/impl/XtextBuilder.java | 49 +-- ...ourceInstallingCompilationParticipant.java | 86 +---- .../WorkspaceProjectsStateTest.java | 16 +- ...XtextBrowserInformationControlAdapter.java | 16 +- 7 files changed, 189 insertions(+), 549 deletions(-) diff --git a/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.xtend b/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.xtend index 4df606837e2..c0ac0c83bdd 100644 --- a/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.xtend +++ b/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2014, 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. @@ -33,7 +33,6 @@ import org.junit.Test import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.* import static extension org.eclipse.xtext.util.Strings.* import static org.junit.Assert.* -import org.osgi.framework.Version /** * @author Jan Koehnlein - Initial contribution and API @@ -487,33 +486,18 @@ class BuildAffectionTest { int foo; } ''') - if (isCoreResourceGreaterOrEqual_3_17_0) { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } else { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } + assertBuildLogs(''' + Building test.project + indexing platform:/resource/test.project/src/Foo.xtend + Built test.project in \d+ ms + Building test.project + Built test.project in \d+ ms + Building test.client + indexing platform:/resource/test.client/src/Client.xtend + Built test.client in \d+ ms + Building test.client + Built test.client in \d+ ms + ''') } @Test @@ -530,33 +514,17 @@ class BuildAffectionTest { protected int foo; } ''') - if (isCoreResourceGreaterOrEqual_3_17_0) { - assertBuildLogs(''' - Building test.project - Built test.project in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } else { - assertBuildLogs(''' - Building test.project - Built test.project in \d+ ms - Building test.client - Built test.client in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } + assertBuildLogs(''' + Building test.project + Built test.project in \d+ ms + Building test.project + Built test.project in \d+ ms + Building test.client + indexing platform:/resource/test.client/src/Client.xtend + Built test.client in \d+ ms + Building test.client + Built test.client in \d+ ms + ''') } @Test @@ -577,33 +545,17 @@ class BuildAffectionTest { protected int foo; } ''') - if (isCoreResourceGreaterOrEqual_3_17_0) { - assertBuildLogs(''' - Building test.project - Built test.project in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } else { - assertBuildLogs(''' - Building test.project - Built test.project in \d+ ms - Building test.client - Built test.client in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } + assertBuildLogs(''' + Building test.project + Built test.project in \d+ ms + Building test.project + Built test.project in \d+ ms + Building test.client + indexing platform:/resource/test.client/src/Client.xtend + Built test.client in \d+ ms + Building test.client + Built test.client in \d+ ms + ''') } @Test @@ -640,33 +592,18 @@ class BuildAffectionTest { } } ''') - if (isCoreResourceGreaterOrEqual_3_17_0) { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } else { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } + assertBuildLogs(''' + Building test.project + indexing platform:/resource/test.project/src/Foo.xtend + Built test.project in \d+ ms + Building test.project + Built test.project in \d+ ms + Building test.client + indexing platform:/resource/test.client/src/Client.xtend + Built test.client in \d+ ms + Building test.client + Built test.client in \d+ ms + ''') } @Test @@ -700,35 +637,19 @@ class BuildAffectionTest { } } ''') - if (isCoreResourceGreaterOrEqual_3_17_0) { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Bar.xtend - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } else { - assertBuildLogs(''' - Building test.project - indexing platform:/resource/test.project/src/Bar.xtend - indexing platform:/resource/test.project/src/Foo.xtend - Built test.project in \d+ ms - Building test.client - indexing platform:/resource/test.client/src/Client.xtend - Built test.client in \d+ ms - Building test.project - Built test.project in \d+ ms - Building test.client - Built test.client in \d+ ms - ''') - } + assertBuildLogs(''' + Building test.project + indexing platform:/resource/test.project/src/Bar.xtend + indexing platform:/resource/test.project/src/Foo.xtend + Built test.project in \d+ ms + Building test.project + Built test.project in \d+ ms + Building test.client + indexing platform:/resource/test.client/src/Client.xtend + Built test.client in \d+ ms + Building test.client + Built test.client in \d+ ms + ''') } private def assertBuildLogs(CharSequence expected) { @@ -754,10 +675,4 @@ class BuildAffectionTest { createFile(new Path('test.client/src/' + name + '.xtend'), content.toString) } - def private static boolean isCoreResourceGreaterOrEqual_3_17_0() { - var version_3_17_0 = new Version(3,17,0) - var installed = ResourcesPlugin.getPlugin().getBundle().getVersion() - return installed >= version_3_17_0 - } - } \ No newline at end of file diff --git a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.java b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.java index 7083f0c01c1..cfce6e30dbc 100644 --- a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.java +++ b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/builder/BuildAffectionTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2014, 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. @@ -37,7 +37,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.osgi.framework.Version; /** * @author Jan Koehnlein - Initial contribution and API @@ -751,54 +750,28 @@ public void testAffected_dependentProject() { _builder_2.append("}"); _builder_2.newLine(); this.changeContent(foo, _builder_2); - boolean _isCoreResourceGreaterOrEqual_3_17_0 = BuildAffectionTest.isCoreResourceGreaterOrEqual_3_17_0(); - if (_isCoreResourceGreaterOrEqual_3_17_0) { - StringConcatenation _builder_3 = new StringConcatenation(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - this.assertBuildLogs(_builder_3); - } else { - StringConcatenation _builder_4 = new StringConcatenation(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - this.assertBuildLogs(_builder_4); - } + StringConcatenation _builder_3 = new StringConcatenation(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.project/src/Foo.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + this.assertBuildLogs(_builder_3); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } @@ -825,54 +798,26 @@ public void testAffected_dependentProject_Java() { _builder_2.append("}"); _builder_2.newLine(); this.changeContent(foo, _builder_2); - boolean _isCoreResourceGreaterOrEqual_3_17_0 = BuildAffectionTest.isCoreResourceGreaterOrEqual_3_17_0(); - if (_isCoreResourceGreaterOrEqual_3_17_0) { - StringConcatenation _builder_3 = new StringConcatenation(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - this.assertBuildLogs(_builder_3); - } else { - StringConcatenation _builder_4 = new StringConcatenation(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - this.assertBuildLogs(_builder_4); - } + StringConcatenation _builder_3 = new StringConcatenation(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + this.assertBuildLogs(_builder_3); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } @@ -910,54 +855,26 @@ public void testAffected_dependentProject_Java_WithExpression() { _builder_2.append("}"); _builder_2.newLine(); this.changeContent(foo, _builder_2); - boolean _isCoreResourceGreaterOrEqual_3_17_0 = BuildAffectionTest.isCoreResourceGreaterOrEqual_3_17_0(); - if (_isCoreResourceGreaterOrEqual_3_17_0) { - StringConcatenation _builder_3 = new StringConcatenation(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - this.assertBuildLogs(_builder_3); - } else { - StringConcatenation _builder_4 = new StringConcatenation(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - this.assertBuildLogs(_builder_4); - } + StringConcatenation _builder_3 = new StringConcatenation(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + this.assertBuildLogs(_builder_3); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } @@ -1024,54 +941,28 @@ public void testAffected_annotationProcessorChanged_singleFile() { _builder_2.append("}"); _builder_2.newLine(); this.changeContent(foo, _builder_2); - boolean _isCoreResourceGreaterOrEqual_3_17_0 = BuildAffectionTest.isCoreResourceGreaterOrEqual_3_17_0(); - if (_isCoreResourceGreaterOrEqual_3_17_0) { - StringConcatenation _builder_3 = new StringConcatenation(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.project"); - _builder_3.newLine(); - _builder_3.append("Built test.project in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - _builder_3.append("Building test.client"); - _builder_3.newLine(); - _builder_3.append("Built test.client in \\d+ ms"); - _builder_3.newLine(); - this.assertBuildLogs(_builder_3); - } else { - StringConcatenation _builder_4 = new StringConcatenation(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - this.assertBuildLogs(_builder_4); - } + StringConcatenation _builder_3 = new StringConcatenation(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.project/src/Foo.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.project"); + _builder_3.newLine(); + _builder_3.append("Built test.project in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("indexing platform:/resource/test.client/src/Client.xtend"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + _builder_3.append("Building test.client"); + _builder_3.newLine(); + _builder_3.append("Built test.client in \\d+ ms"); + _builder_3.newLine(); + this.assertBuildLogs(_builder_3); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } @@ -1131,58 +1022,30 @@ public void testAffected_annotationProcessorChanged_separateFiles() { _builder_3.append("}"); _builder_3.newLine(); this.changeContent(bar, _builder_3); - boolean _isCoreResourceGreaterOrEqual_3_17_0 = BuildAffectionTest.isCoreResourceGreaterOrEqual_3_17_0(); - if (_isCoreResourceGreaterOrEqual_3_17_0) { - StringConcatenation _builder_4 = new StringConcatenation(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.project/src/Bar.xtend"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.project"); - _builder_4.newLine(); - _builder_4.append("Built test.project in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - _builder_4.append("Building test.client"); - _builder_4.newLine(); - _builder_4.append("Built test.client in \\d+ ms"); - _builder_4.newLine(); - this.assertBuildLogs(_builder_4); - } else { - StringConcatenation _builder_5 = new StringConcatenation(); - _builder_5.append("Building test.project"); - _builder_5.newLine(); - _builder_5.append("indexing platform:/resource/test.project/src/Bar.xtend"); - _builder_5.newLine(); - _builder_5.append("indexing platform:/resource/test.project/src/Foo.xtend"); - _builder_5.newLine(); - _builder_5.append("Built test.project in \\d+ ms"); - _builder_5.newLine(); - _builder_5.append("Building test.client"); - _builder_5.newLine(); - _builder_5.append("indexing platform:/resource/test.client/src/Client.xtend"); - _builder_5.newLine(); - _builder_5.append("Built test.client in \\d+ ms"); - _builder_5.newLine(); - _builder_5.append("Building test.project"); - _builder_5.newLine(); - _builder_5.append("Built test.project in \\d+ ms"); - _builder_5.newLine(); - _builder_5.append("Building test.client"); - _builder_5.newLine(); - _builder_5.append("Built test.client in \\d+ ms"); - _builder_5.newLine(); - this.assertBuildLogs(_builder_5); - } + StringConcatenation _builder_4 = new StringConcatenation(); + _builder_4.append("Building test.project"); + _builder_4.newLine(); + _builder_4.append("indexing platform:/resource/test.project/src/Bar.xtend"); + _builder_4.newLine(); + _builder_4.append("indexing platform:/resource/test.project/src/Foo.xtend"); + _builder_4.newLine(); + _builder_4.append("Built test.project in \\d+ ms"); + _builder_4.newLine(); + _builder_4.append("Building test.project"); + _builder_4.newLine(); + _builder_4.append("Built test.project in \\d+ ms"); + _builder_4.newLine(); + _builder_4.append("Building test.client"); + _builder_4.newLine(); + _builder_4.append("indexing platform:/resource/test.client/src/Client.xtend"); + _builder_4.newLine(); + _builder_4.append("Built test.client in \\d+ ms"); + _builder_4.newLine(); + _builder_4.append("Building test.client"); + _builder_4.newLine(); + _builder_4.append("Built test.client in \\d+ ms"); + _builder_4.newLine(); + this.assertBuildLogs(_builder_4); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } @@ -1232,10 +1095,4 @@ private IFile createClientProjectFile(final String name, final CharSequence cont throw Exceptions.sneakyThrow(_e); } } - - private static boolean isCoreResourceGreaterOrEqual_3_17_0() { - Version version_3_17_0 = new Version(3, 17, 0); - Version installed = ResourcesPlugin.getPlugin().getBundle().getVersion(); - return (installed.compareTo(version_3_17_0) >= 0); - } } diff --git a/org.eclipse.xtext.builder.tests/src/org/eclipse/xtext/builder/impl/Bug486584Test.java b/org.eclipse.xtext.builder.tests/src/org/eclipse/xtext/builder/impl/Bug486584Test.java index 3fb77beea68..2a7e1d4b0d8 100644 --- a/org.eclipse.xtext.builder.tests/src/org/eclipse/xtext/builder/impl/Bug486584Test.java +++ b/org.eclipse.xtext.builder.tests/src/org/eclipse/xtext/builder/impl/Bug486584Test.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2016, 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. @@ -10,7 +10,6 @@ import static org.eclipse.xtext.builder.impl.BuilderUtil.*; import static org.junit.Assert.*; -import static org.junit.Assume.*; import java.io.File; import java.io.IOException; @@ -35,7 +34,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.osgi.framework.Version; import com.google.common.collect.ImmutableList; @@ -136,7 +134,6 @@ public void testNoFullBuildIfJavadocChangeOnly() throws CoreException, Interrupt @Test public void testFullBuildWhenTestAttributeChanges() throws Exception { - assumeTrue(JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3,33,0)) >= 0); IJavaProject project = setupProject(); // create src2 folder and give it a separate output folder addSourceFolder(project, SRC2_FOLDER); diff --git a/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/XtextBuilder.java b/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/XtextBuilder.java index af0ad36cde7..3e8b84137a9 100644 --- a/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/XtextBuilder.java +++ b/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/XtextBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 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. @@ -9,9 +9,7 @@ package org.eclipse.xtext.builder.impl; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -23,7 +21,6 @@ import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; @@ -52,7 +49,6 @@ import org.eclipse.xtext.ui.shared.contribution.ISharedStateContributionRegistry; import org.eclipse.xtext.util.internal.Stopwatches; import org.eclipse.xtext.util.internal.Stopwatches.StoppedTask; -import org.osgi.framework.Version; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; @@ -68,8 +64,6 @@ */ public class XtextBuilder extends IncrementalProjectBuilder { - private static final Version VERSION_3_17_0 = new Version(3,17,0); - private static final Logger log = Logger.getLogger(XtextBuilder.class); public static final String BUILDER_ID = XtextProjectHelper.BUILDER_ID; @@ -636,11 +630,7 @@ protected void clean(IProgressMonitor monitor) throws CoreException { @Deprecated private static boolean wasDeprecationWarningLoggedForClean = false; - private Method requestProjectRebuildMethod; - private Method requestProjectsRebuildMethod; - private static Version installedCoreResourcesVersion; - protected void addInfosFromTaskAndClean(ToBeBuilt toBeBuilt, Task task, IProgressMonitor monitor) throws CoreException { addInfosFromTask(task, toBeBuilt); if (XtextBuilder.class.equals(getClass())) { @@ -770,17 +760,10 @@ public ISchedulingRule getRule(int kind, Map args) { * @since 2.27 */ public void triggerRequestProjectRebuild() { - if (requestProjectRebuildMethod != null || isCoreResourceGreaterOrEqual(VERSION_3_17_0)) { - try { - if (requestProjectRebuildMethod == null) { - requestProjectRebuildMethod = getClass().getMethod("requestProjectRebuild", Boolean.TYPE); - } - requestProjectRebuildMethod.invoke(this, true); - } catch (Exception e) { - log.error("something went wrong in triggerRequestProjectRebuild", e); - needRebuild(); - } - } else { + try { + requestProjectRebuild(true); + } catch (Exception e) { + log.error("something went wrong in triggerRequestProjectRebuild", e); needRebuild(); } } @@ -789,28 +772,14 @@ public void triggerRequestProjectRebuild() { * @since 2.27 */ public void triggerRequestProjectsRebuild(IProject project) { - if (requestProjectsRebuildMethod != null || isCoreResourceGreaterOrEqual(VERSION_3_17_0)) { - try { - if (requestProjectsRebuildMethod == null) { - requestProjectsRebuildMethod = getClass().getMethod("requestProjectsRebuild", Collection.class); - } - requestProjectsRebuildMethod.invoke(this, Collections.singletonList(project)); - } catch (Exception e) { - log.error("something went wrong in triggerRequestProjectRebuild", e); - needRebuild(); - } - } else { + try { + requestProjectsRebuild(Collections.singletonList(project)); + } catch (Exception e) { + log.error("something went wrong in triggerRequestProjectRebuild", e); needRebuild(); } } - private static boolean isCoreResourceGreaterOrEqual(Version version) { - if (installedCoreResourcesVersion == null) { - installedCoreResourcesVersion = ResourcesPlugin.getPlugin().getBundle().getVersion(); - } - return installedCoreResourcesVersion.compareTo(version) >= 0; - } - /** * @since 2.32 */ diff --git a/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/smap/DebugSourceInstallingCompilationParticipant.java b/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/smap/DebugSourceInstallingCompilationParticipant.java index c4c3d6cebd2..9469f9420ee 100644 --- a/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/smap/DebugSourceInstallingCompilationParticipant.java +++ b/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/smap/DebugSourceInstallingCompilationParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2012, 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. @@ -9,8 +9,6 @@ package org.eclipse.xtext.builder.smap; import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.Set; @@ -44,7 +42,6 @@ import org.eclipse.xtext.ui.util.ResourceUtil; import org.eclipse.xtext.util.internal.Stopwatches; import org.eclipse.xtext.util.internal.Stopwatches.StoppedTask; -import org.osgi.framework.Version; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; @@ -58,11 +55,6 @@ public class DebugSourceInstallingCompilationParticipant extends CompilationParticipant implements CompilationParticipantExtension { private static final Logger log = Logger.getLogger(DebugSourceInstallingCompilationParticipant.class); - private static final Version VERSION_3_34_0 = new Version(3, 34, 0); - - private static Version installedJdtCoreVersion; - - private List files; @Inject private IResourceServiceProvider.Registry serviceProviderRegistry; @@ -120,9 +112,6 @@ protected ITraceToBytecodeInstaller getInstaller(OutputConfiguration config) { @Override public Optional postProcess(BuildContext ctx, ByteArrayInputStream bytes) { Optional no_change = Optional.empty(); - if (!isJdtCoreGreaterOrEqual(VERSION_3_34_0)) { - return no_change; - } try { IFile generatedJavaFile = ctx.getFile(); @@ -170,64 +159,9 @@ public void buildFinished(IJavaProject project) { try { task.start(); super.buildFinished(project); - if (isJdtCoreGreaterOrEqual(VERSION_3_34_0)) { - // nothing to do here - return; - } else { - if (files == null) - return; - for (BuildContext ctx : files) { - try { - IFile generatedJavaFile = ctx.getFile(); - - // This may fail if there is no trace file. - IEclipseTrace traceToSource = traceInformation.getTraceToSource(generatedJavaFile); - if (traceToSource == null) { - continue; - } - AbstractTraceRegion rootTraceRegion = findRootTraceRegion(traceToSource); - if (rootTraceRegion == null) - continue; - - SourceRelativeURI dslSourceFile = rootTraceRegion.getAssociatedSrcRelativePath(); - - // OutputConfigurations are only available for folders targeted by Xtext's code generation. - OutputConfiguration outputConfiguration = findOutputConfiguration(dslSourceFile, generatedJavaFile); - if (outputConfiguration == null) - continue; - - IJavaElement element = JavaCore.create(generatedJavaFile); - if (element == null) - continue; - - deleteTaskMarkers(generatedJavaFile); - markerReflector.reflectErrorMarkerInSource(generatedJavaFile, traceToSource); - - ITraceToBytecodeInstaller installer = getInstaller(outputConfiguration); - installer.setTrace(generatedJavaFile.getName(), rootTraceRegion); - for (IFile javaClassFile : findGeneratedJavaClassFiles(element)) { - InputStream contents = javaClassFile.getContents(); - try { - byte[] byteCode = installer.installTrace(ByteStreams.toByteArray(contents)); - if (byteCode != null) { - javaClassFile.setContents(new ByteArrayInputStream(byteCode), 0, null); - } else { - // we need to touch the class file to do a respin of the build - // otherwise a needsRebuild request is ignored since no IResourceDelta is available - javaClassFile.touch(null); - } - } finally { - contents.close(); - } - } - } catch (Exception e) { - String msg = "Could not process %s to install source information: %s"; - log.error(String.format(msg, ctx.getFile().getFullPath().toString(), e.getMessage()), e); - } - } - } + // nothing to do here + return; } finally { - files = null; task.stop(); } } @@ -242,13 +176,6 @@ protected void deleteTaskMarkers(IFile generatedJavaFile) throws CoreException { @Override public void buildStarting(BuildContext[] files, boolean isBatch) { super.buildStarting(files, isBatch); - if (!isJdtCoreGreaterOrEqual(VERSION_3_34_0)) { - if (this.files != null) { - this.files.addAll(Arrays.asList(files)); - } else { - this.files = Lists.newArrayList(files); - } - } } protected List findGeneratedJavaClassFiles(IJavaElement element) { @@ -272,11 +199,4 @@ public boolean isActive(IJavaProject project) { return XtextProjectHelper.hasNature(project.getProject()); } - private static boolean isJdtCoreGreaterOrEqual(Version version) { - if (installedJdtCoreVersion == null) { - installedJdtCoreVersion = JavaCore.getPlugin().getBundle().getVersion(); - } - return installedJdtCoreVersion.compareTo(version) >= 0; - } - } diff --git a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/scoping/namespaces/WorkspaceProjectsStateTest.java b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/scoping/namespaces/WorkspaceProjectsStateTest.java index e8ee87cb36e..35b049633fb 100644 --- a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/scoping/namespaces/WorkspaceProjectsStateTest.java +++ b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/scoping/namespaces/WorkspaceProjectsStateTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 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. @@ -23,7 +23,6 @@ import org.eclipse.xtext.ui.resource.Storage2UriMapperImpl; import org.eclipse.xtext.ui.resource.UriValidator; import org.junit.Test; -import org.osgi.framework.Version; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -104,17 +103,17 @@ public boolean isPossiblyManaged(IStorage storage) { @Test public void testGetContainedURIs_01() { Collection containedURIs = projectsState.getContainedURIs(project1.getName()); - assertEquals(containedURIs.toString(), isCoreResourceGreaterOrEqual_3_17_0() ? 3 : 2, containedURIs.size()); + assertEquals(containedURIs.toString(), 3, containedURIs.size()); assertTrue(containedURIs.contains(uri1)); assertTrue(containedURIs.contains(uri2)); } @Test public void testGetContainedURIs_02() throws CoreException, InvocationTargetException, InterruptedException { Collection containedURIs = projectsState.getContainedURIs(project1.getName()); - assertEquals(containedURIs.toString(), isCoreResourceGreaterOrEqual_3_17_0() ? 3 : 2, containedURIs.size()); + assertEquals(containedURIs.toString(), 3, containedURIs.size()); URI uri = createFileAndRegisterResource(project1, "file3"); containedURIs = projectsState.getContainedURIs(project1.getName()); - assertEquals(containedURIs.toString(), isCoreResourceGreaterOrEqual_3_17_0() ? 4 : 3, containedURIs.size()); + assertEquals(containedURIs.toString(), 4, containedURIs.size()); assertTrue(containedURIs.contains(uri1)); assertTrue(containedURIs.contains(uri2)); assertTrue(containedURIs.contains(uri)); @@ -123,15 +122,10 @@ public boolean isPossiblyManaged(IStorage storage) { @Override @Test public void testRemoveNature() throws CoreException { Collection containedURIs = projectsState.getContainedURIs(project1.getName()); - assertEquals(isCoreResourceGreaterOrEqual_3_17_0() ? 3 : 2, containedURIs.size()); + assertEquals(3, containedURIs.size()); IResourcesSetupUtil.removeNature(project1, XtextProjectHelper.NATURE_ID); containedURIs = projectsState.getContainedURIs(project1.getName()); assertTrue(containedURIs.isEmpty()); } - private static boolean isCoreResourceGreaterOrEqual_3_17_0() { - Version installedCoreResourcesVersion = ResourcesPlugin.getPlugin().getBundle().getVersion(); - return installedCoreResourcesVersion.compareTo(new Version(3,17,0)) >= 0; - } - } diff --git a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/hover/html/XtextBrowserInformationControlAdapter.java b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/hover/html/XtextBrowserInformationControlAdapter.java index 1bb1f7bf439..49abb71385f 100644 --- a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/hover/html/XtextBrowserInformationControlAdapter.java +++ b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/hover/html/XtextBrowserInformationControlAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2012, 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. @@ -8,10 +8,8 @@ *******************************************************************************/ package org.eclipse.xtext.ui.editor.hover.html; -import java.lang.reflect.Method; import org.apache.log4j.Logger; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.internal.text.html.BrowserInformationControl; import org.eclipse.jface.internal.text.html.BrowserInformationControlInput; import org.eclipse.jface.text.IInputChangedListener; @@ -20,7 +18,6 @@ import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; -import org.osgi.framework.Version; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -149,16 +146,7 @@ public void addInputChangeListener(IInputChangedListener inputChangeListener) { @Override public void setDisposeTimeout(int disposeTimeout) { - try { - Method m = BrowserInformationControl.class.getDeclaredMethod("setDisposeTimeout", int.class); - m.invoke(control, disposeTimeout); - } catch (ReflectiveOperationException e) { - if (Platform.getBundle("org.eclipse.jface.text").getVersion().compareTo(new Version(3,24,0)) >= 0) { - LOG.error("Unexpected reflection failure", e); - } else { - // OK, method not there in older versions - } - } + control.setDisposeTimeout(disposeTimeout); } } \ No newline at end of file From ccfe59324994d21783348e1f3465a135d38995ea Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Thu, 31 Oct 2024 06:14:51 +0100 Subject: [PATCH 11/14] remove m2e reflection --- .../xtend/m2e/XtendProjectConfigurator.java | 21 ++-------------- .../xtext/m2e/XtextProjectConfigurator.java | 24 +++---------------- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/org.eclipse.xtend.m2e/src/org/eclipse/xtend/m2e/XtendProjectConfigurator.java b/org.eclipse.xtend.m2e/src/org/eclipse/xtend/m2e/XtendProjectConfigurator.java index d704f708266..334c3c8c3ab 100644 --- a/org.eclipse.xtend.m2e/src/org/eclipse/xtend/m2e/XtendProjectConfigurator.java +++ b/org.eclipse.xtend.m2e/src/org/eclipse/xtend/m2e/XtendProjectConfigurator.java @@ -15,7 +15,6 @@ import static org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.getOutputForSourceFolderKey; import java.io.File; -import java.lang.reflect.Method; import java.util.List; import org.apache.maven.plugin.MojoExecution; @@ -26,7 +25,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest; import org.eclipse.xtend.core.compiler.XtendOutputConfigurationProvider; @@ -158,25 +156,10 @@ private T mojoParameterValue(String paramName, Class paramType, ProjectCo } static IProject getProject(ProjectConfigurationRequest request) { - return XtendProjectConfigurator.call(request, "getMavenProjectFacade", "mavenProjectFacade").getProject(); + return request.mavenProjectFacade().getProject(); } static MavenProject getMavenProject(ProjectConfigurationRequest request) { - return call(request, "getMavenProject", "mavenProject"); - } - - @SuppressWarnings("unchecked") - private static R call(T obj, String oldMethodName, String newMethodName) { - try { - Method method = obj.getClass().getMethod(oldMethodName); - return (R) method.invoke(obj); - } catch (ReflectiveOperationException er) { - try { // We are probably running with M2E >= 2.0 try the new method name - Method method = obj.getClass().getMethod(newMethodName); - return (R) method.invoke(obj); - } catch (ReflectiveOperationException e) { - throw new IllegalStateException(e); - } - } + return request.mavenProject(); } } \ No newline at end of file diff --git a/org.eclipse.xtext.m2e/src/org/eclipse/xtext/m2e/XtextProjectConfigurator.java b/org.eclipse.xtext.m2e/src/org/eclipse/xtext/m2e/XtextProjectConfigurator.java index e85e1ee5c71..1087cb86f1f 100644 --- a/org.eclipse.xtext.m2e/src/org/eclipse/xtext/m2e/XtextProjectConfigurator.java +++ b/org.eclipse.xtext.m2e/src/org/eclipse/xtext/m2e/XtextProjectConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2014, 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. @@ -24,10 +24,8 @@ import static org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.getIgnoreSourceFolderKey; import static org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.getKey; import static org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.getOutputForSourceFolderKey; -import org.eclipse.m2e.core.project.IMavenProjectFacade; import java.io.File; -import java.lang.reflect.Method; import java.util.List; import org.apache.maven.plugin.MojoExecution; @@ -129,26 +127,10 @@ private String makeProjectRelative(String fileName, } static IProject getProject(ProjectConfigurationRequest request) { - return XtextProjectConfigurator.call(request, "getMavenProjectFacade", "mavenProjectFacade").getProject(); + return request.mavenProjectFacade().getProject(); } static MavenProject getMavenProject(ProjectConfigurationRequest request) { - return call(request, "getMavenProject", "mavenProject"); + return request.mavenProject(); } - - @SuppressWarnings("unchecked") - private static R call(T obj, String oldMethodName, String newMethodName) { - try { - Method method = obj.getClass().getMethod(oldMethodName); - return (R) method.invoke(obj); - } catch (ReflectiveOperationException er) { - try { // We are probably running with M2E >= 2.0 try the new method name - Method method = obj.getClass().getMethod(newMethodName); - return (R) method.invoke(obj); - } catch (ReflectiveOperationException e) { - throw new IllegalStateException(e); - } - } - } - } \ No newline at end of file From e0a726d7d18fa53440c585b0f61cccb125ff4db8 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 5 Nov 2024 06:06:40 +0100 Subject: [PATCH 12/14] adjust launches Signed-off-by: Christian Dietrich --- org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch | 2 +- org.eclipse.xtend.core.tests/xtend.core.tests.launch | 2 +- org.eclipse.xtend.doc/gen_eclipse_help_xtend.launch | 2 +- .../xtend.ide.tests.slow (SWTBot).launch | 2 +- org.eclipse.xtend.ide.tests/xtend.ide.tests (xtend).launch | 2 +- org.eclipse.xtend.ide.tests/xtend.ide.tests.launch | 2 +- org.eclipse.xtend.performance.tests/performance.tests.launch | 2 +- .../org.eclipse.xtext.builder.standalone.tests.launch | 2 +- org.eclipse.xtext.builder.tests/xtext.builder.tests.fast.launch | 2 +- .../xtext.builder.tests.nojdt.launch | 2 +- .../META-INF/MANIFEST.MF_gen | 2 +- .../xtext.common.types.eclipse.tests.launch | 2 +- org.eclipse.xtext.doc/gen_eclipse_help_xtext.launch | 2 +- org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF_gen | 2 +- .../xtext.eclipse.tests (xtend).launch | 2 +- org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests.launch | 2 +- org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen | 2 +- .../org.eclipse.xtext.extras.tests.launch | 2 +- .../xtext.purexbase.eclipse.tests.launch | 2 +- org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen | 2 +- org.eclipse.xtext.tests/xtext.tests.launch | 2 +- org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen | 2 +- org.eclipse.xtext.ui.tests/xtext.ui.tests.fast.launch | 2 +- org.eclipse.xtext.ui.tests/xtext.ui.tests.slow.launch | 2 +- org.eclipse.xtext.web/xtext.web.tests.launch | 2 +- .../xtext.xbase.ui.tests (xtend).launch | 2 +- .../xtext.xbase.ui.tests.fast.launch | 2 +- .../xtext.xbase.ui.tests.slow.launch | 2 +- org.eclipse.xtext.xbase.web/xtext.xbase.web.tests.launch | 2 +- .../buildDomainmodel.launch | 2 +- .../org.eclipse.xtext.example.domainmodel.ui.tests.launch | 2 +- .../xtext.xtext.ui.graph.tests.launch | 2 +- .../xtext.xtext.ui.tests.fast.launch | 2 +- .../xtext.xtext.ui.tests.slow.launch | 2 +- org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF_gen | 2 +- org.eclipse.xtext/META-INF/MANIFEST.MF_gen | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch b/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch index 7efff7c47ce..de5c416532b 100644 --- a/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch +++ b/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtend.core.tests/xtend.core.tests.launch b/org.eclipse.xtend.core.tests/xtend.core.tests.launch index dab5d3798de..83b8938e198 100644 --- a/org.eclipse.xtend.core.tests/xtend.core.tests.launch +++ b/org.eclipse.xtend.core.tests/xtend.core.tests.launch @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtend.doc/gen_eclipse_help_xtend.launch b/org.eclipse.xtend.doc/gen_eclipse_help_xtend.launch index d4b31a1f81b..5cd8b78ef85 100644 --- a/org.eclipse.xtend.doc/gen_eclipse_help_xtend.launch +++ b/org.eclipse.xtend.doc/gen_eclipse_help_xtend.launch @@ -10,7 +10,7 @@ - + diff --git a/org.eclipse.xtend.ide.swtbot.tests/xtend.ide.tests.slow (SWTBot).launch b/org.eclipse.xtend.ide.swtbot.tests/xtend.ide.tests.slow (SWTBot).launch index 1dfc544f235..2be8211491c 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/xtend.ide.tests.slow (SWTBot).launch +++ b/org.eclipse.xtend.ide.swtbot.tests/xtend.ide.tests.slow (SWTBot).launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtend.ide.tests/xtend.ide.tests (xtend).launch b/org.eclipse.xtend.ide.tests/xtend.ide.tests (xtend).launch index 98d77957f48..af7edeb4f71 100644 --- a/org.eclipse.xtend.ide.tests/xtend.ide.tests (xtend).launch +++ b/org.eclipse.xtend.ide.tests/xtend.ide.tests (xtend).launch @@ -28,7 +28,7 @@ - + diff --git a/org.eclipse.xtend.ide.tests/xtend.ide.tests.launch b/org.eclipse.xtend.ide.tests/xtend.ide.tests.launch index 424eb983f9c..3a38bead58b 100644 --- a/org.eclipse.xtend.ide.tests/xtend.ide.tests.launch +++ b/org.eclipse.xtend.ide.tests/xtend.ide.tests.launch @@ -28,7 +28,7 @@ - + diff --git a/org.eclipse.xtend.performance.tests/performance.tests.launch b/org.eclipse.xtend.performance.tests/performance.tests.launch index 81c61a33afa..a05364a720b 100644 --- a/org.eclipse.xtend.performance.tests/performance.tests.launch +++ b/org.eclipse.xtend.performance.tests/performance.tests.launch @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.builder.standalone.tests/org.eclipse.xtext.builder.standalone.tests.launch b/org.eclipse.xtext.builder.standalone.tests/org.eclipse.xtext.builder.standalone.tests.launch index f82631d7455..fc679c07504 100644 --- a/org.eclipse.xtext.builder.standalone.tests/org.eclipse.xtext.builder.standalone.tests.launch +++ b/org.eclipse.xtext.builder.standalone.tests/org.eclipse.xtext.builder.standalone.tests.launch @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.builder.tests/xtext.builder.tests.fast.launch b/org.eclipse.xtext.builder.tests/xtext.builder.tests.fast.launch index 329e550031c..627b0680afe 100644 --- a/org.eclipse.xtext.builder.tests/xtext.builder.tests.fast.launch +++ b/org.eclipse.xtext.builder.tests/xtext.builder.tests.fast.launch @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.builder.tests/xtext.builder.tests.nojdt.launch b/org.eclipse.xtext.builder.tests/xtext.builder.tests.nojdt.launch index c8052d5f5c7..712946d18b6 100644 --- a/org.eclipse.xtext.builder.tests/xtext.builder.tests.nojdt.launch +++ b/org.eclipse.xtext.builder.tests/xtext.builder.tests.nojdt.launch @@ -39,7 +39,7 @@ - + diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen index 935450f931a..87e26d82385 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.common.types.eclipse.tests Bundle-SymbolicName: org.eclipse.xtext.common.types.eclipse.tests; singleton:=true Bundle-Version: 0.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.common.types.xtext.ui Require-Bundle: org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional, diff --git a/org.eclipse.xtext.common.types.eclipse.tests/xtext.common.types.eclipse.tests.launch b/org.eclipse.xtext.common.types.eclipse.tests/xtext.common.types.eclipse.tests.launch index 92a8fe785a7..0b95fe175e2 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/xtext.common.types.eclipse.tests.launch +++ b/org.eclipse.xtext.common.types.eclipse.tests/xtext.common.types.eclipse.tests.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.doc/gen_eclipse_help_xtext.launch b/org.eclipse.xtext.doc/gen_eclipse_help_xtext.launch index aae83ace682..bbbad21d143 100644 --- a/org.eclipse.xtext.doc/gen_eclipse_help_xtext.launch +++ b/org.eclipse.xtext.doc/gen_eclipse_help_xtext.launch @@ -10,7 +10,7 @@ - + diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF_gen index 604ef85f95d..8aca5072f82 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.tests Bundle-SymbolicName: org.eclipse.xtext.tests; singleton:=true Bundle-Version: 0.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.linking.lazy, org.eclipse.xtext.parser.fragments, diff --git a/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests (xtend).launch b/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests (xtend).launch index f49ed0d4347..4fd72f1a5c9 100644 --- a/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests (xtend).launch +++ b/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests (xtend).launch @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests.launch b/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests.launch index f1c0355ecaf..35dae349ea7 100644 --- a/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests.launch +++ b/org.eclipse.xtext.eclipse.tests/xtext.eclipse.tests.launch @@ -25,7 +25,7 @@ - + diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen index 3c6a06b65a2..f63256526f5 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.extras.tests Bundle-SymbolicName: org.eclipse.xtext.extras.tests;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.enumrules, org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage, diff --git a/org.eclipse.xtext.extras.tests/org.eclipse.xtext.extras.tests.launch b/org.eclipse.xtext.extras.tests/org.eclipse.xtext.extras.tests.launch index 81a63f1d74b..571d46a9dc5 100644 --- a/org.eclipse.xtext.extras.tests/org.eclipse.xtext.extras.tests.launch +++ b/org.eclipse.xtext.extras.tests/org.eclipse.xtext.extras.tests.launch @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/xtext.purexbase.eclipse.tests.launch b/org.eclipse.xtext.purexbase.eclipse.tests/xtext.purexbase.eclipse.tests.launch index 7943464ca3d..cf536815175 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/xtext.purexbase.eclipse.tests.launch +++ b/org.eclipse.xtext.purexbase.eclipse.tests/xtext.purexbase.eclipse.tests.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch index 570436de161..600c53e10aa 100644 --- a/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch +++ b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen index 0da8dcbae2d..c8685852656 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.tests Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext, org.eclipse.xtext.dummy, diff --git a/org.eclipse.xtext.tests/xtext.tests.launch b/org.eclipse.xtext.tests/xtext.tests.launch index 080d5f856cd..5070109c18f 100644 --- a/org.eclipse.xtext.tests/xtext.tests.launch +++ b/org.eclipse.xtext.tests/xtext.tests.launch @@ -19,7 +19,7 @@ - + diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen index 2f757c0696a..0fd64e7a300 100644 --- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.ui.tests Bundle-SymbolicName: org.eclipse.xtext.ui.tests;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ui.tests, org.eclipse.xtext.ui.tests.editor.bracketmatching, diff --git a/org.eclipse.xtext.ui.tests/xtext.ui.tests.fast.launch b/org.eclipse.xtext.ui.tests/xtext.ui.tests.fast.launch index 342d550b353..5480a099525 100644 --- a/org.eclipse.xtext.ui.tests/xtext.ui.tests.fast.launch +++ b/org.eclipse.xtext.ui.tests/xtext.ui.tests.fast.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.ui.tests/xtext.ui.tests.slow.launch b/org.eclipse.xtext.ui.tests/xtext.ui.tests.slow.launch index 4f028fe4219..b2f732bb61f 100644 --- a/org.eclipse.xtext.ui.tests/xtext.ui.tests.slow.launch +++ b/org.eclipse.xtext.ui.tests/xtext.ui.tests.slow.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.web/xtext.web.tests.launch b/org.eclipse.xtext.web/xtext.web.tests.launch index c56ad631b01..631e48a1036 100644 --- a/org.eclipse.xtext.web/xtext.web.tests.launch +++ b/org.eclipse.xtext.web/xtext.web.tests.launch @@ -15,7 +15,7 @@ - + diff --git a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests (xtend).launch b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests (xtend).launch index 1b0777ea8ee..8d980b98439 100644 --- a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests (xtend).launch +++ b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests (xtend).launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.fast.launch b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.fast.launch index 5019670fcc3..ec5fc65613a 100644 --- a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.fast.launch +++ b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.fast.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.slow.launch b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.slow.launch index fbd5ee8fb66..a53b1715dba 100644 --- a/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.slow.launch +++ b/org.eclipse.xtext.xbase.ui.tests/xtext.xbase.ui.tests.slow.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xbase.web/xtext.xbase.web.tests.launch b/org.eclipse.xtext.xbase.web/xtext.xbase.web.tests.launch index 48f5458ce11..cdca407e3da 100644 --- a/org.eclipse.xtext.xbase.web/xtext.xbase.web.tests.launch +++ b/org.eclipse.xtext.xbase.web/xtext.xbase.web.tests.launch @@ -15,7 +15,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/buildDomainmodel.launch b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/buildDomainmodel.launch index 7796f799928..b5eef24f5b0 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/buildDomainmodel.launch +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/buildDomainmodel.launch @@ -13,6 +13,6 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/org.eclipse.xtext.example.domainmodel.ui.tests.launch b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/org.eclipse.xtext.example.domainmodel.ui.tests.launch index b35c039ad60..a3a75f5be0e 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/org.eclipse.xtext.example.domainmodel.ui.tests.launch +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui.tests/org.eclipse.xtext.example.domainmodel.ui.tests.launch @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/xtext.xtext.ui.graph.tests.launch b/org.eclipse.xtext.xtext.ui.graph.tests/xtext.xtext.ui.graph.tests.launch index e9c0146e9f6..bfe21f3fe35 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/xtext.xtext.ui.graph.tests.launch +++ b/org.eclipse.xtext.xtext.ui.graph.tests/xtext.xtext.ui.graph.tests.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.fast.launch b/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.fast.launch index 50c5dec6943..4144725d07e 100644 --- a/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.fast.launch +++ b/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.fast.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.slow.launch b/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.slow.launch index 947d090d1cd..a9732c253b5 100644 --- a/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.slow.launch +++ b/org.eclipse.xtext.xtext.ui.tests/xtext.xtext.ui.tests.slow.launch @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF_gen index c6f019f8e59..4343b20ec5d 100644 --- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.xtext.ui Bundle-SymbolicName: org.eclipse.xtext.xtext.ui Bundle-Version: 0.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ui, org.eclipse.ui.editors, diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext/META-INF/MANIFEST.MF_gen index e63d7b4295d..197c2b94360 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext Bundle-SymbolicName: org.eclipse.xtext Bundle-Version: 0.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext Require-Bundle: org.eclipse.xtext, From 9b7f85a63f7ac74015b328ce4e275e89d45d445f Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 19 Nov 2024 11:58:36 +0100 Subject: [PATCH 13/14] updated wizard expectations --- .../mavenTychoJUnit5.target/mavenTychoJUnit5.target.target | 2 +- .../mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target index 5dec1c4b771..82744d50a30 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml index 03b7744105c..06d506688a8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0.M1 + 2.20.0 UTF-8 17 17 From 8b5474b8bdab92b172855cb34d9537e604539f5b Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 26 Nov 2024 10:05:17 +0100 Subject: [PATCH 14/14] some more defaults changed to java 17 --- .../src/org/eclipse/xtext/ui/util/JREContainerProvider.java | 2 +- .../src/org/eclipse/xtext/util/JavaRuntimeVersion.java | 2 +- .../eclipse/xtext/xtext/generator/model/ManifestAccess.xtend | 2 +- .../org/eclipse/xtext/xtext/generator/model/ManifestAccess.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/util/JREContainerProvider.java b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/util/JREContainerProvider.java index 826f6ebbab5..c858635ef52 100644 --- a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/util/JREContainerProvider.java +++ b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/util/JREContainerProvider.java @@ -43,7 +43,7 @@ public class JREContainerProvider { /** * @since 2.7 */ - public static final String PREFERRED_BREE = "JavaSE-11"; + public static final String PREFERRED_BREE = "JavaSE-17"; private static IVMInstall defaultVMInstall = null; private static boolean defaultVMinitialized = false; diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaRuntimeVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaRuntimeVersion.java index e80af13dd32..5a474a0ed6f 100644 --- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaRuntimeVersion.java +++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaRuntimeVersion.java @@ -95,7 +95,7 @@ static int determineJavaVersion(String javaVersion) { // ok } // fallback - return 11; + return 17; } } diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend index cc4ebeb9ec9..fd03351e41d 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend @@ -112,7 +112,7 @@ class ManifestAccess extends TextFileAccess implements IGuiceAwareGeneratorCompo �IF !version.nullOrEmpty� Bundle-Version: �version� �ENDIF� - Bundle-RequiredExecutionEnvironment: JavaSE-11 + Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy �IF !exportedPackages.empty� Export-Package: �FOR pack : exportedPackages.sort SEPARATOR ',\n '��pack��ENDFOR� diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java index 5475cf5f183..dee283a1c07 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java @@ -168,7 +168,7 @@ public CharSequence getContent() { _builder.newLineIfNotEmpty(); } } - _builder.append("Bundle-RequiredExecutionEnvironment: JavaSE-11"); + _builder.append("Bundle-RequiredExecutionEnvironment: JavaSE-17"); _builder.newLine(); _builder.append("Bundle-ActivationPolicy: lazy"); _builder.newLine();