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 2022/01/07 08:07:24 UTC
[solr] branch main updated: SOLR-15876: Only disable error-prone, if it is running as an alternate runtime JVM (#502)
This is an automated email from the ASF dual-hosted git repository.
uschindler 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 384d483 SOLR-15876: Only disable error-prone, if it is running as an alternate runtime JVM (#502)
384d483 is described below
commit 384d4830838169805c70c2a81a36432ecc791290
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Fri Jan 7 09:07:18 2022 +0100
SOLR-15876: Only disable error-prone, if it is running as an alternate runtime JVM (#502)
---
gradle/testing/alternative-jdk-support.gradle | 2 ++
gradle/validation/error-prone.gradle | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradle
index d12a39d..d36bd22 100644
--- a/gradle/testing/alternative-jdk-support.gradle
+++ b/gradle/testing/alternative-jdk-support.gradle
@@ -87,3 +87,5 @@ if (jvmGradle != jvmCurrent) {
// Set up root project's properties.
rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome
rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(jvmCurrent.javaHome).languageVersion
+rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent);
+
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index 1d55d9f..99ba520 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-def skipErrorProne = rootProject.runtimeJavaVersion > JavaVersion.VERSION_15;
+def skipErrorProne = rootProject.usesAltJvm && rootProject.runtimeJavaVersion > JavaVersion.VERSION_15;
if (skipErrorProne) {
configure(rootProject) {
task errorProneSkipped() {
doFirst {
- logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion})")
+ logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion} if used as alternative java toolchain)")
}
}
}
@@ -28,8 +28,10 @@ if (skipErrorProne) {
allprojects { prj ->
plugins.withType(JavaPlugin) {
- // LUCENE-9650: Errorprone on master/gradle does not work with JDK-16+
- // this is a hack to keep the dependency (so that palantir's version check doesn't complain)
+ // LUCENE-9650: Errorprone on master/gradle does not work with JDK-16+ 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)
// but don't include the plugin (which fails on JDK16+).
if (skipErrorProne) {
tasks.withType(JavaCompile) { task -> task.dependsOn ":errorProneSkipped" }