Skip to content

Commit 6b2c170

Browse files
authored
chore: Update 3PP libraries (#149)
This update was generated by running `./gradlew versionCatalogUpdate` It also explictly manages the following dependencies to ensure they are covered by the automatic updates: - apache httpclient - log4j core - netty-codec This should now cover all dependabot issues regarding the core JDBC work
1 parent 9123c1b commit 6b2c170

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

buildSrc/src/main/kotlin/version-updates.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ versionCatalogUpdate {
2828
} else if ("org.mockito" in it.candidate.group && !candidateVersion.startsWith("4.")) {
2929
//This is soft pinned to 4.* (as 5 is not Java 8 compatible)
3030
false
31+
} else if ("io.netty" in it.candidate.group && "netty-codec" in it.candidate.module && !candidateVersion.startsWith("4.1.")) {
32+
// netty-codec is soft pinned to 4.1.* (as 4.2+ may have compatibility issues)
33+
// This restriction applies only to the netty-codec version entry, not other netty libraries
34+
false
3135
} else {
3236
stableKeyword || regex.matches(candidateVersion)
3337
}

gradle/libs.versions.toml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
11
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
22
# https://docs.gradle.org/current/userguide/version_catalogs.html
33
[versions]
4+
apache-httpcomponents-httpclient = "5.6"
45
# @pin this version as it is the last Java 8 compatible version of Arrow
56
arrow = "17.0.0"
6-
com-fasterxml-jackson-core-jackson-databind = "2.20.0"
7-
com-fasterxml-jackson-module-jackson-module-scala = "2.20.0"
7+
com-fasterxml-jackson-core-jackson-databind = "2.21.0"
8+
com-fasterxml-jackson-module-jackson-module-scala = "2.21.0"
89
# This has special version logic in `buildSrc/src/main/kotlin/version-updates.gradle.kts` to also pick the -jre version
910
com-google-guava-guava = "33.5.0-jre"
10-
grpc = "1.75.0"
11+
grpc = "1.78.0"
1112
# This is only indirectly used by gRPC & Arrow but we provide an explicit version to fix security issues in the transitive dependencies
12-
io-netty = "4.2.6.Final"
13+
io-netty = "4.2.9.Final"
1314
javax-annotation-javax-annotation-api = "1.3.2"
1415
jjwt = "0.13.0"
16+
log4j-core = "2.25.3"
1517
# This is soft pinned to 4.* (as 5 is not Java 8 compatible) in `buildSrc/src/main/kotlin/version-updates.gradle.kts`
1618
mockito = "4.11.0"
1719
net-jodah-failsafe = "3.3.2"
20+
# This is soft pinned to 4.1.* (as 4.2+ may have compatibility issues) in `buildSrc/src/main/kotlin/version-updates.gradle.kts`
21+
netty-codec = "4.1.130.Final"
1822
# This is soft pinned to 4.* (as we didn't invest in the upgrade yet) in `buildSrc/src/main/kotlin/version-updates.gradle.kts`
1923
okhttp3 = "4.12.0"
2024
# @pin this version as the following versions have a breaking Cursor change, that - with the upcoming Avactica removal - we currently don't want to invest in
2125
org-apache-calcite-avatica-core = "1.26.0"
22-
org-apache-commons-commons-lang3 = "3.19.0"
26+
org-apache-commons-commons-lang3 = "3.20.0"
2327
# This is soft pinned to 3.* (as the driver is targetting in Spark 3) in `buildSrc/src/main/kotlin/version-updates.gradle.kts`
24-
org-apache-spark = "3.5.7"
25-
org-assertj-assertj-core = "3.27.6"
28+
org-apache-spark = "3.5.8"
29+
org-assertj-assertj-core = "3.27.7"
2630
org-grpcmock-grpcmock-junit5 = "0.16.0"
2731
# This is soft pinned to 5.* (as 6 is not Java 8 compatible) in `buildSrc/src/main/kotlin/version-updates.gradle.kts`
28-
org-junit-bom = "5.14.0"
32+
org-junit-bom = "5.14.2"
2933
org-junit-platform-junit-platform-launcher = "1.14.0"
30-
org-postgresql-pgjdbc = "42.7.8"
34+
org-postgresql-pgjdbc = "42.7.9"
3135
org-scalatest = "3.2.19"
3236
org-scalatestplus-junit5 = "3.2.19.0"
3337
plugin-build-buf = "0.10.3"
34-
plugin-com-google-protobuf = "0.9.5"
35-
plugin-com-gradleup-shadow = "9.2.2"
36-
plugin-freefair-lombok = "9.0.0"
37-
protobuf = "4.32.1"
38+
plugin-com-google-protobuf = "0.9.6"
39+
plugin-com-gradleup-shadow = "9.3.1"
40+
plugin-freefair-lombok = "9.2.0"
41+
protobuf = "4.33.4"
3842
slf4j = "2.0.17"
3943

4044
[libraries]
4145
apache-arrow-memory-netty = { module = "org.apache.arrow:arrow-memory-netty", version.ref = "arrow" }
4246
apache-arrow-vector = { module = "org.apache.arrow:arrow-vector", version.ref = "arrow" }
4347
apache-calcite-avatica = { module = "org.apache.calcite.avatica:avatica-core", version.ref = "org-apache-calcite-avatica-core" }
4448
apache-commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "org-apache-commons-commons-lang3" }
49+
apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "apache-httpcomponents-httpclient" }
4550
assertj = { module = "org.assertj:assertj-core", version.ref = "org-assertj-assertj-core" }
4651
failsafe = { module = "dev.failsafe:failsafe", version.ref = "net-jodah-failsafe" }
4752
grpc-inprocess = { module = "io.grpc:grpc-inprocess", version.ref = "grpc" }
@@ -57,16 +62,18 @@ javax-annotation-api = { module = "javax.annotation:javax.annotation-api", versi
5762
jjwt-api = { module = "io.jsonwebtoken:jjwt-api", version.ref = "jjwt" }
5863
jjwt-impl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "jjwt" }
5964
jjwt-jackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "jjwt" }
60-
junit-bom = "org.junit:junit-bom:5.14.0"
65+
junit-bom = "org.junit:junit-bom:5.14.2"
6166
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-bom" }
6267
junit-jupiter-base = { module = "org.junit.jupiter:junit-jupiter", version.ref = "org-junit-bom" }
6368
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-bom" }
6469
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "org-junit-bom" }
6570
junit-platform-engine = { module = "org.junit.platform:junit-platform-engine", version.ref = "org-junit-platform-junit-platform-launcher" }
6671
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "org-junit-platform-junit-platform-launcher" }
6772
junit-platform-launcher-test = { module = "org.junit.platform:junit-platform-launcher", version.ref = "org-junit-platform-junit-platform-launcher" }
73+
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j-core" }
6874
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
6975
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
76+
netty-codec = { module = "io.netty:netty-codec", version.ref = "netty-codec" }
7077
netty-common = { module = "io.netty:netty-common", version.ref = "io-netty" }
7178
okhttp3-client = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
7279
okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3" }

0 commit comments

Comments
 (0)