From 772a4f85695310ad13f93a4283a0a08f9b281f6e Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Thu, 18 Oct 2018 22:55:50 +0200
Subject: [PATCH] add rest of the files...

---
 x-pack/plugin/ccr/qa/build.gradle                        | 9 +++++++++
 x-pack/plugin/ccr/qa/chain/build.gradle                  | 2 +-
 .../build.gradle                                         | 2 +-
 .../ccr/qa/multi-cluster-with-security/build.gradle      | 2 +-
 x-pack/plugin/ccr/qa/multi-cluster/build.gradle          | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugin/ccr/qa/build.gradle b/x-pack/plugin/ccr/qa/build.gradle
index dc44f8f753d2e..1a2c13297dbe2 100644
--- a/x-pack/plugin/ccr/qa/build.gradle
+++ b/x-pack/plugin/ccr/qa/build.gradle
@@ -1,5 +1,14 @@
 import org.elasticsearch.gradle.test.RestIntegTestTask
 
+apply plugin: 'elasticsearch.build'
+
+archivesBaseName = 'ccr-qa-test-common'
+test.enabled = false
+
+dependencies {
+  compile project(':test:framework')
+}
+
 subprojects {
   project.tasks.withType(RestIntegTestTask) {
     final File xPackResources = new File(xpackProject('plugin').projectDir, 'src/test/resources')
diff --git a/x-pack/plugin/ccr/qa/chain/build.gradle b/x-pack/plugin/ccr/qa/chain/build.gradle
index c9a3d47286d28..f93feb4a66a1b 100644
--- a/x-pack/plugin/ccr/qa/chain/build.gradle
+++ b/x-pack/plugin/ccr/qa/chain/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
 dependencies {
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
-    testCompile project(':x-pack:plugin:ccr:qa:test-common')
+    testCompile project(':x-pack:plugin:ccr:qa')
 }
 
 task leaderClusterTest(type: RestIntegTestTask) {
diff --git a/x-pack/plugin/ccr/qa/multi-cluster-with-non-compliant-license/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster-with-non-compliant-license/build.gradle
index 23c39f5aeb3be..7f1dd2c3211a2 100644
--- a/x-pack/plugin/ccr/qa/multi-cluster-with-non-compliant-license/build.gradle
+++ b/x-pack/plugin/ccr/qa/multi-cluster-with-non-compliant-license/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
 dependencies {
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
-    testCompile project(':x-pack:plugin:ccr:qa:test-common')
+    testCompile project(':x-pack:plugin:ccr:qa:')
 }
 
 task leaderClusterTest(type: RestIntegTestTask) {
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
index 4d9ea5d8a3dbb..f005a71b1653a 100644
--- a/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle
+++ b/x-pack/plugin/ccr/qa/multi-cluster-with-security/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
 dependencies {
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
-    testCompile project(':x-pack:plugin:ccr:qa:test-common')
+    testCompile project(':x-pack:plugin:ccr:qa')
 }
 
 task leaderClusterTest(type: RestIntegTestTask) {
diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
index 0b79377b55ca7..3e3661aae1a23 100644
--- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
+++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
 dependencies {
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
     testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
-    testCompile project(':x-pack:plugin:ccr:qa:test-common')
+    testCompile project(':x-pack:plugin:ccr:qa')
 }
 
 task leaderClusterTest(type: RestIntegTestTask) {