Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Emit refUpdate event upon copy-approvals
  Revert "Enforce Java 11 source version with JDK17"
  Enforce Java 11 source version with JDK17
  javadoc: Include the default jvm options

Release-Notes: skip
Change-Id: I9c3b40cfdbb0092bf2a022cce1a1dce6d06d96f2

tools/bzl/javadoc.bzl

diff --git a/tools/bzl/javadoc.bzl b/tools/bzl/javadoc.bzl
index 3add025..abf3b7a 100644
--- a/tools/bzl/javadoc.bzl
+++ b/tools/bzl/javadoc.bzl
@@ -37,6 +37,7 @@
         "mkdir %s" % dir,
         " ".join([
             "%s/bin/javadoc" % ctx.attr._jdk[java_common.JavaRuntimeInfo].java_home,
+            " ".join(["-J%s" % opt for opt in ctx.fragments.java.default_jvm_opts]),
             "-Xdoclint:-missing",
             "-protected",
             "-encoding UTF-8",
@@ -75,4 +76,5 @@
     },
     outputs = {"zip": "%{name}.zip"},
     implementation = _impl,
+    fragments = ["java"],
 )