Skip to content

Commit a97741f

Browse files
committed
Ase version catalogue for database integration tests
1 parent a9a682c commit a97741f

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

gradle/libs.versions.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ snakeYaml = "2.10" # https://bitbucket.org/snakeyaml/snakeyaml-engine/src/master
2424
testContainers = "2.0.1" # https://github.com/testcontainers/testcontainers-java
2525
testContainers-modules = "1.20.0" # https://testcontainers.com/modules/postgresql
2626

27+
# JDBC drivers for test infrastructure
28+
mysqlDriver = "9.4.0"
29+
mssqlDriver = "13.2.0.jre11"
30+
oracleDriver = "23.9.0.25.07"
31+
2732
kotlinx-serialization = "1.9.0"
2833
jvm-toolchain = "11"
2934
kotlinpoet = "2.1.0"
@@ -54,6 +59,10 @@ ktor-client-cio = { module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor"
5459
ktor-client-mock = { module = "io.ktor:ktor-client-mock-jvm", version.ref = "ktor" }
5560
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor" }
5661

62+
# Ktor server artifacts used in database-test-infrastructure
63+
ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
64+
ktor-server-contentNegotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor" }
65+
5766
logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
5867
postgresDriver = { group = "org.postgresql", name = "postgresql", version.ref = "postgresDriver" }
5968
snakeYaml = { group = "org.snakeyaml", name = "snakeyaml-engine", version.ref = "snakeYaml" }
@@ -62,6 +71,15 @@ testContainers = { group = "org.testcontainers", name = "testcontainers-junit-ju
6271
testContainers-mysql = { group = "org.testcontainers", name = "mysql", version.ref = "testContainers-modules" }
6372
testContainers-postgres = { group = "org.testcontainers", name = "postgresql", version.ref = "testContainers-modules" }
6473

74+
# Additional JDBC drivers
75+
mysqlDriver = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysqlDriver" }
76+
mssqlDriver = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version.ref = "mssqlDriver" }
77+
oracleDriver = { group = "com.oracle.database.jdbc", name = "ojdbc11", version.ref = "oracleDriver" }
78+
79+
# Additional Testcontainers modules
80+
testContainers-mssqlserver = { group = "org.testcontainers", name = "mssqlserver", version.ref = "testContainers-modules" }
81+
testContainers-oracle-free = { group = "org.testcontainers", name = "oracle-free", version.ref = "testContainers-modules" }
82+
6583
[plugins]
6684
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
6785
kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" }

integrations/database/database-test-infrastructure/build.gradle.kts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,23 @@ kotlin {
1515
}
1616

1717
dependencies {
18-
val ktor = libs.versions.ktor.get()
19-
implementation("io.ktor:ktor-server-cio:$ktor")
20-
implementation("io.ktor:ktor-server-content-negotiation-jvm:$ktor")
21-
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:$ktor")
18+
implementation(libs.ktor.server.cio)
19+
implementation(libs.ktor.server.contentNegotiation)
20+
implementation(libs.ktor.serialization.kotlinx.json)
2221
implementation(libs.logback)
2322

2423
// JDBC Drivers for all supported databases
25-
implementation("com.mysql:mysql-connector-j:9.4.0")
26-
implementation("org.postgresql:postgresql:42.7.7")
27-
implementation("com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre11")
28-
implementation("com.oracle.database.jdbc:ojdbc11:23.9.0.25.07")
24+
implementation(libs.mysqlDriver)
25+
implementation(libs.postgresDriver)
26+
implementation(libs.mssqlDriver)
27+
implementation(libs.oracleDriver)
2928

3029
// Test containers for all supported databases
3130
implementation(libs.testContainers)
32-
val testContainerVersion =
33-
libs.versions.testContainers.modules
34-
.get()
35-
implementation("org.testcontainers:postgresql:$testContainerVersion")
36-
implementation("org.testcontainers:mysql:$testContainerVersion")
37-
implementation("org.testcontainers:mssqlserver:$testContainerVersion")
38-
implementation("org.testcontainers:oracle-free:$testContainerVersion")
31+
implementation(libs.testContainers.postgres)
32+
implementation(libs.testContainers.mysql)
33+
implementation(libs.testContainers.mssqlserver)
34+
implementation(libs.testContainers.oracle.free)
3935
}
4036

4137
application { mainClass = "org.jetbrains.kotlinx.jupyter.database.containers.MainKt" }

0 commit comments

Comments
 (0)