You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by us...@apache.org on 2023/11/14 22:06:51 UTC

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

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

uschindler pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new f45293054eb Fix errorprone with alternative runtime (ported from https://github.com/apache/lucene/pull/12808)
f45293054eb is described below

commit f45293054eb53381ee6f102b61ac68c9f7acaa57
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Tue Nov 14 23:05:10 2023 +0100

    Fix errorprone with alternative runtime (ported from https://github.com/apache/lucene/pull/12808)
---
 gradle/validation/error-prone.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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)