Merge branch 'stable-3.2' into master
* stable-3.2:
ReplicationTasksStorage: Remove synchronized from list* methods
TasksStorage: Add unit tests for reset() and resetAll()
TasksStorage: Add canStartDifferentUris unit test
ReplicationIT: Use streams to simplify
ReplicationIT: Use PushOne.ALL_REFS constant
ReplicationTasksStorageTest: Add a test for start()
ReplicationTasksStorage: Remove test-only list* methods
Fix synopsis in replication start cmd documentation
TaskStorage: Fix assertContainsExactly
TaskStorage: Rename unit tests with 'persist' in their names
Don't wait for pending events to process on startup
ReplicateRefUpdate: Drop awkward constructor
TasksStorage: Replace delete() with start()+finish() in tests
ReplicationTasksStorage.Task: Add unit tests
ReplicationTasksStorage: Add unit tests
Change-Id: I2ebe8f3bf299a806726b2feba704750dc2edf239
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
index e2f9515..8054eb4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -26,9 +26,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Lists;
-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/ReplicationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
index 5b4204e..28f2fba 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.replication;
-import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.entities.AccessSection;
import com.google.gerrit.entities.Project;
import java.util.Collections;
import java.util.List;