fixes after rebase

Original commit: elastic/x-pack-elasticsearch@6896b88829

elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle

@@ -7,9 +7,7 @@
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
-  testCompile project(path: ':x-plugins:license:plugin', configuration: 'runtime')
-  testCompile project(path: ':x-plugins:shield', configuration: 'runtime')
-  testCompile project(path: ':x-plugins:watcher', configuration: 'testArtifacts')
+  testCompile project(path: ':x-plugins:elasticsearch:x-pack', configuration: 'testArtifacts')
   testCompile project(path: ':plugins:lang-groovy', configuration: 'runtime')
 }
 

elasticsearch/x-pack/build.gradle

@@ -13,6 +13,9 @@ ext.versions = [
   okhttp: '2.3.0'
 ]
 
+// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066
+ext.compactProfile = 'full'
+
 dependencies {
   // license deps
   compile project(':x-plugins:elasticsearch:license:plugin-api')
@@ -126,3 +129,16 @@ bundlePlugin {
     }
   }
 }
+
+// TODO: don't publish test artifacts just to run messy tests, fix the tests!
+// https://github.com/elastic/x-plugins/issues/724
+configurations {
+    testArtifacts.extendsFrom testRuntime
+}
+task testJar(type: Jar) {
+    classifier "test"
+    from sourceSets.test.output
+}
+artifacts {
+    testArtifacts testJar
+}