Merge branch 'master' into deguice9

Original commit: elastic/x-pack-elasticsearch@2474231dc1
2016-07-18 14:25:49 -07:00 · 2016-07-18 14:25:49 -07:00 · 411b29e7fa
parent f03683fb18 30b084d372
commit 411b29e7fa
15 changed files with 17 additions and 17 deletions
--- a/elasticsearch/qa/audit-tests/build.gradle
+++ b/elasticsearch/qa/audit-tests/build.gradle
@ -14,7 +14,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'xpack.security.audit.enabled', 'true'
    setting 'xpack.security.audit.outputs', 'index'
    setting 'logger.level', 'DEBUG'
--- a/elasticsearch/qa/core-rest-tests-with-security/build.gradle
+++ b/elasticsearch/qa/core-rest-tests-with-security/build.gradle
@ -34,7 +34,7 @@ integTest {
     'search/80_date_math_index_names/Missing index with catch'].join(',')

  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'xpack.watcher.enabled', 'false'
    setting 'xpack.monitoring.enabled', 'false'
    setupCommand 'setupDummyUser',
--- a/elasticsearch/qa/reindex-tests-with-security/build.gradle
+++ b/elasticsearch/qa/reindex-tests-with-security/build.gradle
@ -7,7 +7,7 @@ dependencies {
 integTest {
  cluster {
    setting 'script.inline', 'true'
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    extraConfigFile 'x-pack/roles.yml', 'roles.yml'
    [
      test_admin: 'superuser',
--- a/elasticsearch/qa/security-client-tests/build.gradle
+++ b/elasticsearch/qa/security-client-tests/build.gradle
@ -14,7 +14,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setupCommand 'setupDummyUser',
                 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
    setupCommand 'setupTransportClientUser',
--- a/elasticsearch/qa/security-example-realm/build.gradle
+++ b/elasticsearch/qa/security-example-realm/build.gradle
@ -43,7 +43,7 @@ task buildZip(type:Zip, dependsOn: [jar]) {

 task integTest(type: org.elasticsearch.gradle.test.RestIntegTestTask, dependsOn: buildZip) {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'xpack.security.authc.realms.custom.order', '0'
    setting 'xpack.security.authc.realms.custom.type', 'custom'
    setting 'xpack.security.authc.realms.esusers.order', '1'
--- a/elasticsearch/qa/security-migrate-tests/build.gradle
+++ b/elasticsearch/qa/security-migrate-tests/build.gradle
@ -7,7 +7,7 @@ dependencies {
 integTest {
  cluster {
    setting 'script.inline', 'true'
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    extraConfigFile 'x-pack/roles.yml', 'roles.yml'
    [
      test_admin: 'superuser',
--- a/elasticsearch/qa/smoke-test-graph-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-graph-with-security/build.gradle
@ -15,7 +15,7 @@ integTest {
  dependsOn copyGraphRestTests

  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    extraConfigFile 'x-pack/roles.yml', 'roles.yml'
    setupCommand 'setupTestAdminUser',
                 'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'
--- a/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle
@ -17,7 +17,7 @@ subprojects {

    cluster {
      systemProperty 'es.logger.level', 'TRACE'
-      plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+      plugin ':x-plugins:elasticsearch:x-pack'
      setting 'xpack.monitoring.collection.interval', '3s'
      extraConfigFile 'x-pack/roles.yml', '../roles.yml'
      setupCommand 'setupTestAdminUser',
--- a/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle
+++ b/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle
@ -147,7 +147,7 @@ processTestResources.dependsOn(
 ext.pluginsCount = 1 // we install xpack explicitly
 project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
  // need to get a non-decorated project object, so must re-lookup the project by path
-  integTest.cluster.plugin(subproj.name, project(subproj.path))
+  integTest.cluster.plugin(subproj.path)
  pluginsCount += 1
 }

@ -166,7 +166,7 @@ integTest {
    setting 'xpack.security.ssl.keystore.path', nodeKeystore.name
    setting 'xpack.security.ssl.keystore.password', 'keypass'

-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'

    // copy keystores into config/
    extraConfigFile nodeKeystore.name, nodeKeystore
--- a/elasticsearch/qa/smoke-test-plugins/build.gradle
+++ b/elasticsearch/qa/smoke-test-plugins/build.gradle
@ -9,13 +9,13 @@ dependencies {
 ext.pluginsCount = 1 // we install xpack explicitly
 project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
  // need to get a non-decorated project object, so must re-lookup the project by path
-  integTest.cluster.plugin(subproj.name, project(subproj.path))
+  integTest.cluster.plugin(subproj.path)
  pluginsCount += 1
 }

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'

    setupCommand 'setupDummyUser',
                 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
--- a/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle
@ -7,7 +7,7 @@ dependencies {

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'script.inline', 'true'
    setting 'xpack.security.enabled', 'false'
    setting 'xpack.monitoring.enabled', 'false'
--- a/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle
@ -7,7 +7,7 @@ dependencies {

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'xpack.security.enabled', 'false'
    setting 'xpack.monitoring.enabled', 'false'
    setting 'http.port', '9400'
--- a/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle
@ -7,7 +7,7 @@ dependencies {

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'script.inline', 'true'
    setting 'xpack.security.enabled', 'false'
    setting 'xpack.monitoring.enabled', 'false'
--- a/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle
@ -19,7 +19,7 @@ integTest {
     'getting_started/10_monitor_cluster_health/Getting started - Monitor cluster health'].join(',')

  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    extraConfigFile 'x-pack/roles.yml', 'roles.yml'
    setupCommand 'setupTestAdminUser',
                 'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'
--- a/elasticsearch/qa/smoke-test-watcher/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher/build.gradle
@ -6,7 +6,7 @@ dependencies {

 integTest {
  cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
    setting 'xpack.security.enabled', 'false'
    setting 'xpack.monitoring.enabled', 'false'
    setting 'http.port', '9400'