From e03c3a89851bba8f1817072811c7f62aeaf654fb Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 26 Nov 2024 10:05:17 +0100 Subject: [PATCH] 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();