diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d394bb908d364..2fc02e6cd8eda 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -180,7 +180,7 @@ If your changes affect only the documentation, run:
```sh
./gradlew -p docs check
```
-For more information about testing code examples in the documentation, see
+For more information about testing code examples in the documentation, see
https://github.com/elastic/elasticsearch/blob/master/docs/README.asciidoc
### Project layout
@@ -271,6 +271,39 @@ the `qa` subdirectory functions just like the top level `qa` subdirectory. The
Elasticsearch process. The `transport-client` subdirectory contains extensions
to Elasticsearch's standard transport client to work properly with x-pack.
+### Gradle Build
+
+We use Gradle to build Elasticsearch because it is flexible enough to not only
+build and package Elasticsearch, but also orchestrate all of the ways that we
+have to test Elasticsearch.
+
+#### Configurations
+
+Gradle organizes dependencies and build artifacts into "configurations" and
+allows you to use these configurations arbitrarilly. Here are some of the most
+common configurations in our build and how we use them:
+
+
+- `compile`
- Code that is on the classpath at both compile and
+runtime. If the [`shadow`][shadow-plugin] plugin is applied to the project then
+this code is bundled into the jar produced by the project.
+- `runtime`
- Code that is not on the classpath at compile time but is
+on the classpath at runtime. We mostly use this configuration to make sure that
+we do not accidentally compile against dependencies of our dependencies also
+known as "transitive" dependencies".
+- `compileOnly`
- Code that is on the classpath at comile time but that
+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.
+- `shadow`
- Only available in projects with the shadow plugin. Code
+that is on the classpath at both compile and runtime but it *not* bundled into
+the jar produced by the project. If you depend on a project with the `shadow`
+plugin then you need to depend on this configuration because it will bring
+along all of the dependencies you need at runtime.
+- `testCompile`
- 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`.
+
Contributing as part of a class
-------------------------------
@@ -300,3 +333,5 @@ especially when they are unlikely to become long time contributors.
Finally, we require that you run `./gradlew check` before submitting a
non-documentation contribution. This is mentioned above, but it is worth
repeating in this section because it has come up in this context.
+
+[shadow-plugin]: https://github.com/johnrengelman/shadow
diff --git a/build.gradle b/build.gradle
index 6516f49591e47..5c4e486cc1dd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -510,6 +510,31 @@ allprojects {
tasks.eclipse.dependsOn(cleanEclipse, copyEclipseSettings)
}
+allprojects {
+ /*
+ * IntelliJ and Eclipse don't know about the shadow plugin so when we're
+ * in "IntelliJ mode" or "Eclipse mode" add "runtime" dependencies
+ * eveywhere where we see a "shadow" dependency which will cause them to
+ * reference shadowed projects directly rather than rely on the shadowing
+ * to include them. This is the correct thing for it to do because it
+ * doesn't run the jar shadowing at all. This isn't needed for the project
+ * itself because the IDE configuration is done by SourceSets but it is
+ * *is* needed for projects that depends on the project doing the shadowing.
+ * Without this they won't properly depend on the shadowed project.
+ */
+ if (isEclipse || isIdea) {
+ configurations.all { Configuration configuration ->
+ dependencies.all { Dependency dep ->
+ if (dep instanceof ProjectDependency) {
+ if (dep.getTargetConfiguration() == 'shadow') {
+ configuration.dependencies.add(project.dependencies.project(path: dep.dependencyProject.path, configuration: 'runtime'))
+ }
+ }
+ }
+ }
+ }
+}
+
// we need to add the same --debug-jvm option as
// the real RunTask has, so we can pass it through
class Run extends DefaultTask {
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
index 2c7641d596baa..975ff25239bba 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -391,6 +391,9 @@ class BuildPlugin implements Plugin {
project.configurations.compile.dependencies.all(disableTransitiveDeps)
project.configurations.testCompile.dependencies.all(disableTransitiveDeps)
project.configurations.compileOnly.dependencies.all(disableTransitiveDeps)
+ project.plugins.withType(ShadowPlugin).whenPluginAdded {
+ project.configurations.shadow.dependencies.all(disableTransitiveDeps)
+ }
}
/** Adds repositories used by ES dependencies */
@@ -883,11 +886,20 @@ class BuildPlugin implements Plugin {
project.dependencyLicenses.dependencies = project.configurations.runtime.fileCollection {
it.group.startsWith('org.elasticsearch') == false
} - project.configurations.compileOnly
+ project.plugins.withType(ShadowPlugin).whenPluginAdded {
+ project.dependencyLicenses.dependencies += project.configurations.shadow.fileCollection {
+ it.group.startsWith('org.elasticsearch') == false
+ }
+ }
}
private static configureDependenciesInfo(Project project) {
Task deps = project.tasks.create("dependenciesInfo", DependenciesInfoTask.class)
deps.runtimeConfiguration = project.configurations.runtime
+ project.plugins.withType(ShadowPlugin).whenPluginAdded {
+ deps.runtimeConfiguration = project.configurations.create('infoDeps')
+ deps.runtimeConfiguration.extendsFrom(project.configurations.runtime, project.configurations.shadow)
+ }
deps.compileOnlyConfiguration = project.configurations.compileOnly
project.afterEvaluate {
deps.mappings = project.dependencyLicenses.mappings
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
index efe8662cf7414..9c1f7a15754b0 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -48,18 +48,6 @@ public class PluginBuildPlugin extends BuildPlugin {
@Override
public void apply(Project project) {
super.apply(project)
- project.plugins.withType(ShadowPlugin).whenPluginAdded {
- /*
- * We've not tested these plugins together and we're fairly sure
- * they aren't going to work properly as is *and* we're not really
- * sure *why* you'd want to shade stuff in plugins. So we throw an
- * exception here to make you come and read this comment. If you
- * have a need for shadow while building plugins then know that you
- * are probably going to have to fight with gradle for a while....
- */
- throw new InvalidUserDataException('elasticsearch.esplugin is not '
- + 'compatible with com.github.johnrengelman.shadow');
- }
configureDependencies(project)
// this afterEvaluate must happen before the afterEvaluate added by integTest creation,
// so that the file name resolution for installing the plugin will be setup
@@ -151,8 +139,13 @@ public class PluginBuildPlugin extends BuildPlugin {
include(buildProperties.descriptorOutput.name)
}
from pluginMetadata // metadata (eg custom security policy)
- from project.jar // this plugin's jar
- from project.configurations.runtime - project.configurations.compileOnly // the dep jars
+ /*
+ * If the plugin is using the shadow plugin then we need to bundle
+ * "shadow" things rather than the default jar and dependencies so
+ * we don't hit jar hell.
+ */
+ from { project.plugins.hasPlugin(ShadowPlugin) ? project.shadowJar : project.jar }
+ from { project.plugins.hasPlugin(ShadowPlugin) ? project.configurations.shadow : project.configurations.runtime - project.configurations.compileOnly }
// extra files for the plugin to go into the zip
from('src/main/packaging') // TODO: move all config/bin/_size/etc into packaging
from('src/main') {
diff --git a/x-pack/docs/build.gradle b/x-pack/docs/build.gradle
index ffb3b42f45b9e..8500162c260d7 100644
--- a/x-pack/docs/build.gradle
+++ b/x-pack/docs/build.gradle
@@ -30,7 +30,7 @@ buildRestTests.expectedUnconvertedCandidates = [
]
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
}
@@ -265,7 +265,7 @@ setups['farequote_index'] = '''
airline:
type: keyword
doc_count:
- type: integer
+ type: integer
'''
setups['farequote_data'] = setups['farequote_index'] + '''
- do:
@@ -278,7 +278,7 @@ setups['farequote_data'] = setups['farequote_index'] + '''
{"airline":"JZA","responsetime":990.4628,"time":"2016-02-07T00:00:00+0000", "doc_count": 5}
{"index": {"_id":"2"}}
{"airline":"JBU","responsetime":877.5927,"time":"2016-02-07T00:00:00+0000", "doc_count": 23}
- {"index": {"_id":"3"}}
+ {"index": {"_id":"3"}}
{"airline":"KLM","responsetime":1355.4812,"time":"2016-02-07T00:00:00+0000", "doc_count": 42}
'''
setups['farequote_job'] = setups['farequote_data'] + '''
@@ -310,7 +310,7 @@ setups['farequote_datafeed'] = setups['farequote_job'] + '''
"job_id":"farequote",
"indexes":"farequote"
}
-'''
+'''
setups['server_metrics_index'] = '''
- do:
indices.create:
diff --git a/x-pack/license-tools/build.gradle b/x-pack/license-tools/build.gradle
index 3ef08073bbf84..183b9ab50e03b 100644
--- a/x-pack/license-tools/build.gradle
+++ b/x-pack/license-tools/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'elasticsearch.build'
dependencies {
- compile project(xpackModule('core'))
+ compile project(path: xpackModule('core'), configuration: 'shadow')
compile "org.elasticsearch:elasticsearch:${version}"
testCompile "org.elasticsearch.test:framework:${version}"
}
@@ -17,7 +17,7 @@ task buildZip(type: Zip, dependsOn: jar) {
into(parentDir + '/lib') {
from jar
from configurations.runtime
- }
+ }
into(parentDir + '/bin') {
from 'bin'
}
diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
index ca926fa0d54cc..28f55408f7b1f 100644
--- a/x-pack/plugin/core/build.gradle
+++ b/x-pack/plugin/core/build.gradle
@@ -8,6 +8,7 @@ import java.nio.file.StandardCopyOption
apply plugin: 'elasticsearch.esplugin'
apply plugin: 'nebula.maven-base-publish'
apply plugin: 'nebula.maven-scm'
+apply plugin: 'com.github.johnrengelman.shadow'
archivesBaseName = 'x-pack-core'
@@ -28,19 +29,19 @@ dependencyLicenses {
dependencies {
compileOnly "org.elasticsearch:elasticsearch:${version}"
compile project(':x-pack:protocol')
- 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}"
+ shadow "org.apache.httpcomponents:httpclient:${versions.httpclient}"
+ shadow "org.apache.httpcomponents:httpcore:${versions.httpcore}"
+ shadow "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
+ shadow "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
- compile "commons-logging:commons-logging:${versions.commonslogging}"
- compile "commons-codec:commons-codec:${versions.commonscodec}"
+ shadow "commons-logging:commons-logging:${versions.commonslogging}"
+ shadow "commons-codec:commons-codec:${versions.commonscodec}"
// security deps
- compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
- compile 'org.bouncycastle:bcprov-jdk15on:1.59'
- compile 'org.bouncycastle:bcpkix-jdk15on:1.59'
- compile project(path: ':modules:transport-netty4', configuration: 'runtime')
+ shadow 'com.unboundid:unboundid-ldapsdk:3.2.0'
+ shadow 'org.bouncycastle:bcprov-jdk15on:1.59'
+ shadow 'org.bouncycastle:bcpkix-jdk15on:1.59'
+ shadow project(path: ':modules:transport-netty4', configuration: 'runtime')
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
@@ -110,7 +111,8 @@ test {
// TODO: don't publish test artifacts just to run messy tests, fix the tests!
// https://github.com/elastic/x-plugins/issues/724
configurations {
- testArtifacts.extendsFrom testRuntime
+ testArtifacts.extendsFrom(testRuntime, shadow)
+ testArtifacts.exclude(group: project(':x-pack:protocol').group, module: project(':x-pack:protocol').name)
}
task testJar(type: Jar) {
appendix 'test'
diff --git a/x-pack/plugin/deprecation/build.gradle b/x-pack/plugin/deprecation/build.gradle
index 51490be2df818..87bcc703af610 100644
--- a/x-pack/plugin/deprecation/build.gradle
+++ b/x-pack/plugin/deprecation/build.gradle
@@ -12,7 +12,7 @@ archivesBaseName = 'x-pack-deprecation'
compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
}
run {
diff --git a/x-pack/plugin/graph/build.gradle b/x-pack/plugin/graph/build.gradle
index 3ddd2ebee04a2..2b0f592b72040 100644
--- a/x-pack/plugin/graph/build.gradle
+++ b/x-pack/plugin/graph/build.gradle
@@ -10,7 +10,7 @@ esplugin {
archivesBaseName = 'x-pack-graph'
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
diff --git a/x-pack/plugin/logstash/build.gradle b/x-pack/plugin/logstash/build.gradle
index 5a9b5d6cbe5ea..2e158a90ac7ab 100644
--- a/x-pack/plugin/logstash/build.gradle
+++ b/x-pack/plugin/logstash/build.gradle
@@ -10,7 +10,7 @@ esplugin {
archivesBaseName = 'x-pack-logstash'
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle
index 4c3cc9eef9313..a673016133724 100644
--- a/x-pack/plugin/ml/build.gradle
+++ b/x-pack/plugin/ml/build.gradle
@@ -40,7 +40,7 @@ compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,
compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
// This should not be here
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
diff --git a/x-pack/plugin/monitoring/build.gradle b/x-pack/plugin/monitoring/build.gradle
index 3fde6cd8c3775..a452ef09a20ff 100644
--- a/x-pack/plugin/monitoring/build.gradle
+++ b/x-pack/plugin/monitoring/build.gradle
@@ -13,7 +13,7 @@ esplugin {
archivesBaseName = 'x-pack-monitoring'
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
// monitoring deps
@@ -66,7 +66,7 @@ task internalClusterTest(type: RandomizedTestingTask,
include '**/*IT.class'
systemProperty 'es.set.netty.runtime.available.processors', 'false'
}
-check.dependsOn internalClusterTest
+check.dependsOn internalClusterTest
internalClusterTest.mustRunAfter test
// also add an "alias" task to make typing on the command line easier task icTest {
diff --git a/x-pack/plugin/rollup/build.gradle b/x-pack/plugin/rollup/build.gradle
index ff9c30ed9a934..649a89bc2cdee 100644
--- a/x-pack/plugin/rollup/build.gradle
+++ b/x-pack/plugin/rollup/build.gradle
@@ -16,7 +16,7 @@ compileTestJava.options.compilerArgs << "-Xlint:-rawtypes"
dependencies {
compileOnly "org.elasticsearch:elasticsearch:${version}"
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
index 7f67f98b177d3..fdc4d9f1c789b 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -12,7 +12,7 @@ esplugin {
archivesBaseName = 'x-pack-security'
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
testCompile project(path: xpackModule('monitoring'))
diff --git a/x-pack/plugin/sql/build.gradle b/x-pack/plugin/sql/build.gradle
index 436837e85b4f0..039e78c14952c 100644
--- a/x-pack/plugin/sql/build.gradle
+++ b/x-pack/plugin/sql/build.gradle
@@ -19,7 +19,7 @@ archivesBaseName = 'x-pack-sql'
integTest.enabled = false
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
compileOnly(project(':modules:lang-painless')) {
// exclude ASM to not affect featureAware task on Java 10+
exclude group: "org.ow2.asm"
diff --git a/x-pack/plugin/upgrade/build.gradle b/x-pack/plugin/upgrade/build.gradle
index 19e265ed645ed..2bbfc2ada3a43 100644
--- a/x-pack/plugin/upgrade/build.gradle
+++ b/x-pack/plugin/upgrade/build.gradle
@@ -14,7 +14,7 @@ esplugin {
archivesBaseName = 'x-pack-upgrade'
dependencies {
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
}
@@ -40,7 +40,7 @@ task internalClusterTest(type: RandomizedTestingTask,
include '**/*IT.class'
systemProperty 'es.set.netty.runtime.available.processors', 'false'
}
-check.dependsOn internalClusterTest
+check.dependsOn internalClusterTest
internalClusterTest.mustRunAfter test
// also add an "alias" task to make typing on the command line easier
diff --git a/x-pack/plugin/watcher/build.gradle b/x-pack/plugin/watcher/build.gradle
index a989117ca3ef7..ed356b85e79a6 100644
--- a/x-pack/plugin/watcher/build.gradle
+++ b/x-pack/plugin/watcher/build.gradle
@@ -25,7 +25,7 @@ dependencyLicenses {
dependencies {
compileOnly "org.elasticsearch:elasticsearch:${version}"
- compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle
index 7887a6462eb33..b639cc443c8b3 100644
--- a/x-pack/qa/full-cluster-restart/build.gradle
+++ b/x-pack/qa/full-cluster-restart/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile (project(path: xpackModule('security'), configuration: 'runtime')) {
// Need to drop the guava dependency here or we get a conflict with watcher's guava dependency.
// This is total #$%, but the solution is to get the SAML realm (which uses guava) out of security proper
@@ -261,7 +261,7 @@ subprojects {
check.dependsOn(integTest)
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
diff --git a/x-pack/qa/ml-basic-multi-node/build.gradle b/x-pack/qa/ml-basic-multi-node/build.gradle
index d396d38b22354..3df77aadccbd5 100644
--- a/x-pack/qa/ml-basic-multi-node/build.gradle
+++ b/x-pack/qa/ml-basic-multi-node/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
}
diff --git a/x-pack/qa/ml-disabled/build.gradle b/x-pack/qa/ml-disabled/build.gradle
index 22a7dfc74ac73..e914def3507cd 100644
--- a/x-pack/qa/ml-disabled/build.gradle
+++ b/x-pack/qa/ml-disabled/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
}
diff --git a/x-pack/qa/ml-native-multi-node-tests/build.gradle b/x-pack/qa/ml-native-multi-node-tests/build.gradle
index b8627db3068fd..b1893b20c465b 100644
--- a/x-pack/qa/ml-native-multi-node-tests/build.gradle
+++ b/x-pack/qa/ml-native-multi-node-tests/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
testCompile project(path: xpackModule('ml'), configuration: 'testArtifacts')
diff --git a/x-pack/qa/ml-no-bootstrap-tests/build.gradle b/x-pack/qa/ml-no-bootstrap-tests/build.gradle
index cad5201a67b6a..7e252afa3022e 100644
--- a/x-pack/qa/ml-no-bootstrap-tests/build.gradle
+++ b/x-pack/qa/ml-no-bootstrap-tests/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'elasticsearch.standalone-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
}
-
diff --git a/x-pack/qa/ml-single-node-tests/build.gradle b/x-pack/qa/ml-single-node-tests/build.gradle
index 9fd4a8d44d23f..b62e37894b3c3 100644
--- a/x-pack/qa/ml-single-node-tests/build.gradle
+++ b/x-pack/qa/ml-single-node-tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('ml'), configuration: 'runtime')
}
diff --git a/x-pack/qa/multi-cluster-search-security/build.gradle b/x-pack/qa/multi-cluster-search-security/build.gradle
index f5265466965c1..5d90f974762bc 100644
--- a/x-pack/qa/multi-cluster-search-security/build.gradle
+++ b/x-pack/qa/multi-cluster-search-security/build.gradle
@@ -3,7 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
apply plugin: 'elasticsearch.standalone-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
diff --git a/x-pack/qa/multi-node/build.gradle b/x-pack/qa/multi-node/build.gradle
index 69c7a696ff0be..19729cf367ef5 100644
--- a/x-pack/qa/multi-node/build.gradle
+++ b/x-pack/qa/multi-node/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
integTestCluster {
diff --git a/x-pack/qa/openldap-tests/build.gradle b/x-pack/qa/openldap-tests/build.gradle
index 5c0399a1d9fa2..24cd6184afa63 100644
--- a/x-pack/qa/openldap-tests/build.gradle
+++ b/x-pack/qa/openldap-tests/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-test'
apply plugin: 'elasticsearch.vagrantsupport'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
@@ -32,4 +32,3 @@ namingConventions {
// integ tests use Tests instead of IT
skipIntegTestInDisguise = true
}
-
diff --git a/x-pack/qa/reindex-tests-with-security/build.gradle b/x-pack/qa/reindex-tests-with-security/build.gradle
index ddf72f7d45833..097d343b27984 100644
--- a/x-pack/qa/reindex-tests-with-security/build.gradle
+++ b/x-pack/qa/reindex-tests-with-security/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: ':modules:reindex')
diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
index f38dee88dbbc8..e4b5003a524b3 100644
--- a/x-pack/qa/rolling-upgrade/build.gradle
+++ b/x-pack/qa/rolling-upgrade/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'elasticsearch.build'
test.enabled = false
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
testCompile(project(path: xpackModule('security'), configuration: 'runtime')) {
exclude group: "com.google.guava", module: "guava"
@@ -306,7 +306,7 @@ subprojects {
check.dependsOn(integTest)
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('watcher'))
}
diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle
index ebb0d88991ff6..752ec6fb3071b 100644
--- a/x-pack/qa/saml-idp-tests/build.gradle
+++ b/x-pack/qa/saml-idp-tests/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile 'com.google.jimfs:jimfs:1.1'
@@ -84,4 +84,3 @@ thirdPartyAudit.excludes = [
// missing
'com.ibm.icu.lang.UCharacter'
]
-
diff --git a/x-pack/qa/security-client-tests/build.gradle b/x-pack/qa/security-client-tests/build.gradle
index 4e517f4d3633e..97945fb00efcd 100644
--- a/x-pack/qa/security-client-tests/build.gradle
+++ b/x-pack/qa/security-client-tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
}
diff --git a/x-pack/qa/security-example-spi-extension/build.gradle b/x-pack/qa/security-example-spi-extension/build.gradle
index b2fac075cb315..7aeed3ad62de6 100644
--- a/x-pack/qa/security-example-spi-extension/build.gradle
+++ b/x-pack/qa/security-example-spi-extension/build.gradle
@@ -8,7 +8,7 @@ esplugin {
}
dependencies {
- compileOnly project(path: xpackModule('core'), configuration: 'runtime')
+ compileOnly project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
}
diff --git a/x-pack/qa/security-migrate-tests/build.gradle b/x-pack/qa/security-migrate-tests/build.gradle
index 7ccf6d2349b8b..3a8a0cf100554 100644
--- a/x-pack/qa/security-migrate-tests/build.gradle
+++ b/x-pack/qa/security-migrate-tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('security'), configuration: 'runtime')
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
}
diff --git a/x-pack/qa/security-setup-password-tests/build.gradle b/x-pack/qa/security-setup-password-tests/build.gradle
index 16accc87a9476..adb159acf6f6b 100644
--- a/x-pack/qa/security-setup-password-tests/build.gradle
+++ b/x-pack/qa/security-setup-password-tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('security'), configuration: 'runtime')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}
diff --git a/x-pack/qa/smoke-test-graph-with-security/build.gradle b/x-pack/qa/smoke-test-graph-with-security/build.gradle
index d3f788d0b06e4..9cdfaffccfbce 100644
--- a/x-pack/qa/smoke-test-graph-with-security/build.gradle
+++ b/x-pack/qa/smoke-test-graph-with-security/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
// bring in graph rest test suite
diff --git a/x-pack/qa/smoke-test-ml-with-security/build.gradle b/x-pack/qa/smoke-test-ml-with-security/build.gradle
index 2a12aa2f28d3f..84c23add25411 100644
--- a/x-pack/qa/smoke-test-ml-with-security/build.gradle
+++ b/x-pack/qa/smoke-test-ml-with-security/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
}
diff --git a/x-pack/qa/smoke-test-monitoring-with-watcher/build.gradle b/x-pack/qa/smoke-test-monitoring-with-watcher/build.gradle
index 4e079430562a7..8ce0cde76575a 100644
--- a/x-pack/qa/smoke-test-monitoring-with-watcher/build.gradle
+++ b/x-pack/qa/smoke-test-monitoring-with-watcher/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'))
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'))
testCompile project(path: xpackModule('monitoring'))
}
@@ -24,4 +24,3 @@ integTestCluster {
// one of the exporters should configure cluster alerts
// setting 'xpack.monitoring.exporters.my_http.cluster_alerts.management.enabled', 'true'
}
-
diff --git a/x-pack/qa/smoke-test-plugins-ssl/build.gradle b/x-pack/qa/smoke-test-plugins-ssl/build.gradle
index 672bc3a19e834..53533bd9b87f3 100644
--- a/x-pack/qa/smoke-test-plugins-ssl/build.gradle
+++ b/x-pack/qa/smoke-test-plugins-ssl/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
String outputDir = "${buildDir}/generated-resources/${project.name}"
diff --git a/x-pack/qa/smoke-test-plugins/build.gradle b/x-pack/qa/smoke-test-plugins/build.gradle
index 4badc9d3509c8..b66903af18bfb 100644
--- a/x-pack/qa/smoke-test-plugins/build.gradle
+++ b/x-pack/qa/smoke-test-plugins/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
ext.pluginsCount = 0
diff --git a/x-pack/qa/smoke-test-security-with-mustache/build.gradle b/x-pack/qa/smoke-test-security-with-mustache/build.gradle
index 1c43db0b63e34..d921c5f5b6605 100644
--- a/x-pack/qa/smoke-test-security-with-mustache/build.gradle
+++ b/x-pack/qa/smoke-test-security-with-mustache/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
}
diff --git a/x-pack/qa/smoke-test-watcher-with-security/build.gradle b/x-pack/qa/smoke-test-watcher-with-security/build.gradle
index 0f052074bfbf6..a843641be801f 100644
--- a/x-pack/qa/smoke-test-watcher-with-security/build.gradle
+++ b/x-pack/qa/smoke-test-watcher-with-security/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
// bring in watcher rest test suite
diff --git a/x-pack/qa/smoke-test-watcher/build.gradle b/x-pack/qa/smoke-test-watcher/build.gradle
index abfd27e729b6d..dc87248df617f 100644
--- a/x-pack/qa/smoke-test-watcher/build.gradle
+++ b/x-pack/qa/smoke-test-watcher/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
testCompile project(path: ':modules:lang-painless', configuration: 'runtime')
diff --git a/x-pack/qa/sql/security/build.gradle b/x-pack/qa/sql/security/build.gradle
index 5c3169d9d20dc..be7a24140689f 100644
--- a/x-pack/qa/sql/security/build.gradle
+++ b/x-pack/qa/sql/security/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
Project mainProject = project
@@ -18,7 +18,7 @@ subprojects {
}
dependencies {
- testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
}
integTestCluster {
diff --git a/x-pack/qa/third-party/hipchat/build.gradle b/x-pack/qa/third-party/hipchat/build.gradle
index cd37d6e738e64..03b6c31969844 100644
--- a/x-pack/qa/third-party/hipchat/build.gradle
+++ b/x-pack/qa/third-party/hipchat/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
}
diff --git a/x-pack/qa/third-party/jira/build.gradle b/x-pack/qa/third-party/jira/build.gradle
index 078fed4dd36e2..3814c8e9a5382 100644
--- a/x-pack/qa/third-party/jira/build.gradle
+++ b/x-pack/qa/third-party/jira/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
}
diff --git a/x-pack/qa/third-party/pagerduty/build.gradle b/x-pack/qa/third-party/pagerduty/build.gradle
index 683e18caa1c7e..c0f337e160e0a 100644
--- a/x-pack/qa/third-party/pagerduty/build.gradle
+++ b/x-pack/qa/third-party/pagerduty/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
}
diff --git a/x-pack/qa/third-party/slack/build.gradle b/x-pack/qa/third-party/slack/build.gradle
index abcdad0e096e1..431752765f3a0 100644
--- a/x-pack/qa/third-party/slack/build.gradle
+++ b/x-pack/qa/third-party/slack/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
}
diff --git a/x-pack/qa/transport-client-tests/build.gradle b/x-pack/qa/transport-client-tests/build.gradle
index c864a9084cba8..a94ad8fd59267 100644
--- a/x-pack/qa/transport-client-tests/build.gradle
+++ b/x-pack/qa/transport-client-tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
dependencies {
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
}
diff --git a/x-pack/qa/tribe-tests-with-security/build.gradle b/x-pack/qa/tribe-tests-with-security/build.gradle
index 2344ff7ed1fcf..4e5d9af606074 100644
--- a/x-pack/qa/tribe-tests-with-security/build.gradle
+++ b/x-pack/qa/tribe-tests-with-security/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'elasticsearch.rest-test'
dependencies {
testCompile project(path: ':modules:tribe', configuration: 'runtime')
- testCompile project(path: xpackModule('core'), configuration: 'runtime')
+ testCompile project(path: xpackModule('core'), configuration: 'shadow')
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
testCompile project(path: ':modules:analysis-common', configuration: 'runtime')
diff --git a/x-pack/test/feature-aware/build.gradle b/x-pack/test/feature-aware/build.gradle
index 11b0e67183c8f..f6a1f6cb16f2a 100644
--- a/x-pack/test/feature-aware/build.gradle
+++ b/x-pack/test/feature-aware/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'elasticsearch.build'
dependencies {
compile 'org.ow2.asm:asm:6.2'
compile "org.elasticsearch:elasticsearch:${version}"
- compile "org.elasticsearch.plugin:x-pack-core:${version}"
+ compile project(path: xpackModule('core'), configuration: 'shadow')
testCompile "org.elasticsearch.test:framework:${version}"
}
diff --git a/x-pack/transport-client/build.gradle b/x-pack/transport-client/build.gradle
index 31c05569274de..7155dad5ee60d 100644
--- a/x-pack/transport-client/build.gradle
+++ b/x-pack/transport-client/build.gradle
@@ -9,8 +9,8 @@ archivesBaseName = 'x-pack-transport'
dependencies {
// this "api" dependency looks weird, but it is correct, as it contains
- // all of x-pack for now, and transport client will be going away in the future.
- compile "org.elasticsearch.plugin:x-pack-core:${version}"
+ // all of x-pack for now, and transport client will be going away in the future.
+ compile project(path: xpackModule('core'), configuration: 'shadow')
compile "org.elasticsearch.client:transport:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}"