Merge branch 'stable-3.3' into stable-3.2
* stable-3.3:
Fix ApplyObjectIT.shouldApplyRefMetaObject test for apply object
Introduce E2E apply object REST-API metrics
Add missing @Override to parseRemotes
Add more logging for the apply object REST-API
Support ApplyObject of non-commit refs
Fix 'illegal format conversion' compilation error
Extract FetchApiClient interface
Add user/password authentication for CGit client
Manage removal of refs
Use correct placeholders when logging in RevisionReader
Honour the fetch ref-spec in replication.config
Log the incoming git refs events for replication
Fix pull-replication after the removal of Log4J from Gerrit
Allow replication of refs that point to non-commit objects
Fix the default logic in managing refs-filter
Reuse Gerrit code for head update
Add HEAD update REST API endpoint
Add project initialisation during fetch REST Api call
Add project delete REST API endpoint
Allow project deletion on replicas
Allow project creation only when CREATE_PROJECT capability is set
Allow dynamic url creation in tests
Handle HEAD update in replicas
Trigger remote update HEAD
Allow project deletion on primaries
Add missing project creation support for replicas
Add missing project creation support
Change-Id: If4e2540da850ba0cad821c0d074460674f8bc851
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
index 71ec666..ddefa47 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
@@ -25,9 +25,9 @@
import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Lists;
import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.BranchNameKey;
-import com.google.gerrit.entities.GroupReference;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.exceptions.StorageException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java
index 7ab44f9..1daf638 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java
@@ -15,7 +15,7 @@
package com.googlesource.gerrit.plugins.replication.pull.filter;
import com.google.common.base.Strings;
-import com.google.gerrit.entities.AccessSection;
+import com.google.gerrit.common.data.AccessSection;
import com.googlesource.gerrit.plugins.replication.ReplicationConfig;
import java.util.List;
import org.eclipse.jgit.lib.Config;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java
index cf94086..c6d32bf 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java
@@ -28,7 +28,7 @@
import com.google.gerrit.acceptance.TestPlugin;
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
-import com.google.gerrit.entities.Permission;
+import com.google.gerrit.common.data.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.Project.NameKey;
import com.google.gerrit.entities.RefNames;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java
index aa07a7c..8006064 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java
@@ -20,7 +20,7 @@
import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
-import com.google.gerrit.entities.Permission;
+import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.api.projects.HeadInput;
import com.google.gson.Gson;
