Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Fix errorprone with alternative runtime (ported from https://github.com/apache/lucene/pull/12808)

Uwe Schindlerebcb3b92f6f0
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index de8ee8d1de0..00e14ed0eab 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -17,8 +17,8 @@
def skipReason
-if (rootProject.usesAltJvm && rootProject.runtimeJavaVersion > JavaVersion.VERSION_15) {
- skipReason = "won't work with JDK ${rootProject.runtimeJavaVersion} if used as alternative java toolchain"
+if (rootProject.usesAltJvm) {
+ skipReason = "won't work with alternative java toolchain"
}
if (!propertyOrDefault("validation.errorprone", isCIBuild).asBoolean()) {
@@ -37,7 +37,7 @@ if (skipReason) {
allprojects { prj ->
plugins.withType(JavaPlugin) {
- // LUCENE-9650: Errorprone on master/gradle does not work with JDK-16+ when running as plugin
+ // LUCENE-9650: Errorprone on master/gradle does not work when running as plugin
// inside a forked Javac process. Javac running inside Gradle works, because we have
// additional module system opens in place.
// This is a hack to keep the dependency (so that palantir's version check doesn't complain)