This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 40926bcdd3f Build: remove hard-coded Java versions from
ecj.javadocs.prefs
40926bcdd3f is described below
commit 40926bcdd3f279022746e46b46f124f3cc12747c
Author: David Smiley <[email protected]>
AuthorDate: Tue May 13 23:26:04 2025 -0400
Build: remove hard-coded Java versions from ecj.javadocs.prefs
(partial cherry-pick from Lucene PR #14651 branch_10x)
---
gradle/validation/ecj-lint.gradle | 4 ++++
gradle/validation/ecj-lint/ecj.javadocs.prefs | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gradle/validation/ecj-lint.gradle
b/gradle/validation/ecj-lint.gradle
index 86f30cd5f1f..e8dd4e95a0a 100644
--- a/gradle/validation/ecj-lint.gradle
+++ b/gradle/validation/ecj-lint.gradle
@@ -54,6 +54,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.
@@ -62,6 +64,8 @@ allprojects {
args += [ "-d", "none" ]
+ assert project.java.sourceCompatibility ==
project.java.targetCompatibility
+
// Compilation environment.
args += [ "-source", project.java.sourceCompatibility ]
args += [ "-target", project.java.targetCompatibility ]
diff --git a/gradle/validation/ecj-lint/ecj.javadocs.prefs
b/gradle/validation/ecj-lint/ecj.javadocs.prefs
index 74278547699..7d3d157d49f 100644
--- a/gradle/validation/ecj-lint/ecj.javadocs.prefs
+++ b/gradle/validation/ecj-lint/ecj.javadocs.prefs
@@ -5,8 +5,6 @@
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
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.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -93,4 +91,3 @@
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=17
