Skip to content

Commit c02b895

Browse files
authored
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.
1 parent 0a5a9a2 commit c02b895

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

x-pack/plugin/sql/jdbc/build.gradle

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,23 @@ jar {
4545
}
4646

4747
dependencies {
48-
bundled (xpackProject('plugin:sql:sql-shared-client')) {
49-
transitive = false
50-
}
51-
bundled (xpackProject('plugin:sql:sql-proto')) {
52-
transitive = false
48+
49+
// Eclipse doesn't know how to deal with these bundled deependencies so make them compile
50+
// dependencies if we are running in Eclipse
51+
if (isEclipse) {
52+
compile (xpackProject('plugin:sql:sql-shared-client')) {
53+
transitive = false
54+
}
55+
compile (xpackProject('plugin:sql:sql-proto')) {
56+
transitive = false
57+
}
58+
} else {
59+
bundled (xpackProject('plugin:sql:sql-shared-client')) {
60+
transitive = false
61+
}
62+
bundled (xpackProject('plugin:sql:sql-proto')) {
63+
transitive = false
64+
}
5365
}
5466
compile (project(':server')) {
5567
transitive = false

0 commit comments

Comments
 (0)