honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes Eclipse build for sql jdbc project (#30114) 

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.
This commit is contained in:
Colin Goodheart-Smithe 2018-04-25 16:10:32 +01:00 committed by GitHub
parent 0a5a9a2086
commit c02b895653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x-pack/plugin/sql/jdbc/build.gradle
View File

@ -45,11 +45,23 @@ jar {
} }
dependencies { dependencies {
bundled (xpackProject('plugin:sql:sql-shared-client')) {
transitive = false // Eclipse doesn't know how to deal with these bundled deependencies so make them compile
} // dependencies if we are running in Eclipse
bundled (xpackProject('plugin:sql:sql-proto')) { if (isEclipse) {
transitive = false 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')) { compile (project(':server')) {
transitive = false transitive = false