Skip to content

Commit 482d980

Browse files
committed
SQL: Centralize SQL test dependencies version handling (#40551)
Moves definitions of versions for csvjdbc and h2 libraries to the central build.gradle file.
1 parent fea91c6 commit 482d980

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

x-pack/plugin/sql/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ ext {
1414
// SQL dependency versions
1515
jlineVersion="3.10.0"
1616
antlrVersion="4.5.3"
17+
18+
// SQL test dependency versions
19+
csvjdbcVersion="1.0.34"
20+
h2Version="1.4.197"
1721
}
1822

1923
configurations {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
compile project(path: xpackModule('sql:jdbc'), configuration: 'nodeps')
1313

1414
compile project(path: xpackModule('sql:sql-action'))
15-
compile "net.sourceforge.csvjdbc:csvjdbc:1.0.34"
15+
compile "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}"
1616

1717
// CLI testing dependencies
1818
compile project(path: xpackModule('sql:sql-cli'), configuration: 'nodeps')
@@ -54,8 +54,8 @@ subprojects {
5454
testCompile "org.elasticsearch.test:framework:${version}"
5555

5656
// JDBC testing dependencies
57-
testRuntime "net.sourceforge.csvjdbc:csvjdbc:1.0.34"
58-
testRuntime "com.h2database:h2:1.4.197"
57+
testRuntime "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}"
58+
testRuntime "com.h2database:h2:${h2Version}"
5959
testRuntime project(path: xpackModule('sql:jdbc'), configuration: 'nodeps')
6060
testRuntime xpackProject('plugin:sql:sql-client')
6161

0 commit comments

Comments
 (0)