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:
parent
119835decd
commit
10447dd962
|
@ -36,12 +36,18 @@ dependencyLicenses {
|
|||
ignoreSha 'elasticsearch'
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
relocate 'com.fasterxml', 'org.elasticsearch.fasterxml'
|
||||
test {
|
||||
// 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
|
||||
jar.enabled = false
|
||||
shadowJar {
|
||||
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
|
||||
configurations {
|
||||
|
@ -55,7 +61,6 @@ task nodepsJar(type: Jar) {
|
|||
|
||||
artifacts {
|
||||
nodeps nodepsJar
|
||||
archives shadowJar
|
||||
}
|
||||
|
||||
publishing {
|
||||
|
|
Loading…
Reference in New Issue