[eclipse-xtext/xtext#1982] support for java 17

Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Oct 10, 2022 · 0ad885d · 0ad885d
1 parent 9bcd120
commit 0ad885d
Show file tree

Hide file tree

Showing 167 changed files with 417 additions and 1,360 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
   parameters {
     // see https://wiki.eclipse.org/Jenkins#JDK
     choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [
-       'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest'
+       'temurin-jdk11-latest', 'temurin-jdk17-latest'
     ])
     booleanParam(
       name: 'TRIGGER_DOWNSTREAM_BUILD', 

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 }
 
 plugins {
-  id 'org.ajoberstar.grgit' version '4.1.1'
+  id 'org.ajoberstar.grgit' version '5.0.0'
 }
 
 apply from: "${rootDir}/gradle/versions.gradle"

diff --git a/gradle/java-compiler-settings.gradle b/gradle/java-compiler-settings.gradle
@@ -2,7 +2,7 @@
  * Configuration of Java compiler, Javadoc, additional archives, and additional dependency configurations.
  */
 
-sourceCompatibility = '1.8'
+sourceCompatibility = '11'
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'ISO-8859-1'

diff --git a/org.eclipse.xtext.ide.tests/.classpath b/org.eclipse.xtext.ide.tests/.classpath
@@ -37,7 +37,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
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
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git 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.29.0.qualifier
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Xtext
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

diff --git a/org.eclipse.xtext.ide/.classpath b/org.eclipse.xtext.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
 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_arguments_in_allocation_expression=16

diff --git 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.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-Vendor: Eclipse Xtext

diff --git a/org.eclipse.xtext.testing/.classpath b/org.eclipse.xtext.testing/.classpath
@@ -19,7 +19,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git 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.29.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Xtext
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtext.testing,
  org.eclipse.xtext.testing.builder,
  org.eclipse.xtext.testing.extensions,

diff --git a/org.eclipse.xtext.testlanguages.ide/.classpath b/org.eclipse.xtext.testlanguages.ide/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
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
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
 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_arguments_in_allocation_expression=16

diff --git 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.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse Xtext
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;x-internal:=true,

diff --git a/org.eclipse.xtext.testlanguages/.classpath b/org.eclipse.xtext.testlanguages/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: org.apache.log4j;version="1.2.19",
  org.junit.runner.notification;version="4.12.0",
  org.junit.runners;version="4.12.0",
  org.junit.runners.model;version="4.12.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtext.testlanguages;x-internal:=true,
  org.eclipse.xtext.testlanguages.backtracking,
  org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage,

diff --git a/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath
@@ -42,7 +42,7 @@
 			<attribute name="gradle_used_by_scope" value="test,mwe2"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch
@@ -9,7 +9,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="ISO-8859-1"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
 <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.xtext.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2"/>

diff --git 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.29.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.mwe.utils;bundle-version="1.3.21",
  org.eclipse.xtext.util,

diff --git 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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.dummy,

diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java
@@ -29,6 +29,8 @@ public void test_fromBree() {
 
 	@Test
 	public void testFromQualifier() {
+		assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("17"));
+		assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("1.17"));
 		assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("11"));
 		assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("1.11"));
 		assertEquals(JavaVersion.JAVA10, JavaVersion.fromQualifier("10"));
@@ -49,6 +51,7 @@ public void testFromQualifier() {
 
 	@Test
 	public void test_getQualifier() {
+		assertEquals("17", JavaVersion.JAVA17.getQualifier());
 		assertEquals("11", JavaVersion.JAVA11.getQualifier());
 		assertEquals("10", JavaVersion.JAVA10.getQualifier());
 		assertEquals("9", JavaVersion.JAVA9.getQualifier());
@@ -65,6 +68,8 @@ public void test_isAtLeast() {
 
 	@Test
 	public void test_toJdtClassFileConstant () {
+		assertEquals(3997696, JavaVersion.JAVA17.toJdtClassFileConstant());
+		assertEquals(3604480, JavaVersion.JAVA11.toJdtClassFileConstant());
 		assertEquals(3538944, JavaVersion.JAVA10.toJdtClassFileConstant());
 		assertEquals(3473408, JavaVersion.JAVA9.toJdtClassFileConstant());
 		assertEquals(3407872, JavaVersion.JAVA8.toJdtClassFileConstant());

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
@@ -76,16 +76,6 @@ public void p2AndSdkProjectsAreBuiltWithTychoWhenMavenBuiltIsEnabled() {
 		assertTrue(config.getP2Project().pom().getContent().contains("eclipse-repository"));
 		assertTrue(config.getParentProject().pom().getContent().contains("tycho"));
 	}
-
-	@Test
-	public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabled() {
-		config.getUiProject().setEnabled(true);
-		config.getP2Project().setEnabled(true);
-		config.setPreferredBuildSystem(BuildSystem.MAVEN);
-		assertTrue(config.needsTychoBuild());
-		assertTrue(config.getParentProject().pom().getContent().contains("tycho-source-plugin"));
-		assertTrue(config.getParentProject().pom().getContent().contains("tycho-source-feature-plugin"));
-	}
 
 	@Test
 	public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabledJ11() {
@@ -363,15 +353,15 @@ public void tychoDoesNotFailOnMissingTests() {
 	}
 
 	@Test
-	public void allBuildSystemsUseJava8() {
+	public void allBuildSystemsUseJava11() {
 		String parentPom = config.getParentProject().pom().getContent();
-		assertTrue(parentPom.contains("<maven.compiler.source>1.8</maven.compiler.source>"));
-		assertTrue(parentPom.contains("<maven.compiler.target>1.8</maven.compiler.target>"));
+		assertTrue(parentPom.contains("<maven.compiler.source>11</maven.compiler.source>"));
+		assertTrue(parentPom.contains("<maven.compiler.target>11</maven.compiler.target>"));
 		String parentGradle = config.getParentProject().buildGradle().getContent();
-		assertTrue(parentGradle.contains("sourceCompatibility = \'1.8\'"));
-		assertTrue(parentGradle.contains("targetCompatibility = \'1.8\'"));
+		assertTrue(parentGradle.contains("sourceCompatibility = \'11\'"));
+		assertTrue(parentGradle.contains("targetCompatibility = \'11\'"));
 		for (String it : Lists.transform(allJavaProjects(), (ProjectDescriptor it) -> it.manifest())) {
-			assertTrue(it.contains("Bundle-RequiredExecutionEnvironment: JavaSE-1.8"));
+			assertTrue(it.contains("Bundle-RequiredExecutionEnvironment: JavaSE-11"));
 		}
 		;
 	}

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
@@ -139,7 +139,7 @@ public static void main(String[] args) {
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
-				project.setBaseName("mavenTychoJ11");
+				project.setBaseName("mavenTychoJ17");
 				project.setPreferredBuildSystem(BuildSystem.MAVEN);
 				project.setSourceLayout(SourceLayout.PLAIN);
 				project.setProjectLayout(ProjectLayout.HIERARCHICAL);
@@ -148,7 +148,7 @@ public static void main(String[] args) {
 				project.getUiProject().getTestProject().setEnabled(true);
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
-				project.setJavaVersion(JavaVersion.JAVA11);
+				project.setJavaVersion(JavaVersion.JAVA17);
 				project.setJunitVersion(JUnitVersion.JUNIT_5);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
 				project.setBaseName("gradle");
@@ -190,8 +190,8 @@ public static void main(String[] args) {
 				project.getWebProject().setEnabled(true);
 				project.getP2Project().setEnabled(true);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
-				project.setBaseName("mavenTychoP2J11");
-				project.setJavaVersion(JavaVersion.JAVA11);
+				project.setBaseName("mavenTychoP2J17");
+				project.setJavaVersion(JavaVersion.JAVA17);
 				project.setPreferredBuildSystem(BuildSystem.MAVEN);
 				project.setSourceLayout(SourceLayout.PLAIN);
 				project.setProjectLayout(ProjectLayout.HIERARCHICAL);

diff --git a/...t.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF b/...t.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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin.ide
diff --git a/...tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF b/...tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Require-Bundle: eclipsePlugin,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin.tests
diff --git a/...ts/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/...ts/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: eclipsePlugin.ui,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin.ui.tests
diff --git a/...xt.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF b/...xt.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.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0"
 Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin.ui
diff --git a/...ata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch b/...ata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch
@@ -18,7 +18,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>

diff --git a/...xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF b/...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.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin
diff --git a/...sts/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF b/...sts/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-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePluginP2.ide
diff --git a/...s/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF b/...s/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Require-Bundle: eclipsePluginP2,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePluginP2.tests
diff --git a/...estdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/...estdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: eclipsePluginP2.ui,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePluginP2.ui.tests
diff --git a/...ests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF b/...ests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Require-Bundle: eclipsePluginP2,
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0"
 Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePluginP2.ui
diff --git a/...wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch b/...wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch
@@ -18,7 +18,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>

diff --git a/...t.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF b/...t.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.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 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
@@ -26,8 +26,8 @@ subprojects {
 	group = 'full'
 	version = '1.0.0-SNAPSHOT'
 
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
+	sourceCompatibility = '11'
+	targetCompatibility = '11'
 
 	configurations.all {
 		exclude group: 'asm'