honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace compile configuration usage with api (7.x backport) (#58721)

Browse Source 
* Replace compile configuration usage with api (#58451)

- Use java-library instead of plugin to allow api configuration usage
- Remove explicit references to runtime configurations in dependency declarations
- Make test runtime classpath input for testing convention
  - required as java library will by default not have build jar file
  - jar file is now explicit input of the task and gradle will ensure its properly build

* Fix compile usages in 7.x branch
This commit is contained in:
Rene Groeschke 2020-06-30 15:57:41 +02:00 committed by GitHub
parent 19190c529c
commit d952b101e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
125 changed files with 635 additions and 620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/build.gradle
View File

@ -29,12 +29,12 @@ archivesBaseName = 'elasticsearch-benchmarks'
test.enabled = false
dependencies {
compile(project(":server")) {
api( project(":server")) {
// JMH ships with the conflicting version 4.6. This prevents us from using jopt-simple in benchmarks (which should be ok) but allows
// us to invoke the JMH uberjar as usual.
exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
}
compile "org.openjdk.jmh:jmh-core:$versions.jmh"
api "org.openjdk.jmh:jmh-core:$versions.jmh"
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
// Dependencies of JMH
runtime 'net.sf.jopt-simple:jopt-simple:4.6'

6
build.gradle
View File

@ -441,7 +441,11 @@ allprojects {
dependsOn tasks.withType(ComposePull)
}
doLast {
configurations.findAll { it.isCanBeResolved() && !it.name.equals("testCompile") }.each { it.resolve() }
configurations.findAll {
it.isCanBeResolved() &&
it.name.equals("testCompile") == false &&
it.name.equals("compile") == false
}.each { it.resolve() }
}
}

29
buildSrc/build.gradle
View File

@ -108,24 +108,25 @@ repositories {
dependencies {
if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) {
// eclipse is confused if this is set explicitly
compile sourceSets.minimumRuntime.output
api sourceSets.minimumRuntime.output
}
compile localGroovy()
api localGroovy()
compile 'commons-codec:commons-codec:1.12'
compile 'org.apache.commons:commons-compress:1.19'
api 'commons-codec:commons-codec:1.12'
api 'org.apache.commons:commons-compress:1.19'
api 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
api 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
api 'com.netflix.nebula:gradle-info-plugin:7.1.3'
api 'org.apache.rat:apache-rat:0.11'
api "org.elasticsearch:jna:5.5.0"
api 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
api 'de.thetaphi:forbiddenapis:3.0'
api 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12'
api 'org.apache.maven:maven-model:3.6.2'
api 'com.networknt:json-schema-validator:1.0.36'
compile 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
compile 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
compile 'com.netflix.nebula:gradle-info-plugin:7.1.3'
compile 'org.apache.rat:apache-rat:0.11'
compile "org.elasticsearch:jna:5.5.0"
compile 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
compile 'de.thetaphi:forbiddenapis:3.0'
compile 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12'
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')}"
testImplementation "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
testFixturesApi "junit:junit:${props.getProperty('junit')}"

36
buildSrc/src/integTest/groovy/org/elasticsearch/gradle/EnforceDeprecationFailuresPluginFuncTest.groovy
View File

@ -23,6 +23,7 @@ import org.gradle.testkit.runner.GradleRunner
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import spock.lang.Specification
import spock.lang.Unroll
import java.lang.management.ManagementFactory
@ -44,17 +45,14 @@ class EnforceDeprecationFailuresPluginFuncTest extends Specification {
"""
}
def "fails on testCompile resolution"() {
@Unroll
def "fails on #compileConfigName resolution"() {
given:
buildFile << """
apply plugin:'java'
dependencies {
compile "org.acme:some-lib:1.0"
}
task resolve {
doLast {
configurations.testCompile.resolve()
configurations.${compileConfigName}.resolve()
}
}
"""
@ -64,25 +62,27 @@ class EnforceDeprecationFailuresPluginFuncTest extends Specification {
assertOutputContains(result.output, """
* What went wrong:
Execution failed for task ':resolve'.
> Resolving configuration testCompile is no longer supported. Use testImplementation instead.
> Resolving configuration $compileConfigName is no longer supported. Use $implementationConfigName instead.
""")
where:
compileConfigName | implementationConfigName
"compile" | "implementation"
"testCompile" | "testImplementation"
}
def "fails on testCompile dependency declaration"() {
@Unroll
def "fails on #compileConfigName dependency declaration"() {
given:
buildFile << """
apply plugin:'java-base'
sourceSets {
test
}
apply plugin:'java'
dependencies {
testCompile "org.acme:some-lib:1.0"
$compileConfigName "org.acme:some-lib:1.0"
}
task resolve {
tasks.register("resolve") {
doLast {
configurations.testCompile.resolve()
configurations.${compileConfigName}.resolve()
}
}
"""
@ -92,8 +92,12 @@ Execution failed for task ':resolve'.
assertOutputContains(result.output, """
* What went wrong:
Execution failed for task ':resolve'.
> Declaring dependencies for configuration testCompile is no longer supported. Use testImplementation instead.
> Declaring dependencies for configuration ${compileConfigName} is no longer supported. Use ${implementationConfigName} instead.
""")
where:
compileConfigName | implementationConfigName
"compile" | "implementation"
"testCompile" | "testImplementation"
}
private GradleRunner gradleRunner(String... arguments) {

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

@ -42,6 +42,7 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.execution.TaskActionListener;
import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.BasePlugin;
import org.gradle.api.plugins.JavaLibraryPlugin;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
@ -83,7 +84,7 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
// apply global test task failure listener
project.getRootProject().getPluginManager().apply(TestFailureReportingPlugin.class);
project.getPluginManager().apply(JavaPlugin.class);
project.getPluginManager().apply(JavaLibraryPlugin.class);
configureConfigurations(project);
configureRepositories(project);
@ -141,7 +142,8 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
}
});
};
disableTransitiveDeps.accept(JavaPlugin.COMPILE_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.API_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME);
disableTransitiveDeps.accept(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME);

18
buildSrc/src/main/java/org/elasticsearch/gradle/EnforceDeprecationFailuresPlugin.java
View File

@ -49,7 +49,7 @@ public class EnforceDeprecationFailuresPlugin implements Plugin<Project> {
sourceSetContainer.all(
sourceSet -> {
// TODO: remove that guard once we removed general compile usage from es build
if (sourceSet.getName().equals("test")) {
if (sourceSet.getName().equals("test") || sourceSet.getName().equals("main")) {
failOnCompileConfigurationResolution(sourceSet);
failOnCompileConfigurationDependencyDeclaration(sourceSet);
}
@ -78,15 +78,13 @@ public class EnforceDeprecationFailuresPlugin implements Plugin<Project> {
.getByName(sourceSet.getCompileConfigurationName())
.getIncoming()
.beforeResolve(resolvableDependencies -> {
if (resolvableDependencies.getDependencies().size() > 0) {
throw new GradleException(
"Resolving configuration "
+ sourceSet.getCompileConfigurationName()
+ " is no longer supported. Use "
+ sourceSet.getImplementationConfigurationName()
+ " instead."
);
}
throw new GradleException(
"Resolving configuration "
+ sourceSet.getCompileConfigurationName()
+ " is no longer supported. Use "
+ sourceSet.getImplementationConfigurationName()
+ " instead."
);
});
}

9
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java
View File

@ -26,6 +26,7 @@ import org.gradle.api.NamedDomainObjectContainer;
import org.gradle.api.Task;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.FileTree;
import org.gradle.api.tasks.Classpath;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.SourceSet;
@ -348,12 +349,8 @@ public class TestingConventionsTasks extends DefaultTask {
return false;
}
private FileCollection getTestsClassPath() {
// Loading the classes depends on the classpath, so we could make this an input annotated with @Classpath.
// The reason we don't is that test classes are already inputs and while the dependencies are needed to load
// the classes these don't influence the checks done by this task.
// A side effect is that we could mark as up-to-date with missing dependencies, but these will be found when
// running the tests.
@Classpath
public FileCollection getTestsClassPath() {
return Util.getJavaTestSourceSet(getProject()).get().getRuntimeClasspath();
}

4
buildSrc/src/testKit/elasticsearch.build/build.gradle
View File

@ -7,9 +7,9 @@ ext.licenseFile = file("LICENSE")
ext.noticeFile = file("NOTICE")
dependencies {
compile "junit:junit:${versions.junit}"
api "junit:junit:${versions.junit}"
// missing classes in thirdparty audit
compile 'org.hamcrest:hamcrest-core:1.3'
api 'org.hamcrest:hamcrest-core:1.3'
}
repositories {

18
client/benchmark/build.gradle
View File

@ -32,18 +32,18 @@ mainClassName = 'org.elasticsearch.client.benchmark.BenchmarkMain'
test.enabled = false
dependencies {
compile 'org.apache.commons:commons-math3:3.2'
api 'org.apache.commons:commons-math3:3.2'
compile project(":client:rest")
api project(":client:rest")
// bottleneck should be the client, not Elasticsearch
compile project(path: ':client:client-benchmark-noop-api-plugin')
api project(path: ':client:client-benchmark-noop-api-plugin')
// for transport client
compile project(":server")
compile project(":client:transport")
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
compile project(path: ':modules:reindex', configuration: 'runtime')
compile project(path: ':modules:lang-mustache', configuration: 'runtime')
compile project(path: ':modules:percolator', configuration: 'runtime')
api project(":server")
api project(":client:transport")
api project(':modules:transport-netty4')
api project(':modules:reindex')
api project(':modules:lang-mustache')
api project(':modules:percolator')
}
// No licenses for our benchmark deps (we don't ship benchmarks)

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

@ -36,13 +36,13 @@ restResources {
}
dependencies {
compile project(':server')
compile project(':client:rest')
compile project(':modules:mapper-extras')
compile project(':modules:parent-join')
compile project(':modules:aggs-matrix-stats')
compile project(':modules:rank-eval')
compile project(':modules:lang-mustache')
api project(':server')
api project(':client:rest')
api project(':modules:mapper-extras')
api project(':modules:parent-join')
api project(':modules:aggs-matrix-stats')
api project(':modules:rank-eval')
api project(':modules:lang-mustache')
testImplementation project(':client:test')
testImplementation project(':test:framework')

12
client/rest/build.gradle
View File

@ -28,12 +28,12 @@ group = 'org.elasticsearch.client'
archivesBaseName = 'elasticsearch-rest-client'
dependencies {
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-logging:commons-logging:${versions.commonslogging}"
testImplementation project(":client:test")
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"

12
client/sniffer/build.gradle
View File

@ -26,12 +26,12 @@ group = 'org.elasticsearch.client'
archivesBaseName = 'elasticsearch-rest-client-sniffer'
dependencies {
compile project(":client:rest")
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api project(":client:rest")
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testImplementation project(":client:test")
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"

8
client/test/build.gradle
View File

@ -24,10 +24,10 @@ sourceCompatibility = JavaVersion.VERSION_1_8
group = "${group}.client.test"
dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest:${versions.hamcrest}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
api "junit:junit:${versions.junit}"
api "org.hamcrest:hamcrest:${versions.hamcrest}"
}
tasks.named('forbiddenApisMain').configure {

14
client/transport/build.gradle
View File

@ -22,13 +22,13 @@ apply plugin: 'nebula.maven-base-publish'
group = 'org.elasticsearch.client'
dependencies {
compile project(":server")
compile project(":modules:transport-netty4")
compile project(":modules:reindex")
compile project(":modules:lang-mustache")
compile project(":modules:percolator")
compile project(":modules:parent-join")
compile project(":modules:rank-eval")
api project(":server")
api project(":modules:transport-netty4")
api project(":modules:reindex")
api project(":modules:lang-mustache")
api project(":modules:percolator")
api project(":modules:parent-join")
api project(":modules:rank-eval")
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"

6
distribution/build.gradle
View File

@ -287,13 +287,13 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
copySpec {
// delay by using closures, since they have not yet been configured, so no jar task exists yet
from { project(':server').jar }
from { project(':server').configurations.runtime }
from { project(':server').configurations.runtimeClasspath }
from { project(':libs:elasticsearch-plugin-classloader').jar }
from { project(':distribution:tools:java-version-checker').jar }
from { project(':distribution:tools:launchers').jar }
into('tools/plugin-cli') {
from { project(':distribution:tools:plugin-cli').jar }
from { project(':distribution:tools:plugin-cli').configurations.runtime }
from { project(':distribution:tools:plugin-cli').configurations.runtimeClasspath }
}
into('tools/keystore-cli') {
from { project(':distribution:tools:keystore-cli').jar }
@ -301,7 +301,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
if (oss == false) {
into('tools/security-cli') {
from { project(':x-pack:plugin:security:cli').jar }
from { project(':x-pack:plugin:security:cli').configurations.compile }
from { project(':x-pack:plugin:security:cli').configurations.compileClasspath }
}
}
}

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

@ -21,7 +21,7 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
apply plugin: 'elasticsearch.build'
dependencies {
compile parent.project('java-version-checker')
api parent.project('java-version-checker')
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"

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

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

4
libs/cli/build.gradle
View File

@ -21,8 +21,8 @@ apply plugin: 'nebula.optional-base'
apply plugin: 'elasticsearch.publish'
dependencies {
compile 'net.sf.jopt-simple:jopt-simple:5.0.2'
compile project(':libs:elasticsearch-core')
api 'net.sf.jopt-simple:jopt-simple:5.0.2'
api project(':libs:elasticsearch-core')
}
test.enabled = false

4
libs/grok/build.gradle
View File

@ -18,9 +18,9 @@
*/
dependencies {
compile 'org.jruby.joni:joni:2.1.29'
api 'org.jruby.joni:joni:2.1.29'
// joni dependencies:
compile 'org.jruby.jcodings:jcodings:1.0.44'
api 'org.jruby.jcodings:jcodings:1.0.44'
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'

2
libs/nio/build.gradle
View File

@ -19,7 +19,7 @@
apply plugin: 'elasticsearch.publish'
dependencies {
compile project(':libs:elasticsearch-core')
api project(':libs:elasticsearch-core')
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"

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

@ -19,7 +19,7 @@
apply plugin: "elasticsearch.publish"
dependencies {
compile project(':libs:elasticsearch-core')
api project(':libs:elasticsearch-core')
testImplementation(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-ssl-config'

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

@ -21,13 +21,13 @@ apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.publish'
dependencies {
compile project(':libs:elasticsearch-core')
api project(':libs:elasticsearch-core')
compile "org.yaml:snakeyaml:${versions.snakeyaml}"
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
api "org.yaml:snakeyaml:${versions.snakeyaml}"
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testImplementation "junit:junit:${versions.junit}"

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

@ -25,8 +25,8 @@ esplugin {
dependencies {
compileOnly project(':modules:lang-painless')
compile project(':libs:elasticsearch-grok')
compile project(':libs:elasticsearch-dissect')
api project(':libs:elasticsearch-grok')
api project(':libs:elasticsearch-dissect')
}
restResources {

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

@ -25,11 +25,11 @@ esplugin {
}
dependencies {
compile('com.maxmind.geoip2:geoip2:2.13.1')
api('com.maxmind.geoip2:geoip2:2.13.1')
// geoip2 dependencies:
compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
compile("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
compile('com.maxmind.db:maxmind-db:1.3.1')
api("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
api('com.maxmind.db:maxmind-db:1.3.1')
testImplementation 'org.elasticsearch:geolite2-databases:20191119'
}

2
modules/kibana/build.gradle
View File

@ -23,7 +23,7 @@ esplugin {
}
dependencies {
compile project(path: ':modules:reindex', configuration: 'runtime')
api project(path: ':modules:reindex')
}
testClusters.integTest {

10
modules/lang-expression/build.gradle
View File

@ -23,11 +23,11 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-expressions:${versions.lucene}"
compile 'org.antlr:antlr4-runtime:4.5.1-1'
compile 'org.ow2.asm:asm:5.0.4'
compile 'org.ow2.asm:asm-commons:5.0.4'
compile 'org.ow2.asm:asm-tree:5.0.4'
api "org.apache.lucene:lucene-expressions:${versions.lucene}"
api 'org.antlr:antlr4-runtime:4.5.1-1'
api 'org.ow2.asm:asm:5.0.4'
api 'org.ow2.asm:asm-commons:5.0.4'
api 'org.ow2.asm:asm-tree:5.0.4'
}
restResources {
restApi {

2
modules/lang-mustache/build.gradle
View File

@ -24,7 +24,7 @@ esplugin {
}
dependencies {
compile "com.github.spullara.mustache.java:compiler:0.9.6"
api "com.github.spullara.mustache.java:compiler:0.9.6"
}
restResources {

14
modules/lang-painless/build.gradle
View File

@ -33,13 +33,13 @@ testClusters.integTest {
}
dependencies {
compile 'org.antlr:antlr4-runtime:4.5.3'
compile 'org.ow2.asm:asm-util:7.2'
compile 'org.ow2.asm:asm-tree:7.2'
compile 'org.ow2.asm:asm-commons:7.2'
compile 'org.ow2.asm:asm-analysis:7.2'
compile 'org.ow2.asm:asm:7.2'
compile project('spi')
api 'org.antlr:antlr4-runtime:4.5.3'
api 'org.ow2.asm:asm-util:7.2'
api 'org.ow2.asm:asm-tree:7.2'
api 'org.ow2.asm:asm-commons:7.2'
api 'org.ow2.asm:asm-analysis:7.2'
api 'org.ow2.asm:asm:7.2'
api project('spi')
}
tasks.named("dependencyLicenses").configure {

2
modules/lang-painless/spi/build.gradle
View File

@ -24,7 +24,7 @@ group = 'org.elasticsearch.plugin'
archivesBaseName = 'elasticsearch-scripting-painless-spi'
dependencies {
compile project(":server")
api project(":server")
}
// no tests...yet?

4
modules/percolator/build.gradle
View File

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

8
modules/reindex/build.gradle
View File

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

14
modules/transport-netty4/build.gradle
View File

@ -35,13 +35,13 @@ esplugin {
dependencies {
// network stack
compile "io.netty:netty-buffer:${versions.netty}"
compile "io.netty:netty-codec:${versions.netty}"
compile "io.netty:netty-codec-http:${versions.netty}"
compile "io.netty:netty-common:${versions.netty}"
compile "io.netty:netty-handler:${versions.netty}"
compile "io.netty:netty-resolver:${versions.netty}"
compile "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-buffer:${versions.netty}"
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-codec-http:${versions.netty}"
api "io.netty:netty-common:${versions.netty}"
api "io.netty:netty-handler:${versions.netty}"
api "io.netty:netty-resolver:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
}
restResources {

4
plugins/analysis-icu/build.gradle
View File

@ -32,8 +32,8 @@ tasks.withType(CheckForbiddenApis).configureEach {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
compile "com.ibm.icu:icu4j:${versions.icu4j}"
api "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
api "com.ibm.icu:icu4j:${versions.icu4j}"
}
restResources {

2
plugins/analysis-kuromoji/build.gradle
View File

@ -23,7 +23,7 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-kuromoji:${versions.lucene}"
api "org.apache.lucene:lucene-analyzers-kuromoji:${versions.lucene}"
}
restResources {

2
plugins/analysis-nori/build.gradle
View File

@ -23,7 +23,7 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-nori:${versions.lucene}"
api "org.apache.lucene:lucene-analyzers-nori:${versions.lucene}"
}
restResources {

4
plugins/analysis-phonetic/build.gradle
View File

@ -23,8 +23,8 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-phonetic:${versions.lucene}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
api "org.apache.lucene:lucene-analyzers-phonetic:${versions.lucene}"
api "commons-codec:commons-codec:${versions.commonscodec}"
}
restResources {

2
plugins/analysis-smartcn/build.gradle
View File

@ -23,7 +23,7 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-smartcn:${versions.lucene}"
api "org.apache.lucene:lucene-analyzers-smartcn:${versions.lucene}"
}
restResources {

2
plugins/analysis-stempel/build.gradle
View File

@ -23,7 +23,7 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-stempel:${versions.lucene}"
api "org.apache.lucene:lucene-analyzers-stempel:${versions.lucene}"
}
restResources {

8
plugins/analysis-ukrainian/build.gradle
View File

@ -23,10 +23,10 @@ esplugin {
}
dependencies {
compile "org.apache.lucene:lucene-analyzers-morfologik:${versions.lucene}"
compile "org.carrot2:morfologik-stemming:2.1.1"
compile "org.carrot2:morfologik-fsa:2.1.1"
compile "ua.net.nlp:morfologik-ukrainian-search:3.7.5"
api "org.apache.lucene:lucene-analyzers-morfologik:${versions.lucene}"
api "org.carrot2:morfologik-stemming:2.1.1"
api "org.carrot2:morfologik-fsa:2.1.1"
api "ua.net.nlp:morfologik-ukrainian-search:3.7.5"
}
restResources {

42
plugins/discovery-azure-classic/build.gradle
View File

@ -31,30 +31,30 @@ versions << [
]
dependencies {
compile "com.microsoft.azure:azure-svc-mgmt-compute:${versions.azure}"
compile "com.microsoft.azure:azure-core:${versions.azure}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "commons-lang:commons-lang:2.6"
compile "commons-io:commons-io:2.4"
compile 'javax.mail:mail:1.4.5'
compile 'javax.inject:javax.inject:1'
compile "com.sun.jersey:jersey-client:${versions.jersey}"
compile "com.sun.jersey:jersey-core:${versions.jersey}"
compile "com.sun.jersey:jersey-json:${versions.jersey}"
compile 'org.codehaus.jettison:jettison:1.1'
compile 'com.sun.xml.bind:jaxb-impl:2.2.3-1'
compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
compile 'org.codehaus.jackson:jackson-jaxrs:1.9.2'
compile 'org.codehaus.jackson:jackson-xc:1.9.2'
api "com.microsoft.azure:azure-svc-mgmt-compute:${versions.azure}"
api "com.microsoft.azure:azure-core:${versions.azure}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-lang:commons-lang:2.6"
api "commons-io:commons-io:2.4"
api 'javax.mail:mail:1.4.5'
api 'javax.inject:javax.inject:1'
api "com.sun.jersey:jersey-client:${versions.jersey}"
api "com.sun.jersey:jersey-core:${versions.jersey}"
api "com.sun.jersey:jersey-json:${versions.jersey}"
api 'org.codehaus.jettison:jettison:1.1'
api 'com.sun.xml.bind:jaxb-impl:2.2.3-1'
api 'org.codehaus.jackson:jackson-core-asl:1.9.2'
api 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
api 'org.codehaus.jackson:jackson-jaxrs:1.9.2'
api 'org.codehaus.jackson:jackson-xc:1.9.2'
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
// and whitelist this hack in JarHell
compile 'javax.xml.bind:jaxb-api:2.2.2'
api 'javax.xml.bind:jaxb-api:2.2.2'
}
restResources {

18
plugins/discovery-ec2/build.gradle
View File

@ -29,15 +29,15 @@ versions << [
]
dependencies {
compile "com.amazonaws:aws-java-sdk-ec2:${versions.aws}"
compile "com.amazonaws:aws-java-sdk-core:${versions.aws}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
api "com.amazonaws:aws-java-sdk-ec2:${versions.aws}"
api "com.amazonaws:aws-java-sdk-core:${versions.aws}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
}
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 {
testImplementation project(path: ':plugins:discovery-ec2', configuration: 'runtime')
testImplementation project(':plugins:discovery-ec2')
}
restResources {

22
plugins/discovery-gce/build.gradle
View File

@ -8,17 +8,17 @@ versions << [
]
dependencies {
compile "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
compile "com.google.api-client:google-api-client:${versions.google}"
compile "com.google.oauth-client:google-oauth-client:${versions.google}"
compile "com.google.http-client:google-http-client:${versions.google}"
compile "com.google.http-client:google-http-client-jackson2:${versions.google}"
compile 'com.google.code.findbugs:jsr305:1.3.9'
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
api "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
api "com.google.api-client:google-api-client:${versions.google}"
api "com.google.oauth-client:google-oauth-client:${versions.google}"
api "com.google.http-client:google-http-client:${versions.google}"
api "com.google.http-client:google-http-client-jackson2:${versions.google}"
api 'com.google.code.findbugs:jsr305:1.3.9'
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
}
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 {
testImplementation project(path: ':plugins:discovery-gce', configuration: 'runtime')
testImplementation project(':plugins:discovery-gce')
}
restResources {

54
plugins/ingest-attachment/build.gradle
View File

@ -33,47 +33,47 @@ versions << [
dependencies {
// mandatory for tika
compile "org.apache.tika:tika-core:${versions.tika}"
api "org.apache.tika:tika-core:${versions.tika}"
// build against Jackson 2.9.5, but still works on our current version
compile "org.apache.tika:tika-parsers:${versions.tika}"
compile 'org.tukaani:xz:1.8'
compile 'commons-io:commons-io:2.6'
compile "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.tika:tika-parsers:${versions.tika}"
api 'org.tukaani:xz:1.8'
api 'commons-io:commons-io:2.6'
api "org.slf4j:slf4j-api:${versions.slf4j}"
// character set detection
compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
// external parser libraries
// HTML
compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
api 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
// Adobe PDF
compile "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
compile "org.apache.pdfbox:fontbox:${versions.pdfbox}"
compile "org.apache.pdfbox:jempbox:1.8.16"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.bouncycastle:bcmail-jdk15on:${versions.bouncycastle}"
compile "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
compile "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
api "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
api "org.apache.pdfbox:jempbox:1.8.16"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.bouncycastle:bcmail-jdk15on:${versions.bouncycastle}"
api "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
// OpenOffice
compile "org.apache.poi:poi-ooxml:${versions.poi}"
compile "org.apache.poi:poi:${versions.poi}"
compile "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile 'org.apache.xmlbeans:xmlbeans:3.0.1'
compile 'org.apache.commons:commons-collections4:4.1'
api "org.apache.poi:poi-ooxml:${versions.poi}"
api "org.apache.poi:poi:${versions.poi}"
api "org.apache.poi:poi-ooxml-schemas:${versions.poi}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'org.apache.xmlbeans:xmlbeans:3.0.1'
api 'org.apache.commons:commons-collections4:4.1'
// MS Office
compile "org.apache.poi:poi-scratchpad:${versions.poi}"
api "org.apache.poi:poi-scratchpad:${versions.poi}"
// Apple iWork
compile 'org.apache.commons:commons-compress:1.19'
api 'org.apache.commons:commons-compress:1.19'
// Outlook documents
compile "org.apache.james:apache-mime4j-core:${versions.mime4j}"
compile "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
api "org.apache.james:apache-mime4j-core:${versions.mime4j}"
api "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
// EPUB books
compile 'org.apache.commons:commons-lang3:3.9'
api 'org.apache.commons:commons-lang3:3.9'
// Microsoft Word files with visio diagrams
compile 'org.apache.commons:commons-math3:3.6.1'
api 'org.apache.commons:commons-math3:3.6.1'
// POIs dependency
compile 'com.zaxxer:SparseBitSet:1.2'
api 'com.zaxxer:SparseBitSet:1.2'
}
restResources {

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

@ -29,10 +29,10 @@ esplugin {
}
dependencies {
compile 'com.microsoft.azure:azure-storage:8.6.2'
compile 'com.microsoft.azure:azure-keyvault-core:1.0.0'
api 'com.microsoft.azure:azure-storage:8.6.2'
api 'com.microsoft.azure:azure-keyvault-core:1.0.0'
runtimeOnly 'com.google.guava:guava:20.0'
compile 'org.apache.commons:commons-lang3:3.4'
api 'org.apache.commons:commons-lang3:3.4'
testImplementation project(':test:fixtures:azure-fixture')
}

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

@ -35,33 +35,33 @@ esplugin {
}
dependencies {
compile 'com.google.cloud:google-cloud-storage:1.106.0'
compile 'com.google.cloud:google-cloud-core:1.93.3'
api 'com.google.cloud:google-cloud-storage:1.106.0'
api 'com.google.cloud:google-cloud-core:1.93.3'
runtimeOnly 'com.google.guava:guava:26.0-jre'
compile 'com.google.http-client:google-http-client:1.34.2'
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile 'com.google.api:api-common:1.8.1'
compile 'com.google.api:gax:1.54.0'
compile 'org.threeten:threetenbp:1.4.1'
compile 'com.google.protobuf:protobuf-java-util:3.11.3'
compile 'com.google.protobuf:protobuf-java:3.11.3'
compile 'com.google.code.gson:gson:2.7'
compile 'com.google.api.grpc:proto-google-common-protos:1.16.0'
compile 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
compile 'com.google.cloud:google-cloud-core-http:1.93.3'
compile 'com.google.auth:google-auth-library-credentials:0.20.0'
compile 'com.google.auth:google-auth-library-oauth2-http:0.20.0'
compile 'com.google.oauth-client:google-oauth-client:1.28.0'
compile 'com.google.api-client:google-api-client:1.30.9'
compile 'com.google.http-client:google-http-client-appengine:1.34.2'
compile 'com.google.http-client:google-http-client-jackson2:1.34.2'
compile 'com.google.api:gax-httpjson:0.62.0'
compile 'io.grpc:grpc-context:1.12.0'
compile 'io.opencensus:opencensus-api:0.18.0'
compile 'io.opencensus:opencensus-contrib-http-util:0.18.0'
compile 'com.google.apis:google-api-services-storage:v1-rev20200226-1.30.9'
api 'com.google.http-client:google-http-client:1.34.2'
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'com.google.api:api-common:1.8.1'
api 'com.google.api:gax:1.54.0'
api 'org.threeten:threetenbp:1.4.1'
api 'com.google.protobuf:protobuf-java-util:3.11.3'
api 'com.google.protobuf:protobuf-java:3.11.3'
api 'com.google.code.gson:gson:2.7'
api 'com.google.api.grpc:proto-google-common-protos:1.16.0'
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
api 'com.google.cloud:google-cloud-core-http:1.93.3'
api 'com.google.auth:google-auth-library-credentials:0.20.0'
api 'com.google.auth:google-auth-library-oauth2-http:0.20.0'
api 'com.google.oauth-client:google-oauth-client:1.28.0'
api 'com.google.api-client:google-api-client:1.30.9'
api 'com.google.http-client:google-http-client-appengine:1.34.2'
api 'com.google.http-client:google-http-client-jackson2:1.34.2'
api 'com.google.api:gax-httpjson:0.62.0'
api 'io.grpc:grpc-context:1.12.0'
api 'io.opencensus:opencensus-api:0.18.0'
api 'io.opencensus:opencensus-contrib-http-util:0.18.0'
api 'com.google.apis:google-api-services-storage:v1-rev20200226-1.30.9'
testImplementation project(':test:fixtures:gcs-fixture')
}

38
plugins/repository-hdfs/build.gradle
View File

@ -45,26 +45,26 @@ configurations {
}
dependencies {
compile "org.apache.hadoop:hadoop-client:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-common:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-annotations:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-auth:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-hdfs:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-hdfs-client:${versions.hadoop2}"
compile 'org.apache.htrace:htrace-core4:4.0.1-incubating'
api "org.apache.hadoop:hadoop-client:${versions.hadoop2}"
api "org.apache.hadoop:hadoop-common:${versions.hadoop2}"
api "org.apache.hadoop:hadoop-annotations:${versions.hadoop2}"
api "org.apache.hadoop:hadoop-auth:${versions.hadoop2}"
api "org.apache.hadoop:hadoop-hdfs:${versions.hadoop2}"
api "org.apache.hadoop:hadoop-hdfs-client:${versions.hadoop2}"
api 'org.apache.htrace:htrace-core4:4.0.1-incubating'
runtimeOnly 'com.google.guava:guava:11.0.2'
compile 'com.google.protobuf:protobuf-java:2.5.0'
compile 'commons-logging:commons-logging:1.1.3'
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile 'commons-cli:commons-cli:1.2'
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile 'commons-collections:commons-collections:3.2.2'
compile 'commons-configuration:commons-configuration:1.6'
compile 'commons-io:commons-io:2.4'
compile 'commons-lang:commons-lang:2.6'
compile 'javax.servlet:servlet-api:2.5'
compile "org.slf4j:slf4j-api:${versions.slf4j}"
compile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
api 'com.google.protobuf:protobuf-java:2.5.0'
api 'commons-logging:commons-logging:1.1.3'
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api 'commons-cli:commons-cli:1.2'
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'commons-collections:commons-collections:3.2.2'
api 'commons-configuration:commons-configuration:1.6'
api 'commons-io:commons-io:2.4'
api 'commons-lang:commons-lang:2.6'
api 'javax.servlet:servlet-api:2.5'
api "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
hdfsFixture project(':test:fixtures:hdfs-fixture')
// Set the keytab files in the classpath so that we can access them from test code without the security manager

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

@ -32,23 +32,23 @@ versions << [
]
dependencies {
compile "com.amazonaws:aws-java-sdk-s3:${versions.aws}"
compile "com.amazonaws:aws-java-sdk-core:${versions.aws}"
compile "com.amazonaws:jmespath-java:${versions.aws}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
compile "joda-time:joda-time:${versions.joda}"
api "com.amazonaws:aws-java-sdk-s3:${versions.aws}"
api "com.amazonaws:aws-java-sdk-core:${versions.aws}"
api "com.amazonaws:jmespath-java:${versions.aws}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
api "joda-time:joda-time:${versions.joda}"
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
// and whitelist this hack in JarHell
compile 'javax.xml.bind:jaxb-api:2.2.2'
api 'javax.xml.bind:jaxb-api:2.2.2'
testImplementation project(':test:fixtures:s3-fixture')
}

16
plugins/transport-nio/build.gradle
View File

@ -27,16 +27,16 @@ esplugin {
}
dependencies {
compile project(':libs:elasticsearch-nio')
api project(':libs:elasticsearch-nio')
// network stack
compile "io.netty:netty-buffer:${versions.netty}"
compile "io.netty:netty-codec:${versions.netty}"
compile "io.netty:netty-codec-http:${versions.netty}"
compile "io.netty:netty-common:${versions.netty}"
compile "io.netty:netty-handler:${versions.netty}"
compile "io.netty:netty-resolver:${versions.netty}"
compile "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-buffer:${versions.netty}"
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-codec-http:${versions.netty}"
api "io.netty:netty-common:${versions.netty}"
api "io.netty:netty-handler:${versions.netty}"
api "io.netty:netty-resolver:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
}
tasks.named("dependencyLicenses").configure {

24
qa/os/build.gradle
View File

@ -22,20 +22,20 @@ plugins {
}
dependencies {
compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest:${versions.hamcrest}"
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
api "junit:junit:${versions.junit}"
api "org.hamcrest:hamcrest:${versions.hamcrest}"
api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:fluent-hc:${versions.httpclient}"
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
compile "org.apache.logging.log4j:log4j-core:${versions.log4j}"
compile "org.apache.logging.log4j:log4j-jcl:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:fluent-hc:${versions.httpclient}"
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api "org.apache.logging.log4j:log4j-jcl:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-logging:commons-logging:${versions.commonslogging}"
compile project(':libs:elasticsearch-core')
api project(':libs:elasticsearch-core')
testImplementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"

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 {
testImplementation project(path: ':client:transport', configuration: 'runtime') // randomly swapped in as a transport
testImplementation project(':client:transport') // 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 {
testImplementation project(path: ':modules:transport-netty4', configuration: 'runtime') // for http
testImplementation project(path: ':plugins:transport-nio', configuration: 'runtime') // for http
testImplementation project(path: ':modules:transport-netty4') // for http
testImplementation project(path: ':plugins:transport-nio') // 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 {
testImplementation project(path: ':modules:ingest-common', configuration: 'runtime')
testImplementation project(':modules:ingest-common')
}
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 {
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')
testImplementation project(':modules:ingest-common')
testImplementation project(':modules:ingest-geoip')
testImplementation project(':modules:lang-mustache')
testImplementation project(':modules:lang-painless')
testImplementation project(':modules:reindex')
}
testingConventions {

20
qa/wildfly/build.gradle
View File

@ -31,21 +31,21 @@ dependencies {
providedCompile 'javax.enterprise:cdi-api:1.2'
providedCompile 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final'
providedCompile 'org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.0.Final'
compile('org.jboss.resteasy:resteasy-jackson2-provider:3.0.19.Final') {
api('org.jboss.resteasy:resteasy-jackson2-provider:3.0.19.Final') {
exclude module: 'jackson-annotations'
exclude module: 'jackson-core'
exclude module: 'jackson-databind'
exclude module: 'jackson-jaxrs-json-provider'
}
compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:${versions.jackson}"
compile "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
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')
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:${versions.jackson}"
api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api project(path: ':client:rest-high-level')
testImplementation project(':test:framework')
}

60
server/build.gradle
View File

@ -45,7 +45,7 @@ if (!isEclipse) {
}
configurations {
java11Compile.extendsFrom(compile)
java11Compile.extendsFrom(api)
}
dependencies {
@ -76,52 +76,52 @@ if (!isEclipse) {
dependencies {
compile project(':libs:elasticsearch-core')
compile project(':libs:elasticsearch-secure-sm')
compile project(':libs:elasticsearch-x-content')
compile project(":libs:elasticsearch-geo")
api project(':libs:elasticsearch-core')
api project(':libs:elasticsearch-secure-sm')
api project(':libs:elasticsearch-x-content')
api project(":libs:elasticsearch-geo")
compileOnly project(':libs:elasticsearch-plugin-classloader')
testRuntimeOnly project(':libs:elasticsearch-plugin-classloader')
// lucene
compile "org.apache.lucene:lucene-core:${versions.lucene}"
compile "org.apache.lucene:lucene-analyzers-common:${versions.lucene}"
compile "org.apache.lucene:lucene-backward-codecs:${versions.lucene}"
compile "org.apache.lucene:lucene-grouping:${versions.lucene}"
compile "org.apache.lucene:lucene-highlighter:${versions.lucene}"
compile "org.apache.lucene:lucene-join:${versions.lucene}"
compile "org.apache.lucene:lucene-memory:${versions.lucene}"
compile "org.apache.lucene:lucene-misc:${versions.lucene}"
compile "org.apache.lucene:lucene-queries:${versions.lucene}"
compile "org.apache.lucene:lucene-queryparser:${versions.lucene}"
compile "org.apache.lucene:lucene-sandbox:${versions.lucene}"
compile "org.apache.lucene:lucene-spatial-extras:${versions.lucene}"
compile "org.apache.lucene:lucene-spatial3d:${versions.lucene}"
compile "org.apache.lucene:lucene-suggest:${versions.lucene}"
api "org.apache.lucene:lucene-core:${versions.lucene}"
api "org.apache.lucene:lucene-analyzers-common:${versions.lucene}"
api "org.apache.lucene:lucene-backward-codecs:${versions.lucene}"
api "org.apache.lucene:lucene-grouping:${versions.lucene}"
api "org.apache.lucene:lucene-highlighter:${versions.lucene}"
api "org.apache.lucene:lucene-join:${versions.lucene}"
api "org.apache.lucene:lucene-memory:${versions.lucene}"
api "org.apache.lucene:lucene-misc:${versions.lucene}"
api "org.apache.lucene:lucene-queries:${versions.lucene}"
api "org.apache.lucene:lucene-queryparser:${versions.lucene}"
api "org.apache.lucene:lucene-sandbox:${versions.lucene}"
api "org.apache.lucene:lucene-spatial-extras:${versions.lucene}"
api "org.apache.lucene:lucene-spatial3d:${versions.lucene}"
api "org.apache.lucene:lucene-suggest:${versions.lucene}"
// utilities
compile project(":libs:elasticsearch-cli")
compile 'com.carrotsearch:hppc:0.8.1'
api project(":libs:elasticsearch-cli")
api 'com.carrotsearch:hppc:0.8.1'
// time handling, remove with java 8 time
compile "joda-time:joda-time:${versions.joda}"
api "joda-time:joda-time:${versions.joda}"
// percentiles aggregation
compile 'com.tdunning:t-digest:3.2'
api 'com.tdunning:t-digest:3.2'
// precentil ranks aggregation
compile 'org.hdrhistogram:HdrHistogram:2.1.9'
api 'org.hdrhistogram:HdrHistogram:2.1.9'
// lucene spatial
compile "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
compile "org.locationtech.jts:jts-core:${versions.jts}", optional
api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
api "org.locationtech.jts:jts-core:${versions.jts}", optional
// logging
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
compile "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional
// repackaged jna with native bits linked against all elastic supported platforms
compile "org.elasticsearch:jna:${versions.jna}"
api "org.elasticsearch:jna:${versions.jna}"
if (!isEclipse) {
java11Compile sourceSets.main.output
@ -324,7 +324,7 @@ if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
tasks.named("dependencyLicenses").configure {
mapping from: /lucene-.*/, to: 'lucene'
dependencies = project.configurations.runtime.fileCollection {
dependencies = project.configurations.runtimeClasspath.fileCollection {
it.group.startsWith('org.elasticsearch') == false ||
// keep the following org.elasticsearch jars in
(it.name == 'jna' ||

2
test/fixtures/azure-fixture/build.gradle vendored
View File

@ -23,7 +23,7 @@ description = 'Fixture for Azure external service'
test.enabled = false
dependencies {
compile project(':server')
api project(':server')
}
preProcessFixture {

2
test/fixtures/gcs-fixture/build.gradle vendored
View File

@ -23,7 +23,7 @@ description = 'Fixture for Google Cloud Storage service'
test.enabled = false
dependencies {
compile project(':server')
api project(':server')
}
preProcessFixture {

2
test/fixtures/hdfs-fixture/build.gradle vendored
View File

@ -20,7 +20,7 @@
apply plugin: 'elasticsearch.build'
dependencies {
compile "org.apache.hadoop:hadoop-minicluster:2.8.5"
api "org.apache.hadoop:hadoop-minicluster:2.8.5"
}
test.enabled = false

2
test/fixtures/old-elasticsearch/build.gradle vendored
View File

@ -28,5 +28,5 @@ test.enabled = false
dependencies {
// Just for the constants....
compile "org.apache.lucene:lucene-core:${versions.lucene}"
api "org.apache.lucene:lucene-core:${versions.lucene}"
}

2
test/fixtures/s3-fixture/build.gradle vendored
View File

@ -23,7 +23,7 @@ description = 'Fixture for S3 Storage service'
test.enabled = false
dependencies {
compile project(':server')
api project(':server')
}
preProcessFixture {

28
test/framework/build.gradle
View File

@ -19,20 +19,20 @@
import org.elasticsearch.gradle.info.BuildParams;
dependencies {
compile project(":client:rest")
compile project(":client:sniffer")
compile project(':libs:elasticsearch-nio')
compile project(":server")
compile project(":libs:elasticsearch-cli")
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest:${versions.hamcrest}"
compile "org.apache.lucene:lucene-test-framework:${versions.lucene}"
compile "org.apache.lucene:lucene-codecs:${versions.lucene}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "org.elasticsearch:securemock:${versions.securemock}"
compile "org.elasticsearch:mocksocket:${versions.mocksocket}"
api project(":client:rest")
api project(":client:sniffer")
api project(':libs:elasticsearch-nio')
api project(":server")
api project(":libs:elasticsearch-cli")
api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
api "junit:junit:${versions.junit}"
api "org.hamcrest:hamcrest:${versions.hamcrest}"
api "org.apache.lucene:lucene-test-framework:${versions.lucene}"
api "org.apache.lucene:lucene-codecs:${versions.lucene}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "org.elasticsearch:securemock:${versions.securemock}"
api "org.elasticsearch:mocksocket:${versions.mocksocket}"
}
compileJava.options.compilerArgs << '-Xlint:-cast,-rawtypes,-unchecked'

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

@ -18,10 +18,10 @@
*/
dependencies {
compile 'org.ow2.asm:asm:7.1'
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}"
api 'org.ow2.asm:asm:7.1'
api 'org.ow2.asm:asm-tree:7.1'
api 'org.ow2.asm:asm-analysis:7.1'
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
testImplementation project(":test:framework")
}

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

@ -1,8 +1,8 @@
apply plugin: 'elasticsearch.build'
dependencies {
compile project(':x-pack:plugin:core')
compile project(':server')
api project(':x-pack:plugin:core')
api project(':server')
testImplementation project(':test:framework')
}
@ -16,7 +16,7 @@ task buildZip(type: Zip, dependsOn: jar) {
String parentDir = "license-tools-${archiveVersion}"
into(parentDir + '/lib') {
from jar
from configurations.runtime
from configurations.runtimeClasspath
}
into(parentDir + '/bin') {
from 'bin'

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

@ -19,7 +19,7 @@ dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
compile 'org.apache.commons:commons-math3:3.2'
api 'org.apache.commons:commons-math3:3.2'
}
integTest.enabled = false

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

@ -4,5 +4,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

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

@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.rest-test'
dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('async-search'), configuration: 'runtime')
testImplementation project(xpackModule('async-search'))
testImplementation project(':x-pack:plugin:async-search:qa')
}

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

@ -2,5 +2,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

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

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

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

@ -2,5 +2,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

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

@ -6,7 +6,7 @@ apply plugin: 'elasticsearch.standalone-test'
dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(xpackModule('ccr'))
testImplementation project(':x-pack:plugin:ccr:qa')
}

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

@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(xpackModule('ccr'))
testImplementation project(':x-pack:plugin:ccr:qa')
}

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

@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(xpackModule('ccr'))
testImplementation project(':x-pack:plugin:ccr:qa:')
}

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

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

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

@ -5,10 +5,18 @@ apply plugin: 'elasticsearch.standalone-test'
dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
testImplementation project(path: xpackModule('ccr'), configuration: 'runtime')
testImplementation project(path: xpackModule('ccr'))
testImplementation project(':x-pack:plugin:ccr:qa')
}
task resolve {
doLast {
configurations.testCompileClasspath.files.each {
println it
}
println "configurations.testCompileClasspath.files " + configurations.testCompileClasspath.files.size()
}
}
task 'leader-cluster'(type: RestIntegTestTask) {
mustRunAfter(precommit)
runner {

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

@ -25,20 +25,20 @@ tasks.named("dependencyLicenses").configure {
dependencies {
compileOnly project(":server")
compile project(":libs:elasticsearch-ssl-config")
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
compile "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
api project(":libs:elasticsearch-ssl-config")
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
// security deps
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
compile(project(path: ':plugins:transport-nio', configuration: 'runtime')) {
api 'com.unboundid:unboundid-ldapsdk:4.0.8'
api project(path: ':modules:transport-netty4')
api( project(path: ':plugins:transport-nio')) {
// TODO: core exclusion should not be necessary, since it is a transitive dep of all plugins
exclude group: "org.elasticsearch", module: "elasticsearch-core"
}
@ -47,11 +47,12 @@ dependencies {
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(path: ':modules:reindex')
testImplementation project(path: ':modules:parent-join')
testImplementation project(path: ':modules:lang-mustache')
testImplementation project(path: ':modules:analysis-common')
testImplementation project(":client:rest-high-level")
testImplementation(project(':x-pack:license-tools')) {
transitive = false
}

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

@ -4,5 +4,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

2
x-pack/plugin/enrich/qa/common/build.gradle
View File

@ -2,5 +2,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

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 {
testImplementation project(path: xpackModule('enrich'), configuration: 'runtime')
testImplementation project(path: xpackModule('core'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
testImplementation project(path: xpackModule('enrich'))
testImplementation project(path: xpackModule('core'))
testImplementation project(path: xpackModule('enrich:qa:common'))
}
testClusters.integTest {

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

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

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

@ -32,18 +32,18 @@ dependencies {
compileOnly(project(':modules:lang-painless')) {
exclude group: "org.ow2.asm"
}
compile "org.antlr:antlr4-runtime:${antlrVersion}"
api "org.antlr:antlr4-runtime:${antlrVersion}"
compileOnly project(path: xpackModule('ql'), configuration: 'default')
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')
testImplementation project(path: ':modules:transport-netty4', configuration: 'runtime') // for http in RestEqlCancellationIT
testImplementation project(path: ':plugins:transport-nio', configuration: 'runtime') // for http in RestEqlCancellationIT
testImplementation project(path: ':modules:reindex')
testImplementation project(path: ':modules:parent-join')
testImplementation project(path: ':modules:analysis-common')
testImplementation project(path: ':modules:transport-netty4') // for http in RestEqlCancellationIT
testImplementation project(path: ':plugins:transport-nio') // for http in RestEqlCancellationIT
}

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

@ -4,5 +4,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

8
x-pack/plugin/eql/qa/common/build.gradle
View File

@ -2,10 +2,10 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
compile project(path: xpackModule('core'), configuration: 'default')
compile project(path: xpackModule('core'), configuration: 'testArtifacts')
api project(':test:framework')
api project(path: xpackModule('core'), configuration: 'default')
api project(path: xpackModule('core'), configuration: 'testArtifacts')
// TOML parser for EqlActionIT tests
compile 'io.ous:jtoml:2.0.0'
api 'io.ous:jtoml:2.0.0'
}

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

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

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

@ -5,8 +5,8 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
testImplementation project(path: xpackModule('eql'), configuration: 'runtime')
testImplementation project(path: xpackModule('eql:qa:common'), configuration: 'runtime')
testImplementation project(path: xpackModule('eql'))
testImplementation project(path: xpackModule('eql:qa:common'))
}
testClusters.integTest {

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

@ -20,34 +20,34 @@ dependencies {
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"
compile "org.opensaml:opensaml-saml-api:3.4.5"
compile "org.opensaml:opensaml-saml-impl:3.4.5"
compile "org.opensaml:opensaml-messaging-api:3.4.5"
compile "org.opensaml:opensaml-messaging-impl:3.4.5"
compile "org.opensaml:opensaml-security-api:3.4.5"
compile "org.opensaml:opensaml-security-impl:3.4.5"
compile "org.opensaml:opensaml-profile-api:3.4.5"
compile "org.opensaml:opensaml-profile-impl:3.4.5"
compile "org.opensaml:opensaml-xmlsec-api:3.4.5"
compile "org.opensaml:opensaml-xmlsec-impl:3.4.5"
compile "org.opensaml:opensaml-soap-api:3.4.5"
compile "org.opensaml:opensaml-soap-impl:3.4.5"
compile "org.opensaml:opensaml-storage-api:3.4.5"
compile "org.opensaml:opensaml-storage-impl:3.4.5"
compile "net.shibboleth.utilities:java-support:7.5.1"
compile "org.apache.santuario:xmlsec:2.1.4"
compile "io.dropwizard.metrics:metrics-core:3.2.2"
compile ("org.cryptacular:cryptacular:1.2.4") {
api "org.opensaml:opensaml-core:3.4.5"
api "org.opensaml:opensaml-saml-api:3.4.5"
api "org.opensaml:opensaml-saml-impl:3.4.5"
api "org.opensaml:opensaml-messaging-api:3.4.5"
api "org.opensaml:opensaml-messaging-impl:3.4.5"
api "org.opensaml:opensaml-security-api:3.4.5"
api "org.opensaml:opensaml-security-impl:3.4.5"
api "org.opensaml:opensaml-profile-api:3.4.5"
api "org.opensaml:opensaml-profile-impl:3.4.5"
api "org.opensaml:opensaml-xmlsec-api:3.4.5"
api "org.opensaml:opensaml-xmlsec-impl:3.4.5"
api "org.opensaml:opensaml-soap-api:3.4.5"
api "org.opensaml:opensaml-soap-impl:3.4.5"
api "org.opensaml:opensaml-storage-api:3.4.5"
api "org.opensaml:opensaml-storage-impl:3.4.5"
api "net.shibboleth.utilities:java-support:7.5.1"
api "org.apache.santuario:xmlsec:2.1.4"
api "io.dropwizard.metrics:metrics-core:3.2.2"
api ("org.cryptacular:cryptacular:1.2.4") {
exclude group: 'org.bouncycastle'
}
compile "org.slf4j:slf4j-api:${versions.slf4j}"
compile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
compile "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
api "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
runtimeOnly 'com.google.guava:guava:19.0'
testImplementation 'org.elasticsearch:securemock:1.2'

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

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

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

@ -56,9 +56,9 @@ dependencies {
testImplementation project(path: xpackModule('security'), configuration: 'testArtifacts')
// ml deps
compile project(':libs:elasticsearch-grok')
compile "com.ibm.icu:icu4j:${versions.icu4j}"
compile "net.sf.supercsv:super-csv:${versions.supercsv}"
api project(':libs:elasticsearch-grok')
api "com.ibm.icu:icu4j:${versions.icu4j}"
api "net.sf.supercsv:super-csv:${versions.supercsv}"
nativeBundle("org.elasticsearch.ml:ml-cpp:${project.version}@zip") {
changing = true
}

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

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

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

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

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

@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.rest-test'
dependencies {
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'))
testImplementation project(path: xpackModule('ml'), configuration: 'testArtifacts')
testImplementation project(path: ':modules:ingest-common')
}

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

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

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

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

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

@ -15,8 +15,8 @@ dependencies {
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
// monitoring deps
compile project(':client:rest')
compile project(':client:sniffer')
api project(':client:rest')
api project(':client:sniffer')
// baz - this goes away after we separate out the actions #27759
testImplementation project(xpackModule('watcher'))

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

@ -2,5 +2,5 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
compile project(':test:framework')
api project(':test:framework')
}

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

@ -16,56 +16,56 @@ archivesBaseName = 'x-pack-security'
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
compileOnly project(path: ':plugins:transport-nio', configuration: 'runtime')
compileOnly project(path: ':modules:transport-netty4')
compileOnly project(path: ':plugins:transport-nio')
testImplementation project(path: xpackModule('monitoring'))
testImplementation project(path: xpackModule('sql:sql-action'))
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
api 'com.unboundid:unboundid-ldapsdk:4.0.8'
// the following are all SAML dependencies - might as well download the whole internet
compile "org.opensaml:opensaml-core:3.4.5"
compile "org.opensaml:opensaml-saml-api:3.4.5"
compile "org.opensaml:opensaml-saml-impl:3.4.5"
compile "org.opensaml:opensaml-messaging-api:3.4.5"
compile "org.opensaml:opensaml-messaging-impl:3.4.5"
compile "org.opensaml:opensaml-security-api:3.4.5"
compile "org.opensaml:opensaml-security-impl:3.4.5"
compile "org.opensaml:opensaml-profile-api:3.4.5"
compile "org.opensaml:opensaml-profile-impl:3.4.5"
compile "org.opensaml:opensaml-xmlsec-api:3.4.5"
compile "org.opensaml:opensaml-xmlsec-impl:3.4.5"
compile "org.opensaml:opensaml-soap-api:3.4.5"
compile "org.opensaml:opensaml-soap-impl:3.4.5"
compile "org.opensaml:opensaml-storage-api:3.4.5"
compile "org.opensaml:opensaml-storage-impl:3.4.5"
compile "net.shibboleth.utilities:java-support:7.5.1"
compile "org.apache.santuario:xmlsec:2.1.4"
compile "io.dropwizard.metrics:metrics-core:3.2.2"
compile ("org.cryptacular:cryptacular:1.2.4") {
api "org.opensaml:opensaml-core:3.4.5"
api "org.opensaml:opensaml-saml-api:3.4.5"
api "org.opensaml:opensaml-saml-impl:3.4.5"
api "org.opensaml:opensaml-messaging-api:3.4.5"
api "org.opensaml:opensaml-messaging-impl:3.4.5"
api "org.opensaml:opensaml-security-api:3.4.5"
api "org.opensaml:opensaml-security-impl:3.4.5"
api "org.opensaml:opensaml-profile-api:3.4.5"
api "org.opensaml:opensaml-profile-impl:3.4.5"
api "org.opensaml:opensaml-xmlsec-api:3.4.5"
api "org.opensaml:opensaml-xmlsec-impl:3.4.5"
api "org.opensaml:opensaml-soap-api:3.4.5"
api "org.opensaml:opensaml-soap-impl:3.4.5"
api "org.opensaml:opensaml-storage-api:3.4.5"
api "org.opensaml:opensaml-storage-impl:3.4.5"
api "net.shibboleth.utilities:java-support:7.5.1"
api "org.apache.santuario:xmlsec:2.1.4"
api "io.dropwizard.metrics:metrics-core:3.2.2"
api ("org.cryptacular:cryptacular:1.2.4") {
exclude group: 'org.bouncycastle'
}
compile "org.slf4j:slf4j-api:${versions.slf4j}"
compile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
compile "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
api "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}"
runtimeOnly 'com.google.guava:guava:19.0'
// Dependencies for oidc
compile "com.nimbusds:oauth2-oidc-sdk:7.0.2"
compile "com.nimbusds:nimbus-jose-jwt:8.6"
compile "com.nimbusds:lang-tag:1.4.4"
compile "com.sun.mail:jakarta.mail:1.6.3"
compile "net.jcip:jcip-annotations:1.0"
compile "net.minidev:json-smart:2.3"
compile "net.minidev:accessors-smart:1.2"
compile "org.ow2.asm:asm:7.3.1"
api "com.nimbusds:oauth2-oidc-sdk:7.0.2"
api "com.nimbusds:nimbus-jose-jwt:8.6"
api "com.nimbusds:lang-tag:1.4.4"
api "com.sun.mail:jakarta.mail:1.6.3"
api "net.jcip:jcip-annotations:1.0"
api "net.minidev:json-smart:2.3"
api "net.minidev:accessors-smart:1.2"
api "org.ow2.asm:asm:7.3.1"
testImplementation 'org.elasticsearch:securemock:1.2'
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"

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

@ -8,8 +8,8 @@ archivesBaseName = 'elasticsearch-security-cli'
dependencies {
compileOnly project(":server")
compileOnly project(path: xpackModule('core'), configuration: 'default')
compile "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
compile "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
api "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
testImplementation('com.google.jimfs:jimfs:1.1') {
// this is provided by the runtime classpath, from the security project
exclude group: 'com.google.guava', module: 'guava'

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

@ -12,7 +12,7 @@ esplugin {
dependencies {
compileOnly project(path: xpackModule('core'), configuration: 'default')
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
compile project(path: ':modules:geo', configuration: 'default')
api project(path: ':modules:geo', configuration: 'default')
restTestConfig project(path: ':modules:geo', configuration: 'restTests')
}

12
x-pack/plugin/sql/build.gradle
View File

@ -36,17 +36,17 @@ dependencies {
// exclude ASM to not affect featureAware task on Java 10+
exclude group: "org.ow2.asm"
}
compile project('sql-action')
compile project(':modules:aggs-matrix-stats')
compile "org.antlr:antlr4-runtime:${antlrVersion}"
api project('sql-action')
api project(':modules:aggs-matrix-stats')
api "org.antlr:antlr4-runtime:${antlrVersion}"
compileOnly project(path: xpackModule('ql'), configuration: 'default')
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')
testImplementation project(path: ':modules:reindex')
testImplementation project(path: ':modules:parent-join')
testImplementation project(path: ':modules:analysis-common')
bin(project(path: xpackModule('sql:sql-cli'), configuration: 'shadow'))
}

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