honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated usage of testCompile configuration (#57921) (#58083) 

* Remove usage of deprecated testCompile configuration
* Replace testCompile usage by testImplementation
* Make testImplementation non transitive by default (as we did for testCompile)
* Update CONTRIBUTING about using testImplementation for test dependencies
* Fail on testCompile configuration usage
This commit is contained in:
Rene Groeschke 2020-06-14 22:30:44 +02:00 committed by GitHub
parent 1a48983a56
commit 01e9126588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
160 changed files with 442 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -422,7 +422,7 @@ known as "transitive" dependencies".</dd>
should not be shipped with the project because it is "provided" by the runtime
somehow. Elasticsearch plugins use this configuration to include dependencies
that are bundled with Elasticsearch's server.</dd>
<dt>`testCompile`</dt><dd>Code that is on the classpath for compiling tests
<dt>`testImplementation`</dt><dd>Code that is on the classpath for compiling tests
that are part of this project but not production code. The canonical example
of this is `junit`.</dd>
</dl>

6
buildSrc/build.gradle
View File

@ -127,13 +127,13 @@ dependencies {
compile 'org.apache.maven:maven-model:3.6.2'
compile 'com.networknt:json-schema-validator:1.0.36'
compileOnly "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
testCompile "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
testImplementation "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
testFixturesApi "junit:junit:${props.getProperty('junit')}"
testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
testFixturesApi gradleApi()
testFixturesApi gradleTestKit()
testCompile 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
testCompile 'org.mockito:mockito-core:1.9.5'
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
testImplementation 'org.mockito:mockito-core:1.9.5'
minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}"
minimumRuntimeCompile localGroovy()
minimumRuntimeCompile gradleApi()

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View File

@ -165,10 +165,10 @@ class PluginBuildPlugin implements Plugin<Project> {
project.dependencies {
if (BuildParams.internal) {
compileOnly project.project(':server')
testCompile project.project(':test:framework')
testImplementation project.project(':test:framework')
} else {
compileOnly "org.elasticsearch:elasticsearch:${project.versions.elasticsearch}"
testCompile "org.elasticsearch.test:framework:${project.versions.elasticsearch}"
testImplementation "org.elasticsearch.test:framework:${project.versions.elasticsearch}"
}
// we "upgrade" these optional deps to provided for plugins, since they will run
// with a full elasticsearch server that includes optional deps

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/StandaloneRestTestPlugin.groovy
View File

@ -83,7 +83,7 @@ class StandaloneRestTestPlugin implements Plugin<Project> {
// create a compileOnly configuration as others might expect it
project.configurations.create("compileOnly")
project.dependencies.add('testCompile', project.project(':test:framework'))
project.dependencies.add('testImplementation', project.project(':test:framework'))
EclipseModel eclipse = project.extensions.getByType(EclipseModel)
eclipse.classpath.sourceSets = [testSourceSet]

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/TestWithDependenciesPlugin.groovy
View File

@ -44,7 +44,7 @@ class TestWithDependenciesPlugin implements Plugin<Project> {
return
}
project.configurations.testCompile.dependencies.all { Dependency dep ->
project.configurations.testImplementation.dependencies.all { Dependency dep ->
// this closure is run every time a compile dependency is added
if (dep instanceof ProjectDependency && dep.dependencyProject.plugins.hasPlugin(PluginBuildPlugin)) {
project.gradle.projectsEvaluated {

23
buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchJavaPlugin.java
View File

@ -114,9 +114,24 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
public static void configureConfigurations(Project project) {
// we want to test compileOnly deps!
Configuration compileOnlyConfig = project.getConfigurations().getByName(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME);
Configuration testCompileConfig = project.getConfigurations().getByName(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME);
testCompileConfig.extendsFrom(compileOnlyConfig);
Configuration testImplementationConfig = project.getConfigurations().getByName(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME);
testImplementationConfig.extendsFrom(compileOnlyConfig);
// fail on using deprecated testCompile
project.getConfigurations()
.getByName(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME)
.getIncoming()
.beforeResolve(resolvableDependencies -> {
if (resolvableDependencies.getDependencies().size() > 0) {
throw new GradleException(
"Usage of configuration "
+ JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME
+ " is no longer supported. Use "
+ JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME
+ " instead."
);
}
});
// we are not shipping these jars, we act like dumb consumers of these things
if (project.getPath().startsWith(":test:fixtures") || project.getPath().equals(":build-tools")) {
return;
@ -130,7 +145,7 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
configuration.resolutionStrategy(ResolutionStrategy::failOnVersionConflict);
});
// force all dependencies added directly to compile/testCompile to be non-transitive, except for ES itself
// force all dependencies added directly to compile/testImplementation to be non-transitive, except for ES itself
Consumer<String> disableTransitiveDeps = configName -> {
Configuration config = project.getConfigurations().getByName(configName);
config.getDependencies().all(dep -> {
@ -142,9 +157,9 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
});
};
disableTransitiveDeps.accept(JavaPlugin.COMPILE_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME);
}
private static final Pattern LUCENE_SNAPSHOT_REGEX = Pattern.compile("\\w+-snapshot-([a-z0-9]+)");

2
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.java
View File

@ -391,7 +391,7 @@ public class ThirdPartyAuditTask extends DefaultTask {
private Configuration getRuntimeConfiguration() {
Configuration runtime = getProject().getConfigurations().findByName("runtimeClasspath");
if (runtime == null) {
return getProject().getConfigurations().getByName("testCompile");
return getProject().getConfigurations().getByName("testCompileClasspath");
}
return runtime;
}

2
buildSrc/src/testKit/testingConventions/build.gradle
View File

@ -10,7 +10,7 @@ allprojects {
jcenter()
}
dependencies {
testCompile "junit:junit:4.12"
testImplementation "junit:junit:4.12"
}
ext.licenseFile = file("$buildDir/dummy/license")

14
client/rest-high-level/build.gradle
View File

@ -44,18 +44,18 @@ dependencies {
compile project(':modules:rank-eval')
compile project(':modules:lang-mustache')
testCompile project(':client:test')
testCompile project(':test:framework')
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testImplementation project(':client:test')
testImplementation project(':test:framework')
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
//this is needed to make RestHighLevelClientTests#testApiNamingConventions work from IDEs
testCompile project(":rest-api-spec")
testImplementation project(":rest-api-spec")
// Needed for serialization tests:
// (In order to serialize a server side class to a client side class or the other way around)
testCompile(project(':x-pack:plugin:core')) {
testImplementation(project(':x-pack:plugin:core')) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-rest-high-level-client'
}
testCompile(project(':x-pack:plugin:eql'))
testImplementation(project(':x-pack:plugin:eql'))
}
processTestResources {

12
client/rest/build.gradle
View File

@ -35,12 +35,12 @@ dependencies {
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
testCompile project(":client:test")
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testCompile "org.elasticsearch:securemock:${versions.securemock}"
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
testImplementation project(":client:test")
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "org.elasticsearch:securemock:${versions.securemock}"
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
}
tasks.withType(CheckForbiddenApis).configureEach {

10
client/sniffer/build.gradle
View File

@ -33,11 +33,11 @@ dependencies {
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testCompile project(":client:test")
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.elasticsearch:securemock:${versions.securemock}"
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
testImplementation project(":client:test")
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.elasticsearch:securemock:${versions.securemock}"
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
}
tasks.named('forbiddenApisMain').configure {

6
client/transport/build.gradle
View File

@ -29,9 +29,9 @@ dependencies {
compile project(":modules:percolator")
compile project(":modules:parent-join")
compile project(":modules:rank-eval")
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
}
dependencyLicenses {

4
distribution/tools/keystore-cli/build.gradle
View File

@ -22,7 +22,7 @@ apply plugin: 'elasticsearch.build'
dependencies {
compileOnly project(":server")
compileOnly project(":libs:elasticsearch-cli")
testCompile project(":test:framework")
testCompile 'com.google.jimfs:jimfs:1.1'
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.1'
testRuntimeOnly 'com.google.guava:guava:18.0'
}

6
distribution/tools/launchers/build.gradle
View File

@ -22,9 +22,9 @@ apply plugin: 'elasticsearch.build'
dependencies {
compile parent.project('java-version-checker')
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
}
archivesBaseName = 'elasticsearch-launchers'

4
distribution/tools/plugin-cli/build.gradle
View File

@ -26,8 +26,8 @@ dependencies {
compileOnly project(":libs:elasticsearch-cli")
compile "org.bouncycastle:bcpg-fips:1.0.3"
compile "org.bouncycastle:bc-fips:1.0.1"
testCompile project(":test:framework")
testCompile 'com.google.jimfs:jimfs:1.1'
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.1'
testRuntimeOnly 'com.google.guava:guava:18.0'
}

8
libs/core/build.gradle
View File

@ -67,15 +67,15 @@ dependencies {
// This dependency is used only by :libs:core for null-checking interop with other tools
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
if (!isEclipse) {
java11Compile sourceSets.main.output
}
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
}
}

8
libs/dissect/build.gradle
View File

@ -18,12 +18,12 @@
*/
dependencies {
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-dissect'
}
testCompile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testCompile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testCompile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
}
tasks.named('forbiddenApisMain').configure {

2
libs/geo/build.gradle
View File

@ -21,7 +21,7 @@ apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.publish'
dependencies {
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-geo'
}
}

2
libs/grok/build.gradle
View File

@ -22,7 +22,7 @@ dependencies {
// joni dependencies:
compile 'org.jruby.jcodings:jcodings:1.0.44'
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'
}
}

8
libs/nio/build.gradle
View File

@ -21,11 +21,11 @@ apply plugin: 'elasticsearch.publish'
dependencies {
compile project(':libs:elasticsearch-core')
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-nio'
}
}

8
libs/secure-sm/build.gradle
View File

@ -21,11 +21,11 @@ apply plugin: 'elasticsearch.publish'
dependencies {
// do not add non-test compile dependencies to secure-sm without a good reason to do so
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-secure-sm'
}
}

8
libs/ssl-config/build.gradle
View File

@ -21,13 +21,13 @@ apply plugin: "elasticsearch.publish"
dependencies {
compile project(':libs:elasticsearch-core')
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-ssl-config'
}
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
}

8
libs/x-content/build.gradle
View File

@ -29,11 +29,11 @@ dependencies {
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content'
}

4
modules/ingest-geoip/build.gradle
View File

@ -31,7 +31,7 @@ dependencies {
compile("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
compile('com.maxmind.db:maxmind-db:1.3.1')
testCompile 'org.elasticsearch:geolite2-databases:20191119'
testImplementation 'org.elasticsearch:geolite2-databases:20191119'
}
restResources {
@ -41,7 +41,7 @@ restResources {
}
task copyDefaultGeoIp2DatabaseFiles(type: Copy) {
from { zipTree(configurations.testCompile.files.find { it.name.contains('geolite2-databases') }) }
from { zipTree(configurations.testCompileClasspath.files.find { it.name.contains('geolite2-databases') }) }
into "${project.buildDir}/ingest-geoip"
include "*.mmdb"
}

4
modules/percolator/build.gradle
View File

@ -24,8 +24,8 @@ esplugin {
}
dependencies {
testCompile project(path: ':modules:parent-join', configuration: 'runtime')
testCompile project(path: ':modules:geo', configuration: 'runtime')
testImplementation project(path: ':modules:parent-join', configuration: 'runtime')
testImplementation project(path: ':modules:geo', configuration: 'runtime')
}
tasks.named('integTestRunner').configure {

4
modules/reindex/build.gradle
View File

@ -52,9 +52,9 @@ dependencies {
compile project(":client:rest")
compile project(":libs:elasticsearch-ssl-config")
// for http - testing reindex from remote
testCompile project(path: ':modules:transport-netty4', configuration: 'runtime')
testImplementation project(path: ':modules:transport-netty4', configuration: 'runtime')
// for parent/child testing
testCompile project(path: ':modules:parent-join', configuration: 'runtime')
testImplementation project(path: ':modules:parent-join', configuration: 'runtime')
}
restResources {

2
plugins/discovery-ec2/qa/amazon-ec2/build.gradle
View File

@ -29,7 +29,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: ':plugins:discovery-ec2', configuration: 'runtime')
testImplementation project(path: ':plugins:discovery-ec2', configuration: 'runtime')
}
restResources {

2
plugins/discovery-gce/qa/gce/build.gradle
View File

@ -30,7 +30,7 @@ apply plugin: 'elasticsearch.rest-test'
final int gceNumberOfNodes = 3
dependencies {
testCompile project(path: ':plugins:discovery-gce', configuration: 'runtime')
testImplementation project(path: ':plugins:discovery-gce', configuration: 'runtime')
}
restResources {

2
plugins/examples/security-authorization-engine/build.gradle
View File

@ -12,7 +12,7 @@ esplugin {
dependencies {
compileOnly "org.elasticsearch.plugin:x-pack-core:${versions.elasticsearch}"
testCompile "org.elasticsearch.client:x-pack-transport:${versions.elasticsearch}"
testImplementation "org.elasticsearch.client:x-pack-transport:${versions.elasticsearch}"
}
integTest {

2
plugins/repository-azure/build.gradle
View File

@ -33,7 +33,7 @@ dependencies {
compile 'com.microsoft.azure:azure-keyvault-core:1.0.0'
runtimeOnly 'com.google.guava:guava:20.0'
compile 'org.apache.commons:commons-lang3:3.4'
testCompile project(':test:fixtures:azure-fixture')
testImplementation project(':test:fixtures:azure-fixture')
}
restResources {

2
plugins/repository-gcs/build.gradle
View File

@ -63,7 +63,7 @@ dependencies {
compile 'io.opencensus:opencensus-contrib-http-util:0.18.0'
compile 'com.google.apis:google-api-services-storage:v1-rev20200226-1.30.9'
testCompile project(':test:fixtures:gcs-fixture')
testImplementation project(':test:fixtures:gcs-fixture')
}
restResources {

2
plugins/repository-s3/build.gradle
View File

@ -50,7 +50,7 @@ dependencies {
// and whitelist this hack in JarHell
compile 'javax.xml.bind:jaxb-api:2.2.2'
testCompile project(':test:fixtures:s3-fixture')
testImplementation project(':test:fixtures:s3-fixture')
}
dependencyLicenses {

2
qa/ccs-unavailable-clusters/build.gradle
View File

@ -22,5 +22,5 @@ apply plugin: 'elasticsearch.rest-test'
apply plugin: 'elasticsearch.test-with-dependencies'
dependencies {
testCompile project(":client:rest-high-level")
testImplementation project(":client:rest-high-level")
}

2
qa/evil-tests/build.gradle
View File

@ -27,7 +27,7 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile 'com.google.jimfs:jimfs:1.1'
testImplementation 'com.google.jimfs:jimfs:1.1'
}
// TODO: give each evil test its own fresh JVM for more isolation.

1
qa/full-cluster-restart/build.gradle
View File

@ -75,6 +75,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {

2
qa/multi-cluster-search/build.gradle
View File

@ -23,7 +23,7 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(":client:rest-high-level")
testImplementation project(":client:rest-high-level")
}
task 'remote-cluster'(type: RestIntegTestTask) {

6
qa/os/build.gradle
View File

@ -37,9 +37,9 @@ dependencies {
compile project(':libs:elasticsearch-core')
testCompile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testCompile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testCompile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
}
tasks.named('forbiddenApisTest').configure {

2
qa/remote-clusters/build.gradle
View File

@ -28,7 +28,7 @@ apply plugin: 'elasticsearch.distribution-download'
testFixtures.useFixture()
dependencies {
testCompile project(':client:rest-high-level')
testImplementation project(':client:rest-high-level')
}
task copyKeystore(type: Sync) {

3
qa/repository-multi-version/build.gradle
View File

@ -26,7 +26,7 @@ apply plugin: 'elasticsearch.standalone-test'
apply from : "$rootDir/gradle/bwc-test.gradle"
dependencies {
testCompile project(':client:rest-high-level')
testImplementation project(':client:rest-high-level')
}
for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
@ -89,6 +89,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {

2
qa/smoke-test-client/build.gradle
View File

@ -25,7 +25,7 @@ apply plugin: 'elasticsearch.rest-test'
// TODO: this test works, but it isn't really a rest test...should we have another plugin for "non rest test that just needs N clusters?"
dependencies {
testCompile project(path: ':client:transport', configuration: 'runtime') // randomly swapped in as a transport
testImplementation project(path: ':client:transport', configuration: 'runtime') // randomly swapped in as a transport
}
task singleNodeIntegTest(type: RestIntegTestTask) {

4
qa/smoke-test-http/build.gradle
View File

@ -23,8 +23,8 @@ apply plugin: 'elasticsearch.rest-test'
apply plugin: 'elasticsearch.test-with-dependencies'
dependencies {
testCompile project(path: ':modules:transport-netty4', configuration: 'runtime') // for http
testCompile project(path: ':plugins:transport-nio', configuration: 'runtime') // for http
testImplementation project(path: ':modules:transport-netty4', configuration: 'runtime') // for http
testImplementation project(path: ':plugins:transport-nio', configuration: 'runtime') // for http
}
integTest.runner {

2
qa/smoke-test-ingest-disabled/build.gradle
View File

@ -22,7 +22,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: ':modules:ingest-common', configuration: 'runtime')
testImplementation project(path: ':modules:ingest-common', configuration: 'runtime')
}
testClusters.integTest {

10
qa/smoke-test-ingest-with-all-dependencies/build.gradle
View File

@ -22,11 +22,11 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: ':modules:ingest-common', configuration: 'runtime')
testCompile project(path: ':modules:ingest-geoip', configuration: 'runtime')
testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
testCompile project(path: ':modules:lang-painless', configuration: 'runtime')
testCompile project(path: ':modules:reindex', configuration: 'runtime')
testImplementation project(path: ':modules:ingest-common', configuration: 'runtime')
testImplementation project(path: ':modules:ingest-geoip', configuration: 'runtime')
testImplementation project(path: ':modules:lang-mustache', configuration: 'runtime')
testImplementation project(path: ':modules:lang-painless', configuration: 'runtime')
testImplementation project(path: ':modules:reindex', configuration: 'runtime')
}
testingConventions {

2
qa/wildfly/build.gradle
View File

@ -46,7 +46,7 @@ dependencies {
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
compile "org.apache.logging.log4j:log4j-core:${versions.log4j}"
compile project(path: ':client:rest-high-level')
testCompile project(':test:framework')
testImplementation project(':test:framework')
}
war {

4
server/build.gradle
View File

@ -127,11 +127,11 @@ dependencies {
java11Compile sourceSets.main.output
}
testCompile(project(":test:framework")) {
testImplementation(project(":test:framework")) {
// tests use the locally compiled version of server
exclude group: 'org.elasticsearch', module: 'server'
}
internalClusterTestCompile(project(":test:framework")) {
internalClusterTestImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'server'
}
}

2
test/logger-usage/build.gradle
View File

@ -22,7 +22,7 @@ dependencies {
compile 'org.ow2.asm:asm-tree:7.1'
compile 'org.ow2.asm:asm-analysis:7.1'
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
testCompile project(":test:framework")
testImplementation project(":test:framework")
}
loggerUsageCheck.enabled = false

6
x-pack/docs/build.gradle
View File

@ -14,9 +14,9 @@ buildRestTests.expectedUnconvertedCandidates = [
]
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
}
restResources {

2
x-pack/license-tools/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'elasticsearch.build'
dependencies {
compile project(':x-pack:plugin:core')
compile project(':server')
testCompile project(':test:framework')
testImplementation project(':test:framework')
}
project.forbiddenPatterns {

2
x-pack/plugin/analytics/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
compileOnly project(":server")
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
compile 'org.apache.commons:commons-math3:3.2'
}

4
x-pack/plugin/async-search/build.gradle
View File

@ -26,8 +26,8 @@ dependencies {
compileOnly project(":server")
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ilm'))
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ilm'))
}
dependencyLicenses {

6
x-pack/plugin/async-search/qa/security/build.gradle
View File

@ -3,9 +3,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('async-search'), configuration: 'runtime')
testCompile project(':x-pack:plugin:async-search:qa')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('async-search'), configuration: 'runtime')
testImplementation project(':x-pack:plugin:async-search:qa')
}
testClusters.integTest {

2
x-pack/plugin/autoscaling/build.gradle
View File

@ -25,7 +25,7 @@ tasks.named('internalClusterTest').configure {
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
// add all sub-projects of the qa sub-project

4
x-pack/plugin/autoscaling/qa/rest/build.gradle
View File

@ -5,8 +5,8 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('autoscaling'), configuration: 'runtime')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('autoscaling'), configuration: 'runtime')
}
restResources {

5
x-pack/plugin/build.gradle
View File

@ -13,8 +13,8 @@ apply plugin: 'elasticsearch.validate-rest-spec'
archivesBaseName = 'x-pack'
dependencies {
testCompile project(xpackModule('core')) // this redundant dependency is here to make IntelliJ happy
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(xpackModule('core')) // this redundant dependency is here to make IntelliJ happy
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
subprojects {
@ -60,6 +60,7 @@ subprojects {
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
artifacts {

4
x-pack/plugin/ccr/build.gradle
View File

@ -42,8 +42,8 @@ dependencies {
compileOnly project(":server")
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
}
dependencyLicenses {

6
x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle
View File

@ -5,9 +5,9 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
testCompile project(':x-pack:plugin:ccr:qa')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(':x-pack:plugin:ccr:qa')
}
task "leader-cluster"(type: RestIntegTestTask) {

6
x-pack/plugin/ccr/qa/multi-cluster/build.gradle
View File

@ -4,9 +4,9 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
testCompile project(':x-pack:plugin:ccr:qa')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(':x-pack:plugin:ccr:qa')
}
task "leader-cluster"(type: RestIntegTestTask) {

6
x-pack/plugin/ccr/qa/non-compliant-license/build.gradle
View File

@ -4,9 +4,9 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
testCompile project(':x-pack:plugin:ccr:qa:')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(':x-pack:plugin:ccr:qa:')
}
task 'leader-cluster'(type: RestIntegTestTask) {

4
x-pack/plugin/ccr/qa/rest/build.gradle
View File

@ -11,8 +11,8 @@ restResources {
}
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
}
task restTest(type: RestIntegTestTask) {

2
x-pack/plugin/ccr/qa/restart/build.gradle
View File

@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(':x-pack:plugin:ccr:qa')
testImplementation project(':x-pack:plugin:ccr:qa')
}
task 'leader-cluster'(type: RestIntegTestTask) {

6
x-pack/plugin/ccr/qa/security/build.gradle
View File

@ -4,9 +4,9 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ccr'), configuration: 'runtime')
testCompile project(':x-pack:plugin:ccr:qa')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(':x-pack:plugin:ccr:qa')
}
task 'leader-cluster'(type: RestIntegTestTask) {

22
x-pack/plugin/core/build.gradle
View File

@ -43,16 +43,16 @@ dependencies {
exclude group: "org.elasticsearch", module: "elasticsearch-core"
}
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
testCompile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
testCompile "org.slf4j:slf4j-api:${versions.slf4j}"
testCompile project(path: ':modules:reindex', configuration: 'runtime')
testCompile project(path: ':modules:parent-join', configuration: 'runtime')
testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
testCompile project(path: ':modules:analysis-common', configuration: 'runtime')
testCompile project(':client:rest-high-level')
testCompile(project(':x-pack:license-tools')) {
testImplementation 'org.elasticsearch:securemock:1.2'
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
testImplementation "org.slf4j:slf4j-api:${versions.slf4j}"
testImplementation project(path: ':modules:reindex', configuration: 'runtime')
testImplementation project(path: ':modules:parent-join', configuration: 'runtime')
testImplementation project(path: ':modules:lang-mustache', configuration: 'runtime')
testImplementation project(path: ':modules:analysis-common', configuration: 'runtime')
testImplementation project(':client:rest-high-level')
testImplementation(project(':x-pack:license-tools')) {
transitive = false
}
@ -115,6 +115,7 @@ test {
// https://github.com/elastic/x-plugins/issues/724
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {
appendix 'test'
@ -141,4 +142,3 @@ thirdPartyAudit.ignoreMissingClasses(
// installing them as individual plugins for integ tests doesn't make sense,
// so we disable integ tests
integTest.enabled = false

10
x-pack/plugin/enrich/build.gradle
View File

@ -12,11 +12,11 @@ archivesBaseName = 'x-pack-enrich'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: ':modules:ingest-common')
testCompile project(path: ':modules:lang-mustache')
testCompile project(path: ':modules:geo')
testCompile project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: ':modules:ingest-common')
testImplementation project(path: ':modules:lang-mustache')
testImplementation project(path: ':modules:geo')
testImplementation project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
}
// No real integ tests in the module:

6
x-pack/plugin/enrich/qa/rest-with-security/build.gradle
View File

@ -3,9 +3,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('enrich'), configuration: 'runtime')
testCompile project(path: xpackModule('core'), configuration: 'runtime')
testCompile project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich'), configuration: 'runtime')
testImplementation project(path: xpackModule('core'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
}
testClusters.integTest {

4
x-pack/plugin/enrich/qa/rest/build.gradle
View File

@ -10,8 +10,8 @@ restResources {
}
dependencies {
testCompile project(path: xpackModule('enrich'), configuration: 'runtime')
testCompile project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
}
testClusters.integTest {

14
x-pack/plugin/eql/build.gradle
View File

@ -34,13 +34,13 @@ dependencies {
}
compile "org.antlr:antlr4-runtime:${antlrVersion}"
compileOnly project(path: xpackModule('ql'), configuration: 'default')
testCompile project(':test:framework')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ql'), configuration: 'testArtifacts')
testCompile project(path: ':modules:reindex', configuration: 'runtime')
testCompile project(path: ':modules:parent-join', configuration: 'runtime')
testCompile project(path: ':modules:analysis-common', configuration: 'runtime')
testImplementation project(':test:framework')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('security'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ql'), configuration: 'testArtifacts')
testImplementation project(path: ':modules:reindex', configuration: 'runtime')
testImplementation project(path: ':modules:parent-join', configuration: 'runtime')
testImplementation project(path: ':modules:analysis-common', configuration: 'runtime')
}

4
x-pack/plugin/eql/qa/rest/build.gradle
View File

@ -12,8 +12,8 @@ restResources {
}
dependencies {
testCompile project(path: xpackModule('eql'), configuration: 'runtime')
testCompile project(path: xpackModule('eql:qa:common'), configuration: 'runtime')
testImplementation project(path: xpackModule('eql'), configuration: 'runtime')
testImplementation project(path: xpackModule('eql:qa:common'), configuration: 'runtime')
}
testClusters.integTest {

2
x-pack/plugin/frozen-indices/build.gradle
View File

@ -11,7 +11,7 @@ archivesBaseName = 'x-pack-frozen-indices'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
// xpack modules are installed in real clusters as the meta plugin, so

2
x-pack/plugin/graph/build.gradle
View File

@ -11,7 +11,7 @@ archivesBaseName = 'x-pack-graph'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
// add all sub-projects of the qa sub-project

2
x-pack/plugin/graph/qa/with-security/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(":x-pack:plugin:core")
testImplementation project(":x-pack:plugin:core")
}
// bring in graph rest test suite

8
x-pack/plugin/identity-provider/build.gradle
View File

@ -15,9 +15,9 @@ archivesBaseName = 'x-pack-identity-provider'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
// So that we can extend LocalStateCompositeXPackPlugin
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('security'), configuration: 'testArtifacts')
// the following are all SAML dependencies - might as well download the whole internet
compile "org.opensaml:opensaml-core:3.4.5"
@ -50,8 +50,8 @@ dependencies {
compile "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
runtimeOnly 'com.google.guava:guava:19.0'
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
testImplementation 'org.elasticsearch:securemock:1.2'
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
}
compileJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"

6
x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle
View File

@ -3,9 +3,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('identity-provider'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('identity-provider'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
testClusters.integTest {

2
x-pack/plugin/ilm/build.gradle
View File

@ -14,7 +14,7 @@ archivesBaseName = 'x-pack-ilm'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
// add all sub-projects of the qa sub-project

6
x-pack/plugin/ilm/qa/multi-cluster/build.gradle
View File

@ -4,9 +4,9 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(':x-pack:plugin:ccr:qa')
testCompile project(':x-pack:plugin:core')
testCompile project(':x-pack:plugin:ilm')
testImplementation project(':x-pack:plugin:ccr:qa')
testImplementation project(':x-pack:plugin:core')
testImplementation project(':x-pack:plugin:ilm')
}
File repoDir = file("$buildDir/testclusters/repo")

2
x-pack/plugin/ilm/qa/multi-node/build.gradle
View File

@ -6,7 +6,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
testImplementation project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
}
File repoDir = file("$buildDir/testclusters/repo")

4
x-pack/plugin/ilm/qa/rest/build.gradle
View File

@ -4,8 +4,8 @@ apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ilm'), configuration: 'runtime')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ilm'), configuration: 'runtime')
}
restResources {

4
x-pack/plugin/ilm/qa/with-security/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
testCompile project(":client:rest-high-level")
testImplementation project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
testImplementation project(":client:rest-high-level")
}
def clusterCredentials = [username: System.getProperty('tests.rest.cluster.username', 'test_admin'),

2
x-pack/plugin/logstash/build.gradle
View File

@ -11,7 +11,7 @@ archivesBaseName = 'x-pack-logstash'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
integTest.enabled = false

2
x-pack/plugin/mapper-constant-keyword/build.gradle
View File

@ -18,7 +18,7 @@ archivesBaseName = 'x-pack-constant-keyword'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
integTest.enabled = false

2
x-pack/plugin/mapper-flattened/build.gradle
View File

@ -18,7 +18,7 @@ archivesBaseName = 'x-pack-flattened'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
integTest.enabled = false

9
x-pack/plugin/ml/build.gradle
View File

@ -50,10 +50,10 @@ bundlePlugin {
dependencies {
compileOnly project(':modules:lang-painless:spi')
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ilm'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ilm'), configuration: 'default')
// This should not be here
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('security'), configuration: 'testArtifacts')
// ml deps
compile project(':libs:elasticsearch-grok')
@ -62,11 +62,12 @@ dependencies {
nativeBundle("org.elasticsearch.ml:ml-cpp:${project.version}@zip") {
changing = true
}
testCompile 'org.ini4j:ini4j:0.5.2'
testImplementation 'org.ini4j:ini4j:0.5.2'
}
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {
appendix 'test'

4
x-pack/plugin/ml/qa/basic-multi-node/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(":x-pack:plugin:core")
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testImplementation project(":x-pack:plugin:core")
testImplementation project(path: xpackModule('ml'), configuration: 'runtime')
}
testClusters.integTest {

4
x-pack/plugin/ml/qa/disabled/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(":x-pack:plugin:core")
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testImplementation project(":x-pack:plugin:core")
testImplementation project(path: xpackModule('ml'), configuration: 'runtime')
}
testClusters.integTest {

6
x-pack/plugin/ml/qa/ml-with-security/build.gradle
View File

@ -3,9 +3,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
}
// bring in machine learning rest test suite

10
x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
View File

@ -3,11 +3,11 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testCompile project(path: xpackModule('ml'), configuration: 'testArtifacts')
testCompile project(path: ':modules:ingest-common')
testImplementation project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ml'), configuration: 'runtime')
testImplementation project(path: xpackModule('ml'), configuration: 'testArtifacts')
testImplementation project(path: ':modules:ingest-common')
}
// location for keys and certificates

4
x-pack/plugin/ml/qa/no-bootstrap-tests/build.gradle
View File

@ -1,6 +1,6 @@
apply plugin: 'elasticsearch.standalone-test'
dependencies {
testCompile project(":x-pack:plugin:core")
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testImplementation project(":x-pack:plugin:core")
testImplementation project(path: xpackModule('ml'), configuration: 'runtime')
}

4
x-pack/plugin/ml/qa/single-node-tests/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(":x-pack:plugin:core")
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testImplementation project(":x-pack:plugin:core")
testImplementation project(path: xpackModule('ml'), configuration: 'runtime')
}
testClusters.integTest {

7
x-pack/plugin/monitoring/build.gradle
View File

@ -12,20 +12,21 @@ archivesBaseName = 'x-pack-monitoring'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
// monitoring deps
compile project(':client:rest')
compile project(':client:sniffer')
// baz - this goes away after we separate out the actions #27759
testCompile project(xpackModule('watcher'))
testImplementation project(xpackModule('watcher'))
testCompile project(xpackModule('ilm'))
testImplementation project(xpackModule('ilm'))
}
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {
appendix 'test'

5
x-pack/plugin/ql/build.gradle
View File

@ -12,12 +12,13 @@ archivesBaseName = 'x-pack-ql'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(':test:framework')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(':test:framework')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {

2
x-pack/plugin/rollup/build.gradle
View File

@ -13,7 +13,7 @@ dependencies {
compileOnly project(":server")
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
integTest.enabled = false

4
x-pack/plugin/search-business-rules/build.gradle
View File

@ -16,8 +16,8 @@ integTest.enabled = false
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(":test:framework")
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(":test:framework")
}
// copied from CCR

3
x-pack/plugin/searchable-snapshots/build.gradle
View File

@ -13,7 +13,7 @@ archivesBaseName = 'x-pack-searchable-snapshots'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
// xpack modules are installed in real clusters as the meta plugin, so
@ -32,6 +32,7 @@ gradle.projectsEvaluated {
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {

4
x-pack/plugin/searchable-snapshots/qa/azure/build.gradle
View File

@ -26,8 +26,8 @@ final Project fixture = project(':test:fixtures:azure-fixture')
final Project repositoryPlugin = project(':plugins:repository-azure')
dependencies {
testCompile project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testCompile repositoryPlugin
testImplementation project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testImplementation repositoryPlugin
}
restResources {

4
x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle
View File

@ -32,8 +32,8 @@ final Project fixture = project(':test:fixtures:gcs-fixture')
final Project repositoryPlugin = project(':plugins:repository-gcs')
dependencies {
testCompile project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testCompile repositoryPlugin
testImplementation project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testImplementation repositoryPlugin
}
restResources {

4
x-pack/plugin/searchable-snapshots/qa/minio/build.gradle
View File

@ -9,8 +9,8 @@ final Project fixture = project(':test:fixtures:minio-fixture')
final Project repositoryPlugin = project(':plugins:repository-s3')
dependencies {
testCompile project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testCompile repositoryPlugin
testImplementation project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testImplementation repositoryPlugin
}
restResources {

2
x-pack/plugin/searchable-snapshots/qa/rest/build.gradle
View File

@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
}
final File repoDir = file("$buildDir/testclusters/repo")

4
x-pack/plugin/searchable-snapshots/qa/s3/build.gradle
View File

@ -8,8 +8,8 @@ final Project fixture = project(':test:fixtures:s3-fixture')
final Project repositoryPlugin = project(':plugins:repository-s3')
dependencies {
testCompile project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testCompile repositoryPlugin
testImplementation project(path: xpackModule('searchable-snapshots'), configuration: 'testArtifacts')
testImplementation repositoryPlugin
}
restResources {

129
x-pack/plugin/security/build.gradle
View File

@ -19,10 +19,10 @@ dependencies {
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
compileOnly project(path: ':plugins:transport-nio', configuration: 'runtime')
testCompile project(path: xpackModule('monitoring'))
testCompile project(path: xpackModule('sql:sql-action'))
testImplementation project(path: xpackModule('monitoring'))
testImplementation project(path: xpackModule('sql:sql-action'))
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
@ -67,71 +67,70 @@ dependencies {
compile "net.minidev:accessors-smart:1.2"
compile "org.ow2.asm:asm:7.3.1"
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
//testCompile "org.yaml:snakeyaml:${versions.snakeyaml}"
testImplementation 'org.elasticsearch:securemock:1.2'
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
// Test dependencies for Kerberos (MiniKdc)
testCompile('commons-io:commons-io:2.5')
testCompile('org.apache.kerby:kerb-simplekdc:1.1.1')
testCompile('org.apache.kerby:kerb-client:1.1.1')
testCompile('org.apache.kerby:kerby-config:1.1.1')
testCompile('org.apache.kerby:kerb-core:1.1.1')
testCompile('org.apache.kerby:kerby-pkix:1.1.1')
testCompile('org.apache.kerby:kerby-asn1:1.1.1')
testCompile('org.apache.kerby:kerby-util:1.1.1')
testCompile('org.apache.kerby:kerb-common:1.1.1')
testCompile('org.apache.kerby:kerb-crypto:1.1.1')
testCompile('org.apache.kerby:kerb-util:1.1.1')
testCompile('org.apache.kerby:token-provider:1.1.1')
testCompile('com.nimbusds:nimbus-jose-jwt:8.6')
testCompile('net.jcip:jcip-annotations:1.0')
testCompile('org.apache.kerby:kerb-admin:1.1.1')
testCompile('org.apache.kerby:kerb-server:1.1.1')
testCompile('org.apache.kerby:kerb-identity:1.1.1')
testCompile('org.apache.kerby:kerby-xdr:1.1.1')
testImplementation('commons-io:commons-io:2.5')
testImplementation('org.apache.kerby:kerb-simplekdc:1.1.1')
testImplementation('org.apache.kerby:kerb-client:1.1.1')
testImplementation('org.apache.kerby:kerby-config:1.1.1')
testImplementation('org.apache.kerby:kerb-core:1.1.1')
testImplementation('org.apache.kerby:kerby-pkix:1.1.1')
testImplementation('org.apache.kerby:kerby-asn1:1.1.1')
testImplementation('org.apache.kerby:kerby-util:1.1.1')
testImplementation('org.apache.kerby:kerb-common:1.1.1')
testImplementation('org.apache.kerby:kerb-crypto:1.1.1')
testImplementation('org.apache.kerby:kerb-util:1.1.1')
testImplementation('org.apache.kerby:token-provider:1.1.1')
testImplementation('com.nimbusds:nimbus-jose-jwt:8.6')
testImplementation('net.jcip:jcip-annotations:1.0')
testImplementation('org.apache.kerby:kerb-admin:1.1.1')
testImplementation('org.apache.kerby:kerb-server:1.1.1')
testImplementation('org.apache.kerby:kerb-identity:1.1.1')
testImplementation('org.apache.kerby:kerby-xdr:1.1.1')
// LDAP backend support for SimpleKdcServer
testCompile('org.apache.kerby:kerby-backend:1.1.1')
testCompile('org.apache.kerby:ldap-backend:1.1.1')
testCompile('org.apache.kerby:kerb-identity:1.1.1')
testCompile('org.apache.directory.api:api-ldap-client-api:1.0.0')
testCompile('org.apache.directory.api:api-ldap-schema-data:1.0.0')
testCompile('org.apache.directory.api:api-ldap-codec-core:1.0.0')
testCompile('org.apache.directory.api:api-ldap-extras-aci:1.0.0')
testCompile('org.apache.directory.api:api-ldap-extras-codec:1.0.0')
testCompile('org.apache.directory.api:api-ldap-extras-codec-api:1.0.0')
testCompile('commons-pool:commons-pool:1.6')
testCompile('commons-collections:commons-collections:3.2.2')
testCompile('org.apache.mina:mina-core:2.0.17')
testCompile('org.apache.directory.api:api-util:1.0.1')
testCompile('org.apache.directory.api:api-i18n:1.0.1')
testCompile('org.apache.directory.api:api-ldap-model:1.0.1')
testCompile('org.apache.directory.api:api-asn1-api:1.0.1')
testCompile('org.apache.directory.api:api-asn1-ber:1.0.1')
testCompile('org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:2.7.7_5')
testCompile('org.apache.directory.server:apacheds-core-api:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-i18n:2.0.0-M24')
testCompile('org.apache.directory.api:api-ldap-extras-util:1.0.0')
testCompile('net.sf.ehcache:ehcache:2.10.4')
testCompile('org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-protocol-ldap:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-protocol-shared:2.0.0-M24')
testCompile('org.apache.directory.jdbm:apacheds-jdbm1:2.0.0-M3')
testCompile('org.apache.directory.server:apacheds-jdbm-partition:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-xdbm-partition:2.0.0-M24')
testCompile('org.apache.directory.api:api-ldap-extras-sp:1.0.0')
testCompile('org.apache.directory.server:apacheds-test-framework:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-core-annotations:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-ldif-partition:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-mavibot-partition:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-protocol-kerberos:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-server-annotations:2.0.0-M24')
testCompile('org.apache.directory.api:api-ldap-codec-standalone:1.0.0')
testCompile('org.apache.directory.api:api-ldap-net-mina:1.0.0')
testCompile('org.apache.directory.server:ldap-client-test:2.0.0-M24')
testCompile('org.apache.directory.server:apacheds-interceptor-kerberos:2.0.0-M24')
testCompile('org.apache.directory.mavibot:mavibot:1.0.0-M8')
testImplementation('org.apache.kerby:kerby-backend:1.1.1')
testImplementation('org.apache.kerby:ldap-backend:1.1.1')
testImplementation('org.apache.kerby:kerb-identity:1.1.1')
testImplementation('org.apache.directory.api:api-ldap-client-api:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-schema-data:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-codec-core:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-extras-aci:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-extras-codec:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-extras-codec-api:1.0.0')
testImplementation('commons-pool:commons-pool:1.6')
testImplementation('commons-collections:commons-collections:3.2.2')
testImplementation('org.apache.mina:mina-core:2.0.17')
testImplementation('org.apache.directory.api:api-util:1.0.1')
testImplementation('org.apache.directory.api:api-i18n:1.0.1')
testImplementation('org.apache.directory.api:api-ldap-model:1.0.1')
testImplementation('org.apache.directory.api:api-asn1-api:1.0.1')
testImplementation('org.apache.directory.api:api-asn1-ber:1.0.1')
testImplementation('org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:2.7.7_5')
testImplementation('org.apache.directory.server:apacheds-core-api:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-i18n:2.0.0-M24')
testImplementation('org.apache.directory.api:api-ldap-extras-util:1.0.0')
testImplementation('net.sf.ehcache:ehcache:2.10.4')
testImplementation('org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-protocol-ldap:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-protocol-shared:2.0.0-M24')
testImplementation('org.apache.directory.jdbm:apacheds-jdbm1:2.0.0-M3')
testImplementation('org.apache.directory.server:apacheds-jdbm-partition:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-xdbm-partition:2.0.0-M24')
testImplementation('org.apache.directory.api:api-ldap-extras-sp:1.0.0')
testImplementation('org.apache.directory.server:apacheds-test-framework:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-core-annotations:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-ldif-partition:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-mavibot-partition:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-protocol-kerberos:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-server-annotations:2.0.0-M24')
testImplementation('org.apache.directory.api:api-ldap-codec-standalone:1.0.0')
testImplementation('org.apache.directory.api:api-ldap-net-mina:1.0.0')
testImplementation('org.apache.directory.server:ldap-client-test:2.0.0-M24')
testImplementation('org.apache.directory.server:apacheds-interceptor-kerberos:2.0.0-M24')
testImplementation('org.apache.directory.mavibot:mavibot:1.0.0-M8')
}
compileJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
@ -144,6 +143,7 @@ processTestResources {
configurations {
testArtifacts.extendsFrom testRuntime
testArtifacts.extendsFrom testImplementation
}
task testJar(type: Jar) {
appendix 'test'
@ -493,4 +493,3 @@ gradle.projectsEvaluated {
.findAll { it.path.startsWith(project.path + ":qa") }
.each { check.dependsOn it.check }
}

4
x-pack/plugin/security/cli/build.gradle
View File

@ -15,8 +15,8 @@ dependencies {
exclude group: 'com.google.guava', module: 'guava'
}
testRuntimeOnly 'com.google.guava:guava:19.0'
testCompile project(":test:framework")
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(":test:framework")
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
dependencyLicenses {

6
x-pack/plugin/security/qa/basic-enable-security/build.gradle
View File

@ -5,9 +5,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: xpackModule('core'), configuration: 'default')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('security'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
}
integTest {

Some files were not shown because too many files have changed in this diff Show More