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

SQL: Centralize SQL test dependencies version handling (#40551) 

Moves definitions of versions for csvjdbc and h2 libraries to the
central build.gradle file.
This commit is contained in:
Igor Motov 2019-03-28 09:21:59 -04:00
parent fea91c6113
commit 482d9804b1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/sql/build.gradle
View File

@ -14,6 +14,10 @@ ext {
// SQL dependency versions // SQL dependency versions
jlineVersion="3.10.0" jlineVersion="3.10.0"
antlrVersion="4.5.3" antlrVersion="4.5.3"
// SQL test dependency versions
csvjdbcVersion="1.0.34"
h2Version="1.4.197"
} }
configurations { configurations {

6
x-pack/plugin/sql/qa/build.gradle
View File

@ -12,7 +12,7 @@ dependencies {
compile project(path: xpackModule('sql:jdbc'), configuration: 'nodeps') compile project(path: xpackModule('sql:jdbc'), configuration: 'nodeps')
compile project(path: xpackModule('sql:sql-action')) compile project(path: xpackModule('sql:sql-action'))
compile "net.sourceforge.csvjdbc:csvjdbc:1.0.34" compile "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}"
// CLI testing dependencies // CLI testing dependencies
compile project(path: xpackModule('sql:sql-cli'), configuration: 'nodeps') compile project(path: xpackModule('sql:sql-cli'), configuration: 'nodeps')
@ -54,8 +54,8 @@ subprojects {
testCompile "org.elasticsearch.test:framework:${version}" testCompile "org.elasticsearch.test:framework:${version}"
// JDBC testing dependencies // JDBC testing dependencies
testRuntime "net.sourceforge.csvjdbc:csvjdbc:1.0.34" testRuntime "net.sourceforge.csvjdbc:csvjdbc:${csvjdbcVersion}"
testRuntime "com.h2database:h2:1.4.197" testRuntime "com.h2database:h2:${h2Version}"
testRuntime project(path: xpackModule('sql:jdbc'), configuration: 'nodeps') testRuntime project(path: xpackModule('sql:jdbc'), configuration: 'nodeps')
testRuntime xpackProject('plugin:sql:sql-client') testRuntime xpackProject('plugin:sql:sql-client')