Skip to content

Apache Lucene open-source search software

Remove duplicate -Xlint:options flags. Fixes #14782 (#14788)

Dawid Weiss972b4e8a5438
diff --git a/build-tools/build-infra/src/main/groovy/lucene.java.core.mrjar.gradle b/build-tools/build-infra/src/main/groovy/lucene.java.core.mrjar.gradle
index f4bb5e01e5f..2bf5bc12954 100644
--- a/build-tools/build-infra/src/main/groovy/lucene.java.core.mrjar.gradle
+++ b/build-tools/build-infra/src/main/groovy/lucene.java.core.mrjar.gradle
@@ -32,9 +32,14 @@ configure(project(":lucene:core")) {
tasks.named("compileMain${jdkVersion}Java").configure {
def apijar = apijars.file("jdk${jdkVersion}.apijar")
+ // TODO: this depends on the order of argument configuration...
int releaseIndex = options.compilerArgs.indexOf("--release")
options.compilerArgs.removeAt(releaseIndex)
options.compilerArgs.removeAt(releaseIndex)
+
+ // Remove conflicting options for the linter. #14782
+ options.compilerArgs.removeAll("-Xlint:options")
+
options.compilerArgs += [
"-Xlint:-options",
"--add-exports",
@@ -44,9 +49,6 @@ configure(project(":lucene:core")) {
"java.base/jdk.incubator.vector=ALL-UNNAMED",
]
- // hack because -Xlint:-options does not work for all options (regression in JDK 25+): #14782
- options.compilerArgs.remove("-Werror")
-
def argsProvider = objects.newInstance(CompilerArgsProvider)
argsProvider.apiJarFile.set(apijar)
options.compilerArgumentProviders.add(argsProvider)