From 2442a2e9c064781120b78efe554ca3617bee8769 Mon Sep 17 00:00:00 2001 From: keertk Date: Wed, 26 Apr 2023 17:42:46 +0000 Subject: [PATCH] [6.2.0] default_java_toolchain.bzl cherry-picks to fix regression (#18225) * Disable 'IgnoredPureGetter' See https://github.com/bazelbuild/bazel/issues/16996 PiperOrigin-RevId: 494921387 Change-Id: I53dee7da0f321c50e303816b5fb85eda45949efa * Make LenientFormatStringValidation a warning PiperOrigin-RevId: 502649182 Change-Id: Ia69e5be9da817d7c25e51cad5086309515bb280a * Make ReturnMissingNullable a warning PiperOrigin-RevId: 502710013 Change-Id: I80f35a248623d293e187d481dc5ffbaff08bf25f * Redirect JVM warnings to stderr in general. In particular this avoids problems with JVM warnings clashing with the worker protocol, but also matches Blaze's idea of where output goes better. PiperOrigin-RevId: 524826411 Change-Id: If4c78ac5f63dfd4596da924c12552f6335b8034d --------- Co-authored-by: Googler Co-authored-by: Googler Co-authored-by: Googler --- tools/jdk/default_java_toolchain.bzl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index c7d7642e0f7029..0a3178358d9d47 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -38,6 +38,11 @@ BASE_JDK9_JVM_OPTS = [ # TODO(b/64485048): Disable this option in persistent worker mode only. # Disable symlinks resolution cache since symlinks in exec root change "-Dsun.io.useCanonCaches=false", + + # Since https://bugs.openjdk.org/browse/JDK-8153723, JVM logging goes to stdout. This + # makes it go to stderr instead. + "-Xlog:disable", + "-Xlog:all=warning:stderr:uptime,level,tags", ] JDK9_JVM_OPTS = BASE_JDK9_JVM_OPTS @@ -49,7 +54,11 @@ DEFAULT_JAVACOPTS = [ "-parameters", # https://github.com/bazelbuild/bazel/issues/15219 "-Xep:ReturnValueIgnored:OFF", + # https://github.com/bazelbuild/bazel/issues/16996 + "-Xep:IgnoredPureGetter:OFF", "-Xep:EmptyTopLevelDeclaration:OFF", + "-Xep:LenientFormatStringValidation:OFF", + "-Xep:ReturnMissingNullable:OFF", ] # java_toolchain parameters without specifying javac, java.compiler,