Build: Remove transitive dependencies

In elastic/elasticsearchelastic/elasticsearch#14668, transitive dependencies were removed
from elasticsearch, and plugins now no longer get transitive deps
either. This commit fixes xplugins to remove transitive deps.

Original commit: elastic/x-pack-elasticsearch@5c41657b6e
This commit is contained in:
Ryan Ernst 2015-11-11 09:18:24 -08:00
parent 838cb54b9e
commit 26c8e949a4
4 changed files with 32 additions and 10 deletions

View File

@ -1,3 +1,5 @@
apply plugin: 'elasticsearch.project-attachment'
allprojects {
apply plugin: 'idea'
apply plugin: 'eclipse'

View File

@ -12,12 +12,22 @@ configurations {
licensePluginZip
}
ext.versions = [
okhttp: '2.3.0'
]
dependencies {
licensePluginZip project(path: "${projectsPrefix}:license:plugin") // zip
provided project(path: "${projectsPrefix}:license:plugin", configuration: 'runtime')
provided project(path: "${projectsPrefix}:shield", configuration: 'runtime')
testCompile 'org.elasticsearch:securemock:1.1'
testCompile 'com.squareup.okhttp:mockwebserver:2.3.0'
// mock web server
testCompile "com.squareup.okhttp:mockwebserver:${versions.okhttp}"
testCompile "com.squareup.okhttp:okhttp:${versions.okhttp}"
testCompile "com.squareup.okhttp:okhttp-ws:${versions.okhttp}"
testCompile 'com.squareup.okio:okio:1.3.0'
testCompile 'org.bouncycastle:bcprov-jdk15on:1.50'
}
compileJava.options.compilerArgs << '-Xlint:-rawtypes,-unchecked'
@ -41,7 +51,7 @@ processTestResources {
integTest {
dependsOn configurations.licensePluginZip
cluster {
plugin 'installLicensePlugin', configurations.licensePluginZip
plugin 'license', configurations.licensePluginZip
}
}

View File

@ -1,5 +1,6 @@
apply plugin: 'elasticsearch.esplugin'
esplugin {
name 'shield'
description 'Elasticsearch Shield (security)'
classname 'org.elasticsearch.shield.ShieldPlugin'
isolated false
@ -15,7 +16,6 @@ dependencies {
compile project("${projectsPrefix}:license:plugin-api")
compile 'dk.brics.automaton:automaton:1.11-8'
compile 'com.unboundid:unboundid-ldapsdk:2.3.8'
testCompile "org.elasticsearch:test-framework:${version}"
testCompile 'org.slf4j:slf4j-log4j12:1.6.2'
testCompile 'org.elasticsearch:securemock:1.1'
testCompile 'com.google.jimfs:jimfs:1.0'

View File

@ -2,6 +2,7 @@ import org.elasticsearch.gradle.MavenFilteringHack
apply plugin: 'elasticsearch.esplugin'
esplugin {
name 'watcher'
description 'Elasticsearch Watcher'
classname 'org.elasticsearch.watcher.WatcherPlugin'
isolated false
@ -11,23 +12,32 @@ configurations {
licensePluginZip
}
ext.versions = [
okhttp: '2.3.0'
]
dependencies {
licensePluginZip project(path: "${projectsPrefix}:license:plugin") // zip
provided project(path: "${projectsPrefix}:license:plugin", configuration: 'runtime')
provided project(path: "${projectsPrefix}:shield", configuration: 'runtime')
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
compile 'com.google.guava:guava:19.0-rc2'
compile 'com.google.code.findbugs:jsr305:3.0.1'
compile 'com.sun.mail:javax.mail:1.5.3'
compile 'javax.activation:activation:1.1.1'
// this should be "provided"...
provided 'com.github.spullara.mustache.java:compiler:0.9.1'
testCompile "org.elasticsearch:test-framework:${version}"
testCompile('org.subethamail:subethasmtp:3.1.7') {
exclude group: 'javax.mail', module: 'mail'
}
testCompile 'com.squareup.okhttp:mockwebserver:2.3.0'
testCompile 'org.subethamail:subethasmtp:3.1.7'
// mock web server
testCompile "com.squareup.okhttp:mockwebserver:${versions.okhttp}"
testCompile "com.squareup.okhttp:okhttp:${versions.okhttp}"
testCompile "com.squareup.okhttp:okhttp-ws:${versions.okhttp}"
testCompile 'com.squareup.okio:okio:1.3.0'
testCompile 'org.bouncycastle:bcprov-jdk15on:1.50'
testCompile 'org.slf4j:slf4j-log4j12:1.6.2'
testCompile 'org.slf4j:slf4j-api:1.6.2'
testCompile 'org.elasticsearch:securemock:1.1'
}