From dbdefc56898d9264034091bd45df0b719b4347ee Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Thu, 21 Dec 2017 14:53:12 +0100
Subject: [PATCH] Fix issue after merging

---
 .../elasticsearch/xpack/ccr/index/engine/FollowingEngine.java | 3 ---
 .../test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java | 3 ++-
 .../xpack/ccr/index/engine/FollowingEngineTests.java          | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugin/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java b/x-pack/plugin/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java
index e455f2e7fe9..ae15f76c4ae 100644
--- a/x-pack/plugin/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java
+++ b/x-pack/plugin/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java
@@ -6,12 +6,9 @@
 package org.elasticsearch.xpack.ccr.index.engine;
 
 import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.index.engine.InternalEngine;
-import org.elasticsearch.index.seqno.SeqNoStats;
 import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.seqno.SequenceNumbersService;
 import org.elasticsearch.xpack.ccr.CcrSettings;
 
 import java.io.IOException;
diff --git a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
index a47c37fb53d..8c4d9f869e3 100644
--- a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
+++ b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
@@ -35,6 +35,7 @@ import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
+import org.elasticsearch.test.discovery.TestZenDiscovery;
 import org.elasticsearch.xpack.XPackPlugin;
 import org.elasticsearch.xpack.XPackSettings;
 import org.elasticsearch.xpack.ccr.action.FollowExistingIndexAction;
@@ -73,7 +74,7 @@ public class ShardChangesIT extends ESIntegTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> getMockPlugins() {
-        return Collections.singleton(TestSeedPlugin.class);
+        return Arrays.asList(TestSeedPlugin.class, TestZenDiscovery.TestPlugin.class);
     }
 
     @Override
diff --git a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
index 54647d6ac18..cd695b2f175 100644
--- a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
+++ b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
@@ -35,6 +35,7 @@ import org.elasticsearch.index.mapper.IdFieldMapper;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
+import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.store.DirectoryService;
 import org.elasticsearch.index.store.Store;
@@ -276,7 +277,8 @@ public class FollowingEngineTests extends ESTestCase {
                 null,
                 new TranslogHandler(
                         xContentRegistry, IndexSettingsModule.newIndexSettings(shardId.getIndexName(), indexSettings.getSettings())),
-                new NoneCircuitBreakerService()
+                new NoneCircuitBreakerService(),
+                () -> SequenceNumbers.UNASSIGNED_SEQ_NO
         );
     }