Use shadow plugin in ccr

dnhatn · dnhatn · commit a84adfbb1473 · 2018-07-26T20:48:10.000-04:00
diff --git a/x-pack/plugin/ccr/build.gradle b/x-pack/plugin/ccr/build.gradle
@@ -37,7 +37,7 @@ check.dependsOn(internalClusterTest, 'qa:multi-cluster:followClusterTest', 'qa:m
 
 dependencies {
     compileOnly "org.elasticsearch:elasticsearch:${version}"
-    compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+    compileOnly project(path: xpackModule('core'), configuration: 'shadow')
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
 
diff --git a/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle
@@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
-    testCompile project(path: xpackModule('core'), configuration: 'runtime')
+    testCompile project(path: xpackModule('core'), configuration: 'shadow')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
 }
 
diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
@@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
-    testCompile project(path: xpackModule('core'), configuration: 'runtime')
+    testCompile project(path: xpackModule('core'), configuration: 'shadow')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ check.dependsOn(internalClusterTest, 'qa:multi-cluster:followClusterTest', 'qa:m`
`37`	`37`
`38`	`38`	`dependencies {`
`39`	`39`	`compileOnly "org.elasticsearch:elasticsearch:${version}"`
`40`		`- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"`
	`40`	`+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')`
`41`	`41`	`testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask`
`3`	`3`	`apply plugin: 'elasticsearch.standalone-test'`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- testCompile project(path: xpackModule('core'), configuration: 'runtime')`
	`6`	`+ testCompile project(path: xpackModule('core'), configuration: 'shadow')`
`7`	`7`	`testCompile project(path: xpackModule('ccr'), configuration: 'runtime')`
`8`	`8`	`}`
`9`	`9`