From de135960401d9f869d6645ac46744126e2733ee6 Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Wed, 25 Apr 2018 09:37:22 +0100 Subject: [PATCH] Fixes Eclipse build for sql jdbc project 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. --- x-pack/plugin/sql/jdbc/build.gradle | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/x-pack/plugin/sql/jdbc/build.gradle b/x-pack/plugin/sql/jdbc/build.gradle index acaf10d3a2325..2cc7946d9b9c2 100644 --- a/x-pack/plugin/sql/jdbc/build.gradle +++ b/x-pack/plugin/sql/jdbc/build.gradle @@ -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