Required changes after merging in master branch.

This commit is contained in:
Martijn van Groningen 2018-08-24 12:51:26 +07:00
parent 82592dda5a
commit 575f33941c
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
5 changed files with 5 additions and 5 deletions

View File

@ -47,7 +47,7 @@ gradle.projectsEvaluated {
dependencies {
compileOnly "org.elasticsearch:elasticsearch:${version}"
compileOnly project(path: xpackModule('core'), configuration: 'shadow')
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}

View File

@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
}

View File

@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
}

View File

@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
}

View File

@ -280,7 +280,7 @@ public class FollowingEngineTests extends ESTestCase {
SequenceNumbers.NO_OPS_PERFORMED, shardId, 1L);
store.associateIndexWithNewTranslog(translogUuid);
FollowingEngine followingEngine = new FollowingEngine(config);
followingEngine.recoverFromTranslog();
followingEngine.recoverFromTranslog(Long.MAX_VALUE);
return followingEngine;
}