diff --git a/solr/licenses/avatica-core-1.25.0.jar.sha1 b/solr/licenses/avatica-core-1.25.0.jar.sha1
deleted file mode 100644
index 1fe8f3a4af4a..000000000000
--- a/solr/licenses/avatica-core-1.25.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73b9a0e7032a5ae89f294091bc6cbb9a67a21101
diff --git a/solr/licenses/avatica-core-1.28.0.jar.sha1 b/solr/licenses/avatica-core-1.28.0.jar.sha1
new file mode 100644
index 000000000000..2aa1a25dfc7e
--- /dev/null
+++ b/solr/licenses/avatica-core-1.28.0.jar.sha1
@@ -0,0 +1 @@
+d5e10c96fc7447ff2c42866a4676d45720b7d043
diff --git a/solr/licenses/avatica-metrics-1.25.0.jar.sha1 b/solr/licenses/avatica-metrics-1.25.0.jar.sha1
deleted file mode 100644
index 0b3586336b03..000000000000
--- a/solr/licenses/avatica-metrics-1.25.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-152f846d9f30a3e026530c2087ecd65c39bb304b
diff --git a/solr/licenses/avatica-metrics-1.28.0.jar.sha1 b/solr/licenses/avatica-metrics-1.28.0.jar.sha1
new file mode 100644
index 000000000000..9cdac73e35a4
--- /dev/null
+++ b/solr/licenses/avatica-metrics-1.28.0.jar.sha1
@@ -0,0 +1 @@
+ccfcd1abf8a5eebbcf0364ada7a14c7ff24168bd
diff --git a/solr/licenses/calcite-core-1.37.0.jar.sha1 b/solr/licenses/calcite-core-1.37.0.jar.sha1
deleted file mode 100644
index 91d833404dec..000000000000
--- a/solr/licenses/calcite-core-1.37.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-537a3281dfefbd7939d27785732a2aafddd3abcb
diff --git a/solr/licenses/calcite-core-1.42.0.jar.sha1 b/solr/licenses/calcite-core-1.42.0.jar.sha1
new file mode 100644
index 000000000000..9a6917636677
--- /dev/null
+++ b/solr/licenses/calcite-core-1.42.0.jar.sha1
@@ -0,0 +1 @@
+7de9279a71383a1aba2c1b51ff294ccea75c1342
diff --git a/solr/licenses/calcite-linq4j-1.37.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.37.0.jar.sha1
deleted file mode 100644
index 7e81d14286e6..000000000000
--- a/solr/licenses/calcite-linq4j-1.37.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-92446d8dfc8e57289e6120a7efc6932650ed3410
diff --git a/solr/licenses/calcite-linq4j-1.42.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.42.0.jar.sha1
new file mode 100644
index 000000000000..148b7747a447
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.42.0.jar.sha1
@@ -0,0 +1 @@
+8ea854065930c333946766480246fb828f2756db
diff --git a/solr/licenses/commons-compiler-3.1.11.jar.sha1 b/solr/licenses/commons-compiler-3.1.11.jar.sha1
deleted file mode 100644
index e4a23a4f2e31..000000000000
--- a/solr/licenses/commons-compiler-3.1.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19d5bfd402f91de0e670ef5783bf5c0a3f5ab478
diff --git a/solr/licenses/commons-compiler-3.1.12.jar.sha1 b/solr/licenses/commons-compiler-3.1.12.jar.sha1
new file mode 100644
index 000000000000..19facd11f2c5
--- /dev/null
+++ b/solr/licenses/commons-compiler-3.1.12.jar.sha1
@@ -0,0 +1 @@
+0501779107b06a981ff359eab7369ff7a2bf077e
diff --git a/solr/licenses/janino-3.1.11.jar.sha1 b/solr/licenses/janino-3.1.11.jar.sha1
deleted file mode 100644
index 08e36c20aec8..000000000000
--- a/solr/licenses/janino-3.1.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-878a02f3ab98d37206c9852c025a46b86dc882d0
diff --git a/solr/licenses/janino-3.1.12.jar.sha1 b/solr/licenses/janino-3.1.12.jar.sha1
new file mode 100644
index 000000000000..6cdb19a7c1a1
--- /dev/null
+++ b/solr/licenses/janino-3.1.12.jar.sha1
@@ -0,0 +1 @@
+ffcd3dfa84057ef76092b6b66c53871a97ae40b8
diff --git a/solr/licenses/joou-java-6-0.9.5.jar.sha1 b/solr/licenses/joou-java-6-0.9.5.jar.sha1
new file mode 100644
index 000000000000..e607b1e9e192
--- /dev/null
+++ b/solr/licenses/joou-java-6-0.9.5.jar.sha1
@@ -0,0 +1 @@
+1f994e53418fd5805c6a1d8f870802dedd2fb871
diff --git a/versions.lock b/versions.lock
index 0b82e9481ead..106de1ae5fcd 100644
--- a/versions.lock
+++ b/versions.lock
@@ -5,9 +5,9 @@ com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0)
 com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.9.1 (2 constraints: d01534e2)
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.fasterxml.jackson:jackson-bom:2.22.0 (12 constraints: daffec4a)
-com.fasterxml.jackson.core:jackson-annotations:2.22 (15 constraints: 601c68f0)
-com.fasterxml.jackson.core:jackson-core:2.22.0 (16 constraints: 2245fb97)
-com.fasterxml.jackson.core:jackson-databind:2.22.0 (36 constraints: 4a838d3d)
+com.fasterxml.jackson.core:jackson-annotations:2.22 (15 constraints: 6e1c6df7)
+com.fasterxml.jackson.core:jackson-core:2.22.0 (16 constraints: 30456c99)
+com.fasterxml.jackson.core:jackson-databind:2.22.0 (36 constraints: 58837e5e)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.22.0 (2 constraints: 5f1c93f1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.22.0 (2 constraints: e719387a)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.22.0 (1 constraints: b60ea466)
@@ -43,9 +43,9 @@ com.google.cloud:google-cloud-core-grpc:2.71.0 (2 constraints: 8c1eaeaa)
 com.google.cloud:google-cloud-core-http:2.71.0 (2 constraints: 8c1eaeaa)
 com.google.cloud:google-cloud-storage:2.69.0 (2 constraints: e31cb828)
 com.google.code.gson:gson:2.13.2 (11 constraints: e3a1774a)
-com.google.errorprone:error_prone_annotations:2.31.0 (22 constraints: 522f405d)
+com.google.errorprone:error_prone_annotations:2.31.0 (22 constraints: 572f525d)
 com.google.guava:failureaccess:1.0.3 (6 constraints: cb636b42)
-com.google.guava:guava:33.6.0-jre (23 constraints: e85806a5)
+com.google.guava:guava:33.6.0-jre (23 constraints: fa5869aa)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (6 constraints: b5b5e9b2)
 com.google.http-client:google-http-client:2.1.0 (13 constraints: 9dd91ca6)
 com.google.http-client:google-http-client-apache-v2:2.1.0 (3 constraints: b92edcec)
@@ -54,14 +54,14 @@ com.google.http-client:google-http-client-gson:2.1.0 (9 constraints: a08b1639)
 com.google.http-client:google-http-client-jackson2:2.1.0 (2 constraints: 1e1ea573)
 com.google.j2objc:j2objc-annotations:3.1 (7 constraints: 05738e58)
 com.google.oauth-client:google-oauth-client:1.39.0 (3 constraints: 2b2f0445)
-com.google.protobuf:protobuf-java:4.35.1 (10 constraints: aa91b1d0)
+com.google.protobuf:protobuf-java:4.35.1 (10 constraints: ad91bcd0)
 com.google.protobuf:protobuf-java-util:4.35.1 (7 constraints: a85b007d)
 com.google.re2j:re2j:1.8 (4 constraints: ab350084)
 com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798)
 com.helger:profiler:1.1.1 (1 constraints: e21053b8)
 com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484)
 com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830)
-com.jayway.jsonpath:json-path:2.10.0 (2 constraints: 97122538)
+com.jayway.jsonpath:json-path:2.10.0 (2 constraints: bf12ce4a)
 com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a)
 com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36)
 com.squareup.okhttp3:okhttp:5.4.0 (11 constraints: a59b7e8e)
@@ -176,15 +176,15 @@ net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf)
 net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: fe0a06e8)
 net.thisptr:jackson-jq:0.0.13 (1 constraints: 3605223b)
 org.antlr:antlr4-runtime:4.11.1 (1 constraints: f70fbd96)
-org.apache.calcite:calcite-core:1.37.0 (1 constraints: 3d05463b)
-org.apache.calcite:calcite-linq4j:1.37.0 (2 constraints: cf12444c)
-org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc)
-org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4)
+org.apache.calcite:calcite-core:1.42.0 (1 constraints: 39053b3b)
+org.apache.calcite:calcite-linq4j:1.42.0 (2 constraints: c7128a4b)
+org.apache.calcite.avatica:avatica-core:1.28.0 (3 constraints: 0a2175ce)
+org.apache.calcite.avatica:avatica-metrics:1.28.0 (1 constraints: 9e1058c4)
 org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc)
 org.apache.commons:commons-compress:1.28.0 (3 constraints: a91fa2f4)
 org.apache.commons:commons-configuration2:2.15.1 (1 constraints: 3b053f3b)
 org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236)
-org.apache.commons:commons-lang3:3.20.0 (5 constraints: 3a422d95)
+org.apache.commons:commons-lang3:3.20.0 (4 constraints: ac34c643)
 org.apache.commons:commons-math3:3.6.1 (4 constraints: 9c2589e7)
 org.apache.commons:commons-text:1.15.0 (2 constraints: 681fa0e5)
 org.apache.curator:curator-client:5.9.0 (2 constraints: f01434a4)
@@ -199,8 +199,8 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35)
 org.apache.httpcomponents:httpclient:4.5.14 (10 constraints: 6e9cc932)
 org.apache.httpcomponents:httpcore:4.4.16 (9 constraints: a48fb4f0)
 org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b)
-org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 6520b445)
-org.apache.httpcomponents.core5:httpcore5:5.4.3 (4 constraints: 3e45d254)
+org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 09208a14)
+org.apache.httpcomponents.core5:httpcore5:5.4.3 (4 constraints: 41459656)
 org.apache.httpcomponents.core5:httpcore5-h2:5.4 (1 constraints: df12c515)
 org.apache.kafka:kafka-clients:3.9.2 (13 constraints: 7db456b4)
 org.apache.kafka:kafka-group-coordinator:3.9.2 (2 constraints: aa1748bd)
@@ -272,9 +272,9 @@ org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36)
 org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
-org.checkerframework:checker-qual:3.49.0 (4 constraints: 693aef91)
-org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319)
-org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a)
+org.checkerframework:checker-qual:3.49.0 (4 constraints: 573a3290)
+org.codehaus.janino:commons-compiler:3.1.12 (2 constraints: 85197919)
+org.codehaus.janino:janino:3.1.12 (1 constraints: 8f0d443a)
 org.codehaus.woodstox:stax2-api:4.3.0 (4 constraints: 5d338b6e)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (3 constraints: 193286c8)
 org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161)
@@ -321,6 +321,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0)
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 929b3d90)
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21)
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1)
+org.jooq:joou-java-6:0.9.5 (3 constraints: e32b4b84)
 org.jspecify:jspecify:1.0.0 (8 constraints: 577d1349)
 org.junit:junit-bom:6.1.0 (1 constraints: c0115ade)
 org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
diff --git a/versions.props b/versions.props
index 9227f6fec1ed..cb58609146c6 100644
--- a/versions.props
+++ b/versions.props
@@ -41,8 +41,8 @@ net.bytebuddy:*=1.18.10
 net.java.dev.jna:jna=5.18.1
 net.thisptr:jackson-jq=0.0.13
 no.nav.security:mock-oauth2-server=0.5.10
-org.apache.calcite.avatica:avatica-core=1.25.0
-org.apache.calcite:*=1.37.0
+org.apache.calcite.avatica:avatica-core=1.28.0
+org.apache.calcite:*=1.42.0
 org.apache.commons:commons-collections4=4.5.0
 org.apache.commons:commons-compress=1.28.0
 org.apache.commons:commons-configuration2=2.15.1