Merge branch 'stable-3.7' into stable-3.8
* stable-3.7:
Remove unused Java class InitProjectException
Invoke the service method when using ProjectInitializationAction
Add missing local JGit fetch test assertion
Fix typo in test names
Do not rely on async/wait for synchronous fetch replication
Make sure that the EventListener receives replication events
Add mirror replication option for JGit client
Remove unnecessary checked exception
Cover the replication failure scenario and fix the metrics
Remove white-box unit tests on synchronous FetchCommand
Throw Exception from tests
Change-Id: Ia2e8d8900374611b3e67ab526688681e32152742
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index 67eecd9..d615273 100644
--- a/example-setup/broker/Dockerfile
+++ b/example-setup/broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.7.2-almalinux8
+FROM gerritcodereview/gerrit:3.8.1-almalinux9
USER root
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index afadb4f..6f1d1f9 100644
--- a/example-setup/http/Dockerfile
+++ b/example-setup/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.7.2-almalinux8
+FROM gerritcodereview/gerrit:3.8.1-almalinux9
USER root
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
index 0e840bd..0a22a5a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -229,6 +229,11 @@
return 0;
}
+ @Override
+ public boolean replicateNoteDbMetaRefs() {
+ return true;
+ }
+
public int getShutDownDrainTimeout() {
return shutDownDrainTimeout;
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
index cf7515e..7c7846c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
@@ -23,7 +23,6 @@
import com.google.inject.Inject;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.methods.HttpRequestBase;
-import org.junit.Ignore;
import org.junit.Test;
public class ProjectDeletionActionIT extends ActionITBase {
@@ -80,7 +79,6 @@
@Test
@GerritConfig(name = "gerrit.instanceId", value = "testInstanceId")
- @Ignore("Failing in RestApiServlet: to be enabled again once that is fixed in core")
public void shouldReturnBadRequestWhenDeletingAnInvalidProjectName() throws Exception {
url = getURLWithAuthenticationPrefix(INVALID_TEST_PROJECT_NAME);
