Skip to content

Commit feed646

Browse files
committed
Apply March 2026 security updates
1 parent f8bcade commit feed646

5 files changed

Lines changed: 23 additions & 14 deletions

File tree

build.gradle.kts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,20 @@ radarRootProject {
2020
subprojects {
2121
apply(plugin = "org.radarbase.radar-kotlin")
2222

23-
configurations.all {
24-
resolutionStrategy {
25-
/* The entries in the block below are added here to force the version of
26-
* transitive dependencies and mitigate reported vulnerabilities */
27-
force(
28-
"org.apache.commons:commons-lang3:${rootProject.libs.versions.commonsLang3.get()}",
29-
)
23+
// --- Vulnerability fixes start ---
24+
dependencies {
25+
plugins.withType<JavaPlugin> {
26+
constraints {
27+
add("implementation", rootProject.libs.jackson.bom) {
28+
because("Force safe version of Jackson across all modules")
29+
}
30+
add("implementation", rootProject.libs.commons.lang3) {
31+
because("Force safe version of commons-lang3 across all modules")
32+
}
33+
}
3034
}
3135
}
36+
// --- Vulnerability fixes end ---
3237

3338
radarKotlin {
3439
javaVersion.set(rootProject.libs.versions.java.get().toInt())

gradle/libs.versions.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
project = "0.7.2"
33
java = "17"
44
gradle = "8.14"
5-
kotlin = "1.9.22"
6-
radarCommons = "1.2.4"
5+
kotlin = "1.9.24"
6+
radarCommons = "1.2.6"
77
confluent = "7.8.1"
88
avro = "1.12.0"
9-
jackson = "2.17.3"
9+
jackson = "2.20.2"
10+
jacksonAnnotations = "2.20"
1011
log4j2 = "2.23.1"
1112
slf4j = "2.0.13"
1213
sentryLog4j = "1.7.30"
1314
sentryOpenTelemetryAgent = "8.1.0"
1415
okhttp = "4.12.0"
1516
firebaseAdmin = "9.6.0"
16-
radarSchemas = "0.8.14"
17+
radarSchemas = "0.8.16"
1718
ktor = "2.3.10"
1819
junit = "5.10.2"
1920
wiremock = "3.0.1"
@@ -28,7 +29,7 @@ kafka-connect-api = { group = "org.apache.kafka", name = "connect-api", version
2829
kafka-connect-avro-converter = { group = "io.confluent", name = "kafka-connect-avro-converter", version.ref = "confluent" }
2930
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
3031
jackson-bom = { group = "com.fasterxml.jackson", name = "jackson-bom", version.ref = "jackson" }
31-
jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" }
32+
jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jacksonAnnotations" }
3233
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
3334
jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
3435
jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "jackson" }

kafka-connect-fitbit-source/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY ./kafka-connect-fitbit-source/src/ /code/kafka-connect-fitbit-source/src
3232

3333
RUN gradle jar
3434

35-
FROM confluentinc/cp-kafka-connect-base:7.8.1
35+
FROM confluentinc/cp-kafka-connect-base:7.8.7
3636

3737
USER appuser
3838

kafka-connect-oura-source/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY ./oura-library/src/ /code/oura-library/src
3232

3333
RUN gradle jar
3434

35-
FROM confluentinc/cp-kafka-connect-base:7.8.1
35+
FROM confluentinc/cp-kafka-connect-base:7.8.7
3636

3737

3838
LABEL org.opencontainers.image.authors="pauline.conde@kcl.ac.uk"

kafka-connect-rest-source/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ dependencies {
1717
runtimeOnly(libs.sentry.log4j) {
1818
// Exclude log4j with security vulnerability (safe version is provided by docker image).
1919
exclude(group = "log4j", module = "log4j")
20+
exclude(group = "org.slf4j", module = "slf4j-api")
21+
// Exclude Jackson with security vulnerability (safe version is provided by docker image).
22+
exclude(group = "com.fasterxml.jackson.core")
2023
}
2124
runtimeOnly(libs.sentry.opentelemetry.agent)
2225
}

0 commit comments

Comments
 (0)