Skip to content

Commit

Permalink
Fixes Eclipse build for sql jdbc project (#30114)
Browse files Browse the repository at this point in the history
The bundled configuration isn't recognised by eclipse so these
dependencies are missed when it imports the `x-pack:plugin:sql:jdbc`
project. This change makes these dependencies compile dependencies if
the build is running for Eclipse.
  • Loading branch information
colings86 committed Apr 26, 2018
1 parent 0b9071c commit a1d2ab9
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions x-pack/plugin/sql/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,23 @@ jar {
}

dependencies {
bundled (xpackProject('plugin:sql:sql-shared-client')) {
transitive = false
}
bundled (xpackProject('plugin:sql:sql-proto')) {
transitive = false

// Eclipse doesn't know how to deal with these bundled deependencies so make them compile
// dependencies if we are running in Eclipse
if (isEclipse) {
compile (xpackProject('plugin:sql:sql-shared-client')) {
transitive = false
}
compile (xpackProject('plugin:sql:sql-proto')) {
transitive = false
}
} else {
bundled (xpackProject('plugin:sql:sql-shared-client')) {
transitive = false
}
bundled (xpackProject('plugin:sql:sql-proto')) {
transitive = false
}
}
compile (project(':server')) {
transitive = false
Expand Down

0 comments on commit a1d2ab9

Please sign in to comment.