Build: Fix jdbc jar to include deps (#35602)

This commit adds back bundling of all deps of the sql jdbc jar. This was
lost in a refactoring of how the shadow plugin is handled for the entire
elasticsearch project.
This commit is contained in:
Ryan Ernst 2018-11-26 16:18:35 -08:00 committed by GitHub
parent 119835decd
commit 10447dd962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions

View File

@ -36,12 +36,18 @@ dependencyLicenses {
ignoreSha 'elasticsearch' ignoreSha 'elasticsearch'
} }
shadowJar { test {
relocate 'com.fasterxml', 'org.elasticsearch.fasterxml' // don't use the shaded jar for tests
classpath += project.tasks.compileJava.outputs.files
classpath -= project.tasks.shadowJar.outputs.files
} }
// We don't need normal jar, we use shadow jar instead shadowJar {
jar.enabled = false relocate 'com.fasterxml', 'org.elasticsearch.fasterxml'
// set the shaded configuration back to runtime instead of bundle because
// we need tests to use the non-shaded deps to allow editing/testing in intellij
configurations = [project.configurations.runtime]
}
// We need a no-depenencies jar though for qa testing so it doesn't conflict with cli // We need a no-depenencies jar though for qa testing so it doesn't conflict with cli
configurations { configurations {
@ -55,7 +61,6 @@ task nodepsJar(type: Jar) {
artifacts { artifacts {
nodeps nodepsJar nodeps nodepsJar
archives shadowJar
} }
publishing { publishing {