Remove redundant injected SitePaths in IT tests Avoid duplicated efforts in injecting SitePaths in multiple IT tests and instead expose the already injected field in AbstractDaemonTest as protected. Also update replication plugin submodule for leverage the reused SitePaths. Release-Notes: skip Change-Id: If2857024ab7c1a6cfcbfec5b8c30cd9d290affa3

diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 72e7a46..92629cc 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java

@@ -284,6 +284,7 @@
   @Inject protected TestSshKeys sshKeys;
   @Inject protected TestTicker testTicker;
   @Inject protected ThreadLocalRequestContext localCtx;
+  @Inject protected SitePaths sitePaths;
 
   @Nullable public SshSession adminSshSession;
 
@@ -308,7 +309,6 @@
   @Inject private PluginGuiceEnvironment pluginGuiceEnvironment;
   @Inject private PluginUser.Factory pluginUserFactory;
   @Inject private RequestScopeOperations requestScopeOperations;
-  @Inject private SitePaths sitePaths;
   @Inject private ProjectOperations projectOperations;
 
   private List<Repository> toClose;

diff --git a/javatests/com/google/gerrit/acceptance/rest/config/IndexSnapshotsIT.java b/javatests/com/google/gerrit/acceptance/rest/config/IndexSnapshotsIT.java
index 904de9a..95de918 100644
--- a/javatests/com/google/gerrit/acceptance/rest/config/IndexSnapshotsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/config/IndexSnapshotsIT.java

@@ -23,7 +23,6 @@
 import com.google.gerrit.index.IndexType;
 import com.google.gerrit.server.config.ConfigResource;
 import com.google.gerrit.server.config.IndexResource;
-import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.index.account.AccountIndexDefinition;
 import com.google.gerrit.server.index.change.ChangeIndexDefinition;
 import com.google.gerrit.server.index.group.GroupIndexDefinition;
@@ -62,8 +61,6 @@
   @Inject private GroupIndexDefinition groupIndexDefinition;
   @Inject private ProjectIndexDefinition projectIndexDefinition;
 
-  @Inject private SitePaths sitePaths;
-
   @Test
   @UseLocalDisk
   public void createAccountsIndexSnapshot() throws Exception {

diff --git a/javatests/com/google/gerrit/acceptance/server/mail/MailSenderIT.java b/javatests/com/google/gerrit/acceptance/server/mail/MailSenderIT.java
index 2aec897..f62ba3f 100644
--- a/javatests/com/google/gerrit/acceptance/server/mail/MailSenderIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/mail/MailSenderIT.java

@@ -26,19 +26,15 @@
 import com.google.gerrit.entities.EmailHeader.StringEmailHeader;
 import com.google.gerrit.extensions.common.ChangeInfo;
 import com.google.gerrit.extensions.common.CommentInfo;
-import com.google.gerrit.server.config.SitePaths;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Inject;
 import org.junit.Test;
 
 @UseLocalDisk
 public class MailSenderIT extends AbstractMailIT {
 
-  @Inject private SitePaths sitePaths;
-
   @Test
   @GerritConfig(name = "sendemail.replyToAddress", value = "custom@example.com")
   @GerritConfig(name = "receiveemail.protocol", value = "POP3")

diff --git a/javatests/com/google/gerrit/acceptance/server/project/ProjectCacheIT.java b/javatests/com/google/gerrit/acceptance/server/project/ProjectCacheIT.java
index 2d198b7..7a10803 100644
--- a/javatests/com/google/gerrit/acceptance/server/project/ProjectCacheIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/project/ProjectCacheIT.java

@@ -24,7 +24,6 @@
 import com.google.gerrit.entities.Project;
 import com.google.gerrit.server.config.PluginConfig;
 import com.google.gerrit.server.config.PluginConfigFactory;
-import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.project.ProjectCacheImpl;
 import com.google.gerrit.server.project.ProjectConfig;
 import com.google.inject.name.Named;
@@ -41,8 +40,6 @@
   @Named(ProjectCacheImpl.CACHE_NAME)
   private LoadingCache<Project.NameKey, Optional<CachedProjectConfig>> inMemoryProjectCache;
 
-  @Inject private SitePaths sitePaths;
-
   @Test
   public void pluginConfig_cachedValueEqualsConfigValue() throws Exception {
     GroupReference group = GroupReference.create(AccountGroup.uuid("uuid"), "local-group-name");

diff --git a/plugins/replication b/plugins/replication
index 1138cb1..62218e2 160000
--- a/plugins/replication
+++ b/plugins/replication

@@ -1 +1 @@
-Subproject commit 1138cb1645f68aa04cc4c067e204616a416fb650
+Subproject commit 62218e2cd25b7c0c2e4086109770765eb7d093bf