Skip to content

Commit f8084ba

Browse files
authored
Bump postgres and other dependencies (#495)
1 parent b6ca75e commit f8084ba

File tree

1 file changed

+41
-22
lines changed

1 file changed

+41
-22
lines changed

build.gradle.kts

+41-22
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ object Versions {
1616
const val jedis = "5.1.0"
1717
const val kafka = "3.6.0"
1818
const val kafkaEmbedded = "3.2.3"
19-
const val ktor = "2.3.7"
19+
const val ktor = "2.3.8"
2020
const val kluent = "1.73"
2121
const val jaxbApi = "2.3.1"
2222
const val jaxbRuntime = "2.3.6"
2323
const val jaxsWsApiVersion = "2.3.1"
2424
const val jaxwsToolsVersion = "2.3.5"
25+
const val jetty = "9.4.53.v20231009"
2526
const val logback = "1.4.14"
2627
const val logstashEncoder = "7.4"
2728
const val micrometerRegistry = "1.12.0"
2829
const val mockk = "1.13.8"
2930
const val nimbusjosejwt = "9.37.2"
3031
val postgresEmbedded = if (Os.isFamily(Os.FAMILY_MAC)) "1.0.0" else "0.13.4"
31-
const val postgres = "42.6.0"
32+
const val postgres = "42.7.2"
3233
const val redisEmbedded = "0.7.3"
33-
const val scala = "2.13.12"
3434
const val spek = "2.0.19"
3535
const val tjenesteSpesifikasjonerGithub = "1.2020.06.11-19.53-1cad83414166"
3636
}
3737

3838
plugins {
39-
kotlin("jvm") version "1.9.21"
39+
kotlin("jvm") version "1.9.22"
4040
id("com.github.johnrengelman.shadow") version "8.1.1"
4141
id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
4242
}
@@ -109,6 +109,20 @@ dependencies {
109109
}
110110
implementation("org.apache.kafka:kafka_2.13:${Versions.kafka}", excludeLog4j)
111111
implementation("io.confluent:kafka-avro-serializer:${Versions.confluent}", excludeLog4j)
112+
constraints {
113+
implementation("org.apache.commons:commons-compress") {
114+
because("org.apache.commons:commons-compress:1.22 -> https://www.cve.org/CVERecord?id=CVE-2012-2098")
115+
version {
116+
require("1.26.0")
117+
}
118+
}
119+
implementation("com.google.guava:guava") {
120+
because("com.google.guava:guava:30.1.1-jre -> https://www.cve.org/CVERecord?id=CVE-2020-8908")
121+
version {
122+
require("32.1.3-jre")
123+
}
124+
}
125+
}
112126
implementation("io.confluent:kafka-schema-registry:${Versions.confluent}", excludeLog4j)
113127
constraints {
114128
implementation("org.yaml:snakeyaml") {
@@ -135,36 +149,41 @@ dependencies {
135149
require("3.7.2")
136150
}
137151
}
138-
}
139-
implementation("no.nav.syfo.dialogmote.avro:isdialogmote-schema:${Versions.isdialogmoteSchema}")
140-
constraints {
141-
implementation("org.apache.avro:avro") {
142-
because("no.nav.syfo.dialogmote.avro:isdialogmote-schema:${Versions.isdialogmoteSchema} -> https://nvd.nist.gov/vuln/detail/CVE-2023-39410")
152+
implementation("org.eclipse.jetty:jetty-server") {
153+
because("io.confluent:kafka-schema-registry:${Versions.confluent} -> https://www.cve.org/CVERecord?id=CVE-2023-36478")
143154
version {
144-
require("1.11.3")
155+
require(Versions.jetty)
145156
}
146157
}
147-
}
148-
implementation("org.scala-lang:scala-library") {
149-
version {
150-
strictly(Versions.scala)
158+
implementation("org.eclipse.jetty:jetty-xml") {
159+
because("io.confluent:kafka-schema-registry:${Versions.confluent} -> https://www.cve.org/CVERecord?id=CVE-2023-36478")
160+
version {
161+
require(Versions.jetty)
162+
}
163+
}
164+
implementation("org.eclipse.jetty:jetty-servlets") {
165+
because("io.confluent:kafka-schema-registry:${Versions.confluent} -> https://www.cve.org/CVERecord?id=CVE-2023-36478")
166+
version {
167+
require(Versions.jetty)
168+
}
151169
}
152-
}
153-
testImplementation("no.nav:kafka-embedded-env:${Versions.kafkaEmbedded}", excludeLog4j)
154-
constraints {
155170
implementation("org.eclipse.jetty.http2:http2-server") {
156-
because("no.nav:kafka-embedded-env:${Versions.kafkaEmbedded} -> https://advisory.checkmarx.net/advisory/vulnerability/CVE-2022-2048/")
171+
because("io.confluent:kafka-schema-registry:${Versions.confluent} -> https://www.cve.org/CVERecord?id=CVE-2023-36478")
157172
version {
158-
require("9.4.53.v20231009")
173+
require(Versions.jetty)
159174
}
160175
}
161-
implementation("com.google.protobuf:protobuf-java") {
162-
because("io.confluent:kafka-schema-registry:${Versions.confluent} -> https://www.cve.org/CVERecord?id=CVE-2022-3510")
176+
}
177+
implementation("no.nav.syfo.dialogmote.avro:isdialogmote-schema:${Versions.isdialogmoteSchema}")
178+
constraints {
179+
implementation("org.apache.avro:avro") {
180+
because("no.nav.syfo.dialogmote.avro:isdialogmote-schema:${Versions.isdialogmoteSchema} -> https://nvd.nist.gov/vuln/detail/CVE-2023-39410")
163181
version {
164-
require("3.25.1")
182+
require("1.11.3")
165183
}
166184
}
167185
}
186+
testImplementation("no.nav:kafka-embedded-env:${Versions.kafkaEmbedded}", excludeLog4j)
168187

169188
implementation("no.nav.tjenestespesifikasjoner:servicemeldingMedKontaktinformasjon-v1-tjenestespesifikasjon:${Versions.tjenesteSpesifikasjonerGithub}")
170189

0 commit comments

Comments
 (0)