Merge pull request elastic/elasticsearch#1024 from rjernst/easier_plugin_installs

Build: Simplify plugin installs for integTests

Original commit: elastic/x-pack-elasticsearch@c4dede7b92

marvel/build.gradle

@@ -8,16 +8,11 @@ esplugin {
   isolated false
 }
 
-configurations {
-  licensePluginZip
-}
-
 ext.versions = [
   okhttp: '2.3.0'
 ]
 
 dependencies {
-  licensePluginZip project(path: ':x-plugins:license:plugin') // zip
   provided project(path: ':x-plugins:license:plugin', configuration: 'runtime')
   provided project(path: ':x-plugins:shield', configuration: 'runtime')
   testCompile 'org.elasticsearch:securemock:1.1'
@@ -49,9 +44,8 @@ processTestResources {
 }
 
 integTest {
-  dependsOn configurations.licensePluginZip
   cluster {
-    plugin 'license', configurations.licensePluginZip
+    plugin 'license', project(':x-plugins:license:plugin')
   }
 }
 

qa/shield-core-rest-tests/build.gradle

@@ -1,18 +1,10 @@
 apply plugin: 'elasticsearch.rest-test'
 
-configurations {
-  licensePluginZip
-  shieldPluginZip
-}
-
 dependencies {
-  licensePluginZip project(path: ':x-plugins:license:plugin')
-  shieldPluginZip project(path: ':x-plugins:shield')
   testCompile project(path: ':x-plugins:shield', configuration: 'runtime')
 }
 
 integTest {
-  dependsOn configurations.licensePluginZip, configurations.shieldPluginZip
   includePackaged true
   systemProperty 'tests.rest.blacklist', 
     ['indices.get/10_basic/*allow_no_indices*',
@@ -38,8 +30,8 @@ integTest {
      'bulk/40_fields/Fields'].join(',')
 
   cluster {
-    plugin 'license', configurations.licensePluginZip
-    plugin 'shield', configurations.shieldPluginZip
+    plugin 'license', project(':x-plugins:license:plugin')
+    plugin 'shield', project(':x-plugins:shield')
     setupCommand 'setupDummyUser',
                  'bin/shield/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
     waitCondition = { node, ant ->

shield/build.gradle

@@ -6,12 +6,7 @@ esplugin {
   isolated false
 }
 
-configurations {
-  licensePluginZip
-}
-
 dependencies {
-  licensePluginZip project(path: ':x-plugins:license:plugin') // zip
   provided project(path: ':x-plugins:license:plugin', configuration: 'runtime')
   compile project(':x-plugins:license:plugin-api')
   compile 'dk.brics.automaton:automaton:1.11-8'

watcher/build.gradle

@@ -8,16 +8,11 @@ esplugin {
   isolated false
 }
 
-configurations {
-  licensePluginZip
-}
-
 ext.versions = [
   okhttp: '2.3.0'
 ]
 
 dependencies {
-  licensePluginZip project(path: ':x-plugins:license:plugin') // zip
   provided project(path: ':x-plugins:license:plugin', configuration: 'runtime')
   provided project(path: ':x-plugins:shield', configuration: 'runtime')
 
@@ -44,22 +39,9 @@ dependencies {
 compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
 compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
 
-/*ext.expansions = [
-  'integ.http.port': integTest.cluster.httpPort
-]
-
-processTestResources {
-  inputs.properties(expansions)
-  with copySpec {
-    MavenFilteringHack.filter(it, expansions)
-  }
-}
-*/
-
 integTest {
-  dependsOn configurations.licensePluginZip
   cluster {
-    plugin 'installLicensePlugin', configurations.licensePluginZip
+    plugin 'license', project(':x-plugins:license:plugin')
   }
 }