diff --git a/solr/licenses/avatica-core-1.23.0.jar.sha1 b/solr/licenses/avatica-core-1.23.0.jar.sha1
deleted file mode 100644
index 1b82a81e7ac..00000000000
--- a/solr/licenses/avatica-core-1.23.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e434691139bff7637983a7a5b9100393d1639d01
diff --git a/solr/licenses/avatica-core-1.24.0.jar.sha1 b/solr/licenses/avatica-core-1.24.0.jar.sha1
new file mode 100644
index 00000000000..4e53b993907
--- /dev/null
+++ b/solr/licenses/avatica-core-1.24.0.jar.sha1
@@ -0,0 +1 @@
+b48b60ebff7c6bf31d8fac234fe5b8cf0d8521b2
diff --git a/solr/licenses/avatica-metrics-1.23.0.jar.sha1 b/solr/licenses/avatica-metrics-1.23.0.jar.sha1
deleted file mode 100644
index 6ccbe42b059..00000000000
--- a/solr/licenses/avatica-metrics-1.23.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4e3da6966845ed3c96c71382c4afc65111dd07d
diff --git a/solr/licenses/avatica-metrics-1.24.0.jar.sha1 b/solr/licenses/avatica-metrics-1.24.0.jar.sha1
new file mode 100644
index 00000000000..718f0b67f2b
--- /dev/null
+++ b/solr/licenses/avatica-metrics-1.24.0.jar.sha1
@@ -0,0 +1 @@
+e5f281e6c6757ca008876304c4cbc2df15ff0a54
diff --git a/solr/licenses/calcite-core-1.35.0.jar.sha1 b/solr/licenses/calcite-core-1.35.0.jar.sha1
deleted file mode 100644
index 6be3a0c88b8..00000000000
--- a/solr/licenses/calcite-core-1.35.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6014fcd74ebe58230becef8265d9b06f5f490a5f
diff --git a/solr/licenses/calcite-core-1.36.0.jar.sha1 b/solr/licenses/calcite-core-1.36.0.jar.sha1
new file mode 100644
index 00000000000..6fa8fe9c255
--- /dev/null
+++ b/solr/licenses/calcite-core-1.36.0.jar.sha1
@@ -0,0 +1 @@
+ce59aedc97cf6fdabc039ed7638997ea3254214c
diff --git a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
deleted file mode 100644
index 8d51929b52d..00000000000
--- a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2484ad1caf702341023883ed500f499aadfc1519
diff --git a/solr/licenses/calcite-linq4j-1.36.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.36.0.jar.sha1
new file mode 100644
index 00000000000..63c9e8f158a
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.36.0.jar.sha1
@@ -0,0 +1 @@
+9d4a9ab0dd314e238e7d48c6a587fe12b6eced5d
diff --git a/solr/licenses/httpclient5-5.1.3.jar.sha1 b/solr/licenses/httpclient5-5.1.3.jar.sha1
deleted file mode 100644
index 48f5bb6e6f5..00000000000
--- a/solr/licenses/httpclient5-5.1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13c984b7b881afcff3a7f0bb95878724a48a4b66
diff --git a/solr/licenses/httpclient5-5.2.1.jar.sha1 b/solr/licenses/httpclient5-5.2.1.jar.sha1
new file mode 100644
index 00000000000..5008d9aae80
--- /dev/null
+++ b/solr/licenses/httpclient5-5.2.1.jar.sha1
@@ -0,0 +1 @@
+0c900514d3446d9ce5d9dbd90c21192048125440
diff --git a/solr/licenses/httpcore5-5.1.3.jar.sha1 b/solr/licenses/httpcore5-5.1.3.jar.sha1
deleted file mode 100644
index 8416ae8502d..00000000000
--- a/solr/licenses/httpcore5-5.1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1638d1e5f2793f187d4144c702a93524ba6fd3b
diff --git a/solr/licenses/httpcore5-5.2.3.jar.sha1 b/solr/licenses/httpcore5-5.2.3.jar.sha1
new file mode 100644
index 00000000000..9a0b58fcbfd
--- /dev/null
+++ b/solr/licenses/httpcore5-5.2.3.jar.sha1
@@ -0,0 +1 @@
+687cede1a44f70c7741abfab6ee2aa53dd2bfb54
diff --git a/solr/licenses/httpcore5-h2-5.1.3.jar.sha1 b/solr/licenses/httpcore5-h2-5.1.3.jar.sha1
deleted file mode 100644
index 4635cae14f4..00000000000
--- a/solr/licenses/httpcore5-h2-5.1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4664b59b09f5ee008e37a963bbb92f4068e91696
diff --git a/solr/licenses/httpcore5-h2-5.2.jar.sha1 b/solr/licenses/httpcore5-h2-5.2.jar.sha1
new file mode 100644
index 00000000000..ff13228a443
--- /dev/null
+++ b/solr/licenses/httpcore5-h2-5.2.jar.sha1
@@ -0,0 +1 @@
+698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16
diff --git a/solr/licenses/jcl-over-slf4j-2.0.11.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.11.jar.sha1
deleted file mode 100644
index f9751d915db..00000000000
--- a/solr/licenses/jcl-over-slf4j-2.0.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6226edb8c85f8c9f1f75ec4b0252c02f589478a
diff --git a/solr/licenses/jul-to-slf4j-2.0.11.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.11.jar.sha1
deleted file mode 100644
index 15a139eda75..00000000000
--- a/solr/licenses/jul-to-slf4j-2.0.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-279356f8e873b1a26badd8bbb3284b5c3b22c770
diff --git a/solr/licenses/slf4j-api-2.0.11.jar.sha1 b/solr/licenses/slf4j-api-2.0.11.jar.sha1
deleted file mode 100644
index a7c5ceb1344..00000000000
--- a/solr/licenses/slf4j-api-2.0.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad96c3f8cf895e696dd35c2bc8e8ebe710be9e6d
diff --git a/versions.lock b/versions.lock
index 03e80843e99..98a0044d277 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,9 +7,9 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
 com.fasterxml.jackson:jackson-bom:2.16.1 (12 constraints: a2fcae61)
-com.fasterxml.jackson.core:jackson-annotations:2.16.1 (10 constraints: f3c2f2fe)
-com.fasterxml.jackson.core:jackson-core:2.16.1 (13 constraints: 97063bf8)
-com.fasterxml.jackson.core:jackson-databind:2.16.1 (18 constraints: e46762e8)
+com.fasterxml.jackson.core:jackson-annotations:2.16.1 (10 constraints: f5c2beff)
+com.fasterxml.jackson.core:jackson-core:2.16.1 (13 constraints: 99068bf8)
+com.fasterxml.jackson.core:jackson-databind:2.16.1 (18 constraints: e6672eea)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.16.1 (2 constraints: 631c9cf1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.16.1 (1 constraints: ba0ead66)
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.1 (2 constraints: aa24d1e0)
@@ -42,9 +42,9 @@ com.google.cloud:google-cloud-core-grpc:2.23.0 (1 constraints: 1b1002a6)
 com.google.cloud:google-cloud-core-http:2.23.0 (1 constraints: 1b1002a6)
 com.google.cloud:google-cloud-storage:2.27.0 (2 constraints: d71c8a27)
 com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)
-com.google.errorprone:error_prone_annotations:2.23.0 (11 constraints: be86b428)
+com.google.errorprone:error_prone_annotations:2.23.0 (11 constraints: ec869aaf)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.1.3-jre (26 constraints: 567bee8c)
+com.google.guava:guava:32.1.3-jre (26 constraints: ec7eeb30)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.43.3 (11 constraints: 3fbf96b4)
 com.google.http-client:google-http-client-apache-v2:1.43.3 (2 constraints: b820e775)
@@ -78,7 +78,7 @@ com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
 com.tdunning:t-digest:3.1 (1 constraints: a804212c)
 com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
 commons-cli:commons-cli:1.6.0 (1 constraints: 09050236)
-commons-codec:commons-codec:1.16.0 (11 constraints: a297a2db)
+commons-codec:commons-codec:1.16.0 (10 constraints: 9684739b)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
 commons-io:commons-io:2.14.0 (9 constraints: a0658a20)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
@@ -166,18 +166,18 @@ net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc)
 net.sourceforge.argparse4j:argparse4j:0.9.0 (1 constraints: 0b050636)
 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.35.0 (1 constraints: 3b05403b)
-org.apache.calcite:calcite-linq4j:1.35.0 (2 constraints: cb12e64b)
-org.apache.calcite.avatica:avatica-core:1.23.0 (3 constraints: fb20cdcb)
-org.apache.calcite.avatica:avatica-metrics:1.23.0 (1 constraints: 991049c4)
+org.apache.calcite:calcite-core:1.36.0 (1 constraints: 3c05433b)
+org.apache.calcite:calcite-linq4j:1.36.0 (2 constraints: cd12154c)
+org.apache.calcite.avatica:avatica-core:1.24.0 (3 constraints: fc2024cc)
+org.apache.calcite.avatica:avatica-metrics:1.24.0 (1 constraints: 9a104cc4)
 org.apache.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
 org.apache.commons:commons-compress:1.25.0 (3 constraints: ff1b66d2)
 org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.4.0 (2 constraints: 031132cf)
-org.apache.commons:commons-lang3:3.14.0 (5 constraints: 9d3e6437)
+org.apache.commons:commons-lang3:3.14.0 (5 constraints: 263fb6b4)
 org.apache.commons:commons-math3:3.6.1 (5 constraints: 57322799)
-org.apache.commons:commons-text:1.10.0 (1 constraints: d911adf8)
+org.apache.commons:commons-text:1.10.0 (2 constraints: 621f5be5)
 org.apache.curator:curator-client:5.5.0 (2 constraints: e81468a3)
 org.apache.curator:curator-framework:5.5.0 (2 constraints: 05144b75)
 org.apache.curator:curator-recipes:5.5.0 (1 constraints: 0c051336)
@@ -190,9 +190,9 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
 org.apache.httpcomponents:httpclient:4.5.14 (9 constraints: 62806342)
 org.apache.httpcomponents:httpcore:4.4.16 (8 constraints: 256d4617)
 org.apache.httpcomponents:httpmime:4.5.14 (3 constraints: eb1bfedc)
-org.apache.httpcomponents.client5:httpclient5:5.1.3 (1 constraints: 6c10bcb3)
-org.apache.httpcomponents.core5:httpcore5:5.1.3 (3 constraints: ff35b9e8)
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 (1 constraints: 3d13093c)
+org.apache.httpcomponents.client5:httpclient5:5.2.1 (1 constraints: 6b10bdb3)
+org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: 40351d23)
+org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
 org.apache.james:apache-mime4j-core:0.8.4 (2 constraints: 981a0d67)
 org.apache.james:apache-mime4j-dom:0.8.4 (1 constraints: 630cf801)
 org.apache.kerby:kerb-core:1.0.1 (5 constraints: 683677dd)
@@ -271,7 +271,7 @@ 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.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.37.0 (5 constraints: 5c4694ee)
+org.checkerframework:checker-qual:3.37.0 (5 constraints: 6e4651f0)
 org.codehaus.janino:commons-compiler:3.1.9 (2 constraints: 3119a8ec)
 org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
 org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 37155caf)
@@ -346,7 +346,7 @@ org.reactivestreams:reactive-streams:1.0.4 (3 constraints: 3f2b77fd)
 org.semver4j:semver4j:5.2.2 (1 constraints: 0b050c36)
 org.slf4j:jcl-over-slf4j:2.0.12 (3 constraints: f917acb5)
 org.slf4j:jul-to-slf4j:2.0.12 (3 constraints: 5328fa5e)
-org.slf4j:slf4j-api:2.0.12 (59 constraints: 7d117436)
+org.slf4j:slf4j-api:2.0.12 (59 constraints: 8111984e)
 org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
 org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
 org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index 9123ce5066f..2548d05dbb7 100644
--- a/versions.props
+++ b/versions.props
@@ -32,8 +32,8 @@ junit:junit=4.13.2
 net.sourceforge.argparse4j:argparse4j=0.9.0
 net.thisptr:jackson-jq=0.0.13
 no.nav.security:mock-oauth2-server=0.5.10
-org.apache.calcite.avatica:avatica-core=1.23.0
-org.apache.calcite:*=1.35.0
+org.apache.calcite.avatica:avatica-core=1.24.0
+org.apache.calcite:*=1.36.0
 org.apache.commons:commons-collections4=4.4
 org.apache.commons:commons-compress=1.25.0
 org.apache.commons:commons-configuration2=2.9.0