Merge branch 'stable-3.11' into stable-3.12

* stable-3.11:
  Add missing binding of ProjectDeletedListener
  Fix the Docker-based setup for the HA test environment
  Verify high-availability formatting using GJF 1.7
  Use Java 21 for the Gerrit image
  Fix incorrect conflict resolution in Iaf0960a595
  Use GerritForge fork of the nfs-server

Change-Id: I0285d2c7efcb9dbd52dab88ab14649f813c0f40d

src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
index 1a76c66..6a90e73 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
@@ -24,6 +24,9 @@
 import com.ericsson.gerrit.plugins.highavailability.indexsync.IndexSyncModule;
 import com.ericsson.gerrit.plugins.highavailability.lock.FileBasedLockManager;
 import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfoModule;
+import com.gerritforge.gerrit.globalrefdb.validation.ProjectDeletedSharedDbCleanup;
+import com.google.gerrit.extensions.events.ProjectDeletedListener;
+import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.inject.Inject;
 import com.google.inject.Provides;
@@ -76,6 +79,8 @@
 
     if (config.sharedRefDb().getSharedRefDb().isEnabled()) {
       listener().to(PluginStartup.class);
+      DynamicSet.bind(binder(), ProjectDeletedListener.class)
+          .to(ProjectDeletedSharedDbCleanup.class);
     }
   }
 

src/test/docker/docker-compose.yaml

diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index d2b971f..fe4ed3b 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -20,7 +20,7 @@
       gerrit-net:
         ipv4_address: 192.168.1.5
     volumes:
-      - nfs-server-volume:/var/gerrit/git
+      - nfs-server-volume:/var/gerrit
 
   zookeeper-refdb:
     image: zookeeper

src/test/docker/gerrit/Dockerfile

diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 04b58a1..f5f7bf5 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -3,7 +3,7 @@
 # Install dependencies
 RUN yum -y install \
     git \
-    java-17-openjdk \
+    java-21-openjdk \
     procps \
     sudo \
     passwd \

src/test/docker/nfs/Dockerfile

diff --git a/src/test/docker/nfs/Dockerfile b/src/test/docker/nfs/Dockerfile
index e4a8adc..c24ee9f 100644
--- a/src/test/docker/nfs/Dockerfile
+++ b/src/test/docker/nfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM erichough/nfs-server
+FROM gerritforge/docker-nfs-server:3.11.3
 
 COPY exports.txt /etc/exports