Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  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
  Add ProjectHeadUpdatedEvent to EventTypes

Release-Notes: skip
Change-Id: I698ea8e27fdc3d1c4ef57da5cb3d5c8cb2e7b4f2

3 files changed, 18 insertions, 0 deletions

diff --git a/java/com/google/gerrit/server/events/EventTypes.java b/java/com/google/gerrit/server/events/EventTypes.java
index e24bbd2de2..c2c057ce64 100644
--- a/java/com/google/gerrit/server/events/EventTypes.java
+++ b/java/com/google/gerrit/server/events/EventTypes.java
@@ -33,6 +33,7 @@ public class EventTypes {
     register(PatchSetCreatedEvent.TYPE, PatchSetCreatedEvent.class);
     register(PrivateStateChangedEvent.TYPE, PrivateStateChangedEvent.class);
     register(ProjectCreatedEvent.TYPE, ProjectCreatedEvent.class);
+    register(ProjectHeadUpdatedEvent.TYPE, ProjectHeadUpdatedEvent.class);
     register(RefReceivedEvent.TYPE, RefReceivedEvent.class);
     register(RefUpdatedEvent.TYPE, RefUpdatedEvent.class);
     register(ReviewerAddedEvent.TYPE, ReviewerAddedEvent.class);
diff --git a/javatests/com/google/gerrit/server/events/EventDeserializerTest.java b/javatests/com/google/gerrit/server/events/EventDeserializerTest.java
index 390aa844c8..05d6df75c8 100644
--- a/javatests/com/google/gerrit/server/events/EventDeserializerTest.java
+++ b/javatests/com/google/gerrit/server/events/EventDeserializerTest.java
@@ -227,6 +227,21 @@ public class EventDeserializerTest {
   }
 
   @Test
+  public void projectHeadUpdatedEvent() {
+    ProjectHeadUpdatedEvent event = new ProjectHeadUpdatedEvent();
+    event.projectName = "test_project";
+    event.oldHead = "refs/heads/master";
+    event.newHead = "refs/heads/main";
+
+    ProjectHeadUpdatedEvent actual = roundTrip(event);
+
+    assertThat(actual).isNotNull();
+    assertThat(actual.projectName).isEqualTo(event.projectName);
+    assertThat(actual.oldHead).isEqualTo(event.oldHead);
+    assertThat(actual.newHead).isEqualTo(event.newHead);
+  }
+
+  @Test
   public void shouldSerializeAllProjectsToString() {
     String allProjectsString = "foobar";
     AllProjectsName allProjectsNameKey = new AllProjectsName(allProjectsString);
diff --git a/tools/bzl/javadoc.bzl b/tools/bzl/javadoc.bzl
index 3add0258ce..abf3b7a15f 100644
--- a/tools/bzl/javadoc.bzl
+++ b/tools/bzl/javadoc.bzl
@@ -37,6 +37,7 @@ def _impl(ctx):
         "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 @@ java_doc = rule(
     },
     outputs = {"zip": "%{name}.zip"},
     implementation = _impl,
+    fragments = ["java"],
 )