Skip to content

Commit b279540

Browse files
hestadhestad
authored
Merge pull request #1773 from navikt/convert-more-libs-to-new-format
Convert more libs to new format
2 parents 3d39c49 + 11d42eb commit b279540

File tree

2 files changed

+114
-43
lines changed

2 files changed

+114
-43
lines changed

‎build.gradle.kts

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,37 @@ subprojects {
1818
maven("https://oss.sonatype.org/content/repositories/releases/")
1919
maven("https://packages.confluent.io/maven/")
2020
}
21-
val kotestVersion = "5.8.1"
22-
val jacksonVersion = "2.17.0"
23-
val confluentVersion = "7.6.1"
2421
dependencies {
2522
implementation(rootProject.libs.kotlin.reflect)
2623
implementation(rootProject.libs.kotlin.script.runtime)
2724
implementation(rootProject.libs.kotlin.compiler.embeddable)
28-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
29-
implementation(platform("io.arrow-kt:arrow-stack:1.2.4"))
30-
implementation("io.arrow-kt:arrow-core")
31-
implementation("io.arrow-kt:arrow-fx-coroutines")
32-
implementation("io.arrow-kt:arrow-fx-stm")
33-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
34-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion")
35-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
36-
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion")
25+
implementation(rootProject.libs.kotlinx.coroutines.core)
26+
implementation(platform(rootProject.libs.arrow.stack))
27+
implementation(rootProject.libs.arrow.core)
28+
implementation(rootProject.libs.arrow.fx.coroutines)
29+
implementation(rootProject.libs.arrow.fx.stm)
30+
implementation(rootProject.libs.jackson.datatype.jsr310)
31+
implementation(rootProject.libs.jackson.datatype.jdk8)
32+
implementation(rootProject.libs.jackson.module.kotlin)
33+
implementation(rootProject.libs.jackson.dataformat.xml)
3734
implementation(rootProject.libs.slf4j.api)
3835
implementation(rootProject.libs.jul.to.slf4j)
3936
implementation(rootProject.libs.jcl.over.slf4j)
4037
implementation(rootProject.libs.log4j.over.slf4j)
41-
implementation("ch.qos.logback:logback-classic:1.5.6")
42-
implementation("net.logstash.logback:logstash-logback-encoder:7.4")
43-
implementation("com.papertrailapp", "logback-syslog4j", "1.0.0")
44-
implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")
45-
implementation("com.networknt:json-schema-validator:1.4.0")
46-
implementation("com.ibm.mq:com.ibm.mq.allclient:9.3.5.0")
47-
implementation("org.apache.kafka:kafka-clients:3.7.0") {
38+
implementation(rootProject.libs.logback.classic)
39+
implementation(rootProject.libs.logstash.logback.encoder)
40+
implementation(rootProject.libs.logback.syslog4j)
41+
implementation(rootProject.libs.dotenv.kotlin)
42+
implementation(rootProject.libs.json.schema.validator)
43+
implementation(rootProject.libs.com.ibm.mq.allclient)
44+
implementation(rootProject.libs.kafka.clients) {
4845
exclude("org.apache.kafka", "kafka-raft")
4946
exclude("org.apache.kafka", "kafka-server-common")
5047
exclude("org.apache.kafka", "kafka-storage")
5148
exclude("org.apache.kafka", "kafka-storage-api")
5249
exclude("org.apache.kafka", "kafka-streams")
5350
}
54-
implementation("io.confluent:kafka-avro-serializer:$confluentVersion") {
51+
implementation(rootProject.libs.kafka.avro.serializer) {
5552
exclude("org.apache.kafka", "kafka-clients")
5653
exclude("io.confluent", "common-utils")
5754
exclude("io.confluent", "logredactor")
@@ -63,27 +60,27 @@ subprojects {
6360
exclude("com.google.code.findbugs")
6461
exclude("io.swagger.core.v3")
6562
}
66-
implementation("org.apache.avro:avro:1.11.3") {
63+
implementation(rootProject.libs.avro) {
6764
exclude("org.apache.commons", "commons-compress")
6865
}
69-
implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
70-
implementation("io.micrometer:micrometer-core:1.12.5")
71-
implementation("io.micrometer:micrometer-registry-prometheus:1.12.5")
72-
implementation("com.github.seratch:kotliquery:1.9.0")
73-
implementation("org.flywaydb:flyway-core:10.11.1")
74-
implementation("org.flywaydb:flyway-database-postgresql:10.11.1")
75-
implementation("com.zaxxer:HikariCP:5.1.0")
76-
implementation("com.github.navikt:vault-jdbc:1.3.10")
77-
implementation("org.postgresql:postgresql:42.7.3") {
66+
implementation(rootProject.libs.caffeine)
67+
implementation(rootProject.libs.micrometer.core)
68+
implementation(rootProject.libs.micrometer.registry.prometheus)
69+
implementation(rootProject.libs.kotliquery)
70+
implementation(rootProject.libs.flyway.core)
71+
implementation(rootProject.libs.flyway.database.postgresql)
72+
implementation(rootProject.libs.hikaricp)
73+
implementation(rootProject.libs.vault.jdbc)
74+
implementation(rootProject.libs.postgresql) {
7875
exclude("org.apache.commons", "commons-compress")
7976
}
8077
// Brukes av avro?
81-
implementation("org.apache.commons:commons-compress:1.26.1")
78+
implementation(rootProject.libs.commons.compress)
8279

8380

8481
implementation(rootProject.libs.ktor.server.netty)
8582
implementation(rootProject.libs.ktor.server.auth.jwt) {
86-
exclude(group = "junit")
83+
exclude("junit")
8784
}
8885
implementation(rootProject.libs.ktor.server.metrics.micrometer)
8986
implementation(rootProject.libs.ktor.serialization.jackson)
@@ -94,29 +91,31 @@ subprojects {
9491
implementation(rootProject.libs.ktor.server.status.pages)
9592

9693
// We exclude jdk15on because of security issues. We use jdk18on instead.
97-
implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
94+
implementation(rootProject.libs.bcprov.jdk18on)
9895

9996
testRuntimeOnly(rootProject.libs.jupiter.engine)
10097

10198
testImplementation(rootProject.libs.jupiter.api)
10299
testImplementation(rootProject.libs.jupiter.params)
103-
testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
104-
testImplementation("io.kotest:kotest-assertions-json:$kotestVersion")
105-
testImplementation("io.kotest.extensions:kotest-assertions-arrow:1.4.0")
106-
testImplementation("io.kotest:kotest-extensions:$kotestVersion")
107-
testImplementation("org.skyscreamer:jsonassert:1.5.1")
108-
testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
100+
testImplementation(rootProject.libs.kotest.assertions.core)
101+
testImplementation(rootProject.libs.kotest.assertions.json)
102+
testImplementation(rootProject.libs.kotest.extensions)
103+
testImplementation(rootProject.libs.kotest.assertions.arrow)
104+
105+
106+
testImplementation(rootProject.libs.jsonassert)
107+
testImplementation(rootProject.libs.mockito.kotlin)
109108
testImplementation(
110-
enforcedPlatform("io.zonky.test.postgres:embedded-postgres-binaries-bom:15.5.1"),
109+
enforcedPlatform(rootProject.libs.embedded.postgres.binaries.bom),
111110
)
112-
testImplementation("io.zonky.test:embedded-postgres:2.0.7") {
111+
testImplementation(rootProject.libs.embedded.postgres) {
113112
exclude("org.apache.commons", "commons-compress")
114113
}
115114
// Legger til manglende binaries for nye Mac's med M1 cpuer. (denne arver versjonen til embedded-postgres-binaries-bom)
116-
testImplementation("io.zonky.test.postgres:embedded-postgres-binaries-darwin-arm64v8") {
115+
testImplementation(rootProject.libs.embedded.postgres.binaries.darwin.arm64v8) {
117116
exclude("org.apache.commons", "commons-compress")
118117
}
119-
testImplementation("org.xmlunit:xmlunit-matchers:2.9.1")
118+
testImplementation(rootProject.libs.xmlunit.matchers)
120119
testImplementation(rootProject.libs.ktor.server.test.host) {
121120
exclude(group = "junit")
122121
exclude(group = "org.eclipse.jetty") // conflicts with WireMock

‎gradle/libs.versions.toml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,36 @@ wiremock = "3.5.3"
88
jupiter = "5.10.2"
99
kotlin = "1.9.23"
1010
ktor = "2.3.10"
11+
arrow = "1.2.4"
12+
jackson = "2.17.0"
13+
confluent = "7.6.0"
14+
micrometer = "1.12.5"
15+
flyway = "10.11.1"
16+
kotest = "5.8.1"
1117

1218
[libraries]
1319
slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
1420
jul-to-slf4j = { group = "org.slf4j", name = "jul-to-slf4j", version.ref = "slf4j" }
1521
jcl-over-slf4j = { group = "org.slf4j", name = "jcl-over-slf4j", version.ref = "slf4j" }
1622
log4j-over-slf4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" }
23+
24+
logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.6" }
25+
logstash-logback-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version = "7.4" }
26+
logback-syslog4j = { group = "com.papertrailapp", name = "logback-syslog4j", version = "1.0.0" }
27+
1728
kittinunf-fuel = { group = "com.github.kittinunf.fuel", name = "fuel", version.ref = "kittinunf" }
1829
kittinunf-fuel-gson = { group = "com.github.kittinunf.fuel", name = "fuel-gson", version.ref = "kittinunf" }
30+
1931
wiremock = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock" }
32+
2033
jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
2134
jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
2235
jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "jupiter" }
36+
2337
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
2438
kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
2539
kotlin-compiler-embeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
40+
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" }
2641

2742
ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
2843
ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
@@ -36,5 +51,62 @@ ktor-server-status-pages = { group = "io.ktor", name = "ktor-server-status-pages
3651
ktor-serialization-jackson = { group = "io.ktor", name = "ktor-serialization-jackson", version.ref = "ktor" }
3752
ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
3853

54+
arrow-core = { group = "io.arrow-kt", name = "arrow-core", version.ref = "arrow" }
55+
arrow-fx-coroutines = { group = "io.arrow-kt", name = "arrow-fx-coroutines", version.ref = "arrow" }
56+
arrow-fx-stm = { group = "io.arrow-kt", name = "arrow-fx-stm", version.ref = "arrow" }
57+
arrow-stack = { group = "io.arrow-kt", name = "arrow-stack", version.ref = "arrow" }
58+
59+
jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "jackson" }
60+
jackson-datatype-jdk8 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jdk8", version.ref = "jackson" }
61+
jackson-module-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson" }
62+
jackson-dataformat-xml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-xml", version.ref = "jackson" }
63+
64+
micrometer-core = { group = "io.micrometer", name = "micrometer-core", version.ref = "micrometer"}
65+
micrometer-registry-prometheus = { group = "io.micrometer", name = "micrometer-registry-prometheus", version.ref = "micrometer"}
66+
67+
kotest-assertions-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest"}
68+
kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest"}
69+
kotest-extensions = { group = "io.kotest", name = "kotest-extensions", version.ref = "kotest"}
70+
kotest-assertions-arrow = { group = "io.kotest.extensions", name = "kotest-assertions-arrow", version = "1.4.0"}
71+
72+
kafka-clients = { group = "org.apache.kafka", name = "kafka-clients", version = "3.7.0"}
73+
kafka-avro-serializer = { group = "io.confluent", name = "kafka-avro-serializer", version.ref = "confluent"}
74+
75+
flyway-core = { group = "org.flywaydb", name = "flyway-core", version.ref = "flyway"}
76+
flyway-database-postgresql = { group = "org.flywaydb", name = "flyway-database-postgresql", version.ref = "flyway"}
77+
78+
dotenv-kotlin = { group = "io.github.cdimascio", name = "dotenv-kotlin", version = "6.4.1" }
79+
80+
json-schema-validator = { group = "com.networknt", name = "json-schema-validator", version = "1.4.0" }
81+
82+
com-ibm-mq-allclient = { group = "com.ibm.mq", name = "com.ibm.mq.allclient", version = "9.3.5.0"}
83+
84+
avro = { group = "org.apache.avro", name = "avro", version = "1.11.3"}
85+
86+
caffeine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version = "3.1.8"}
87+
88+
kotliquery = { group = "com.github.seratch", name = "kotliquery", version = "1.9.0"}
89+
90+
hikaricp = { group = "com.zaxxer", name = "HikariCP", version = "5.1.0"}
91+
92+
vault-jdbc = { group = "com.github.navikt", name = "vault-jdbc", version = "1.3.10"}
93+
94+
postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.3"}
95+
96+
commons-compress = { group = "org.apache.commons", name = "commons-compress", version = "1.26.1"}
97+
98+
bcprov-jdk18on = { group = "org.bouncycastle", name = "bcprov-jdk18on", version = "1.78.1"}
99+
100+
jsonassert = { group = "org.skyscreamer", name = "jsonassert", version = "1.5.1"}
101+
102+
mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version = "5.3.1"}
103+
104+
embedded-postgres = { group = "io.zonky.test", name = "embedded-postgres", version = "2.0.7"}
105+
embedded-postgres-binaries-bom = { group = "io.zonky.test.postgres", name = "embedded-postgres-binaries-bom", version = "15.5.1"}
106+
embedded-postgres-binaries-darwin-arm64v8 = { group = "io.zonky.test.postgres", name = "embedded-postgres-binaries-darwin-arm64v8"}
107+
108+
xmlunit-matchers = { group = "org.xmlunit", name = "xmlunit-matchers", version = "2.9.1"}
109+
110+
39111
[plugins]
40112
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

0 commit comments

Comments
 (0)