Require either BuildPlugin or StandaloneTestBasePlugin to use RestTestPlugin

It used to be that RestTestPlugin "came with" StandaloneTestBasePlugin
but we'd like to use it with BuildPlugin for the high level rest client.

Also fix some license headers.

Original commit: elastic/x-pack-elasticsearch@3d5549d170
This commit is contained in:
Nik Everett 2017-01-03 15:43:22 -05:00 committed by Luca Cavanna
parent cb7f916485
commit 5b6bfffa9a
15 changed files with 17 additions and 9 deletions

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -32,4 +33,3 @@ integTest {
}
}
}

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -33,4 +34,3 @@ integTest {
}
}
}

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -35,4 +36,3 @@ integTest {
}
}
}

View File

@ -1,4 +1,5 @@
subprojects {
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -47,4 +48,3 @@ subprojects {
task integTest {
dependsOn subprojects.integTest
}

View File

@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets
import java.security.KeyStore
import java.security.SecureRandom
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -398,4 +399,3 @@ class SanEvaluator {
return buf.toString();
}
}

View File

@ -1,5 +1,6 @@
import org.elasticsearch.gradle.MavenFilteringHack
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -30,7 +31,7 @@ integTest {
return tmpFile.exists()
}
}
}
}
ext.expansions = [
'expected.plugins.count': pluginsCount
@ -40,4 +41,3 @@ processTestResources {
inputs.properties(expansions)
MavenFilteringHack.filter(it, expansions)
}

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -38,4 +39,3 @@ integTest {
}
}
}

View File

@ -1,3 +1,4 @@
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {

View File

@ -2,6 +2,7 @@ import org.elasticsearch.gradle.test.ClusterConfiguration
import org.elasticsearch.gradle.test.ClusterFormationTasks
import org.elasticsearch.gradle.test.NodeInfo
apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
@ -79,4 +80,4 @@ integTest {
// need to kill the standalone nodes here
finalizedBy 'setupClusterOne#stop'
finalizedBy 'setupClusterTwo#stop'
}
}