Build: Move test files from plugin/src to appropriate other projects (elastic/x-pack-elasticsearch#3653)

This commit moves mostly security tests that were left in plugin/src. It
also moves the CompositeTestingXPackPlugin into tribe license tests qa
project, which was the only remaining use. This class needs to be
removed, as it has unavoidable problems with dependency conflicts (ie
guava) between security and watcher, which it pulls in both into the
test classpath.

Original commit: elastic/x-pack-elasticsearch@756209e010
This commit is contained in:
Ryan Ernst 2018-01-21 11:08:47 -08:00 committed by Jason Tedor
parent 4d4f979d61
commit ac44ee8257
8 changed files with 2 additions and 26 deletions

View File

@ -12,24 +12,6 @@ apply plugin: 'elasticsearch.es-meta-plugin'
archivesBaseName = 'x-pack' // for api jar
//dependencyLicenses {
// mapping from: /netty-.*/, to: 'netty'
// mapping from: /bc.*/, to: 'bouncycastle'
// mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
// mapping from: /transport-netty.*/, to: 'elasticsearch'
// mapping from: /transport-nio.*/, to: 'elasticsearch'
// mapping from: /elasticsearch-nio.*/, to: 'elasticsearch'
// mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
// mapping from: /http.*/, to: 'httpclient' // pulled in by rest client
// mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
// ignoreSha 'elasticsearch-rest-client'
// ignoreSha 'transport-netty4'
// ignoreSha 'transport-nio'
// ignoreSha 'elasticsearch-nio'
// ignoreSha 'elasticsearch-rest-client-sniffer'
// ignoreSha 'x-pack-core'
//}
es_meta_plugin {
name = 'x-pack'
description = 'Elasticsearch Expanded Pack Plugin'
@ -43,14 +25,6 @@ ext.expansions = [
dependencies {
testCompile project(path: ':x-pack-elasticsearch:plugin:core', configuration: 'testArtifacts')
testCompile project(path: ':x-pack-elasticsearch:plugin:deprecation')
testCompile project(path: ':x-pack-elasticsearch:plugin:graph')
testCompile project(path: ':x-pack-elasticsearch:plugin:logstash')
testCompile project(path: ':x-pack-elasticsearch:plugin:ml')
testCompile project(path: ':x-pack-elasticsearch:plugin:monitoring')
testCompile project(path: ':x-pack-elasticsearch:plugin:security')
testCompile project(path: ':x-pack-elasticsearch:plugin:upgrade')
testCompile project(path: ':x-pack-elasticsearch:plugin:watcher')
}
// https://github.com/elastic/x-plugins/issues/724

View File

@ -9,6 +9,8 @@ apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: ':modules:tribe', configuration: 'runtime')
testCompile project(path: ':x-pack-elasticsearch:plugin', configuration: 'testArtifacts')
// TODO: remove all these test deps, this is completely bogus, guava is being force upgraded
testCompile project(path: ':x-pack-elasticsearch:plugin:deprecation', configuration: 'runtime')
testCompile project(path: ':x-pack-elasticsearch:plugin:graph', configuration: 'runtime')
testCompile project(path: ':x-pack-elasticsearch:plugin:logstash', configuration: 'runtime')