From e97d4647c01dd73ca4e24a8bd7c70a0621a1ff48 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 13 Mar 2026 19:49:02 +0100 Subject: [PATCH] Set default Java version to 21 in Xtext/Xtend Maven plugins --- .../org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java | 4 ++-- .../org/eclipse/xtext/maven/AbstractXtextGeneratorMojo.java | 4 ++-- .../generate/xcore-auto-mapping/sample-auto.emf/model/a.xcore | 4 ++-- .../it/generate/xcore-mapping/sample.emf/model/a.xcore | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.xtend.maven.plugin/src/main/java/org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java b/org.eclipse.xtend.maven.plugin/src/main/java/org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java index 2f7b0c79644..1201f0a3708 100644 --- a/org.eclipse.xtend.maven.plugin/src/main/java/org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java +++ b/org.eclipse.xtend.maven.plugin/src/main/java/org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java @@ -44,10 +44,10 @@ public boolean apply(String filePath) { /** * Create Java Source Code that is compatible to this Java version. - * + * * Supported values: 11, 17, 21 and so forth */ - @Parameter(property="maven.compiler.source", defaultValue="11") + @Parameter(property="maven.compiler.source", defaultValue="21") private String javaSourceVersion; /** diff --git a/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/AbstractXtextGeneratorMojo.java b/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/AbstractXtextGeneratorMojo.java index 53def48a643..4f09a156c2e 100644 --- a/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/AbstractXtextGeneratorMojo.java +++ b/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/AbstractXtextGeneratorMojo.java @@ -95,10 +95,10 @@ public String getEncoding() { @Parameter(defaultValue = "true") private boolean failOnValidationError = true; - @Parameter(property = "maven.compiler.source", defaultValue = "11") + @Parameter(property = "maven.compiler.source", defaultValue = "21") private String compilerSourceLevel; - @Parameter(property = "maven.compiler.target", defaultValue = "11") + @Parameter(property = "maven.compiler.target", defaultValue = "21") private String compilerTargetLevel; /** * Create Java Source Code that is compatible to this Java release. diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/model/a.xcore b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/model/a.xcore index 4abc8c1c5df..fd5757da589 100644 --- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/model/a.xcore +++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-auto-mapping/sample-auto.emf/model/a.xcore @@ -7,12 +7,12 @@ editPluginID="sample-auto.emf.edit", forceOverwrite="true", resource="XMI", - complianceLevel="11.0" + complianceLevel="21.0" ) package axcore annotation "http://www.eclipse.org/emf/2002/GenModel" as GenModel class ModelA { - + } \ No newline at end of file diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/model/a.xcore b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/model/a.xcore index 14580188853..61665ede599 100644 --- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/model/a.xcore +++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/model/a.xcore @@ -7,12 +7,12 @@ editPluginID="sample.emf.edit", forceOverwrite="true", resource="XMI", - complianceLevel="11.0" + complianceLevel="21.0" ) package axcore annotation "http://www.eclipse.org/emf/2002/GenModel" as GenModel class ModelA { - + } \ No newline at end of file