(lucene) branch branch_10x updated: Build: remove hard-coded Java versions from ecj.javadocs.prefs (#14651)

[ds...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_10x by this push:
     new f9647966a58 Build: remove hard-coded Java versions from ecj.javadocs.prefs (#14651)
f9647966a58 is described below

commit f9647966a5844392e57e58be47233592eb06b73e
Author: David Smiley <ds...@apache.org>
AuthorDate: Tue May 13 22:54:12 2025 -0400

    Build: remove hard-coded Java versions from ecj.javadocs.prefs (#14651)
    
    And retain correct Eclipse IDE configuration generation by templating org.eclipse.jdt.core.prefs with the JDK version.
    
    ---------
    
    Co-authored-by: Uwe Schindler <us...@apache.org>
    
    (cherry picked from commit 78da2ee038b2abf5cd87b02de7a7979480a2888d)
---
 gradle/ide/eclipse.gradle                                  | 3 ++-
 gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs | 3 +++
 gradle/validation/ecj-lint.gradle                          | 4 ++++
 gradle/validation/ecj-lint/ecj.javadocs.prefs              | 3 ---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle
index 7e115e4baaf..e58a73d8999 100644
--- a/gradle/ide/eclipse.gradle
+++ b/gradle/ide/eclipse.gradle
@@ -96,7 +96,8 @@ configure(rootProject) {
         from rootProject.file("${resources}/dot.settings")
         into rootProject.file(".settings")
         filter(ReplaceTokens, tokens: [
-                'ecj-lint-config': ecjLintFile.getText('UTF-8').replaceAll(/=error\b/, '=' + errorMode)
+                'ecj-lint-config': ecjLintFile.getText('UTF-8').replaceAll(/=error\b/, '=' + errorMode),
+                'eclipseJavaVersion': eclipseJavaVersion as String
         ])
         filteringCharset = 'UTF-8'
 
diff --git a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
index ec5e6f89430..2f4303bb257 100644
--- a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
+++ b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
 #Sun Sep 23 13:02:27 EDT 2012
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=@eclipseJavaVersion@
+org.eclipse.jdt.core.compiler.compliance=@eclipseJavaVersion@
+org.eclipse.jdt.core.compiler.source=@eclipseJavaVersion@
 # Note: all compiler flags are defined in ECJ linter configuration
 @ecj-lint-config@
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradle
index a98bd09e62e..3f0b72a6d6e 100644
--- a/gradle/validation/ecj-lint.gradle
+++ b/gradle/validation/ecj-lint.gradle
@@ -60,6 +60,8 @@ allprojects {
         classpath = rootProject.configurations.ecjDeps
         mainClass = "org.eclipse.jdt.internal.compiler.batch.Main"
 
+        // DOCS: https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-using_batch_compiler.htm
+
         // Don't emit any .class files.
         // Hack around "-d none" still emitting package-info.class
         // by running in a temporary directory.
@@ -68,6 +70,8 @@ allprojects {
 
         args += [ "-d", "none" ]
 
+        assert project.java.sourceCompatibility == project.java.targetCompatibility
+
         // Compilation environment.
         // we use -source/-target as it is significantly faster than --release
         args += [ "-source", project.java.sourceCompatibility ]
diff --git a/gradle/validation/ecj-lint/ecj.javadocs.prefs b/gradle/validation/ecj-lint/ecj.javadocs.prefs
index 6da3899a27f..5602e1e6b7b 100644
--- a/gradle/validation/ecj-lint/ecj.javadocs.prefs
+++ b/gradle/validation/ecj-lint/ecj.javadocs.prefs
@@ -10,9 +10,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 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=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -143,7 +141,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=HIGH
 org.eclipse.jdt.core.compiler.taskTags=nocommit