Update org.apache.calcite to 1.37.0 (#2140)

(cherry picked from commit ec16d9b)
apache · Jul 18, 2024 · 6f86f2b · 6f86f2b
1 parent 61c229f
commit 6f86f2b
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 32 deletions.
diff --git a/solr/licenses/avatica-core-1.23.0.jar.sha1 b/solr/licenses/avatica-core-1.23.0.jar.sha1
diff --git a/solr/licenses/avatica-core-1.25.0.jar.sha1 b/solr/licenses/avatica-core-1.25.0.jar.sha1
@@ -0,0 +1 @@
+73b9a0e7032a5ae89f294091bc6cbb9a67a21101
diff --git a/solr/licenses/avatica-metrics-1.23.0.jar.sha1 b/solr/licenses/avatica-metrics-1.23.0.jar.sha1
diff --git a/solr/licenses/avatica-metrics-1.25.0.jar.sha1 b/solr/licenses/avatica-metrics-1.25.0.jar.sha1
@@ -0,0 +1 @@
+152f846d9f30a3e026530c2087ecd65c39bb304b
diff --git a/solr/licenses/calcite-core-1.35.0.jar.sha1 b/solr/licenses/calcite-core-1.35.0.jar.sha1
diff --git a/solr/licenses/calcite-core-1.37.0.jar.sha1 b/solr/licenses/calcite-core-1.37.0.jar.sha1
@@ -0,0 +1 @@
+537a3281dfefbd7939d27785732a2aafddd3abcb
diff --git a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
diff --git a/solr/licenses/calcite-linq4j-1.37.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.37.0.jar.sha1
@@ -0,0 +1 @@
+92446d8dfc8e57289e6120a7efc6932650ed3410
diff --git a/solr/licenses/commons-compiler-3.1.11.jar.sha1 b/solr/licenses/commons-compiler-3.1.11.jar.sha1
@@ -0,0 +1 @@
+19d5bfd402f91de0e670ef5783bf5c0a3f5ab478
diff --git a/solr/licenses/commons-compiler-3.1.9.jar.sha1 b/solr/licenses/commons-compiler-3.1.9.jar.sha1
diff --git a/solr/licenses/httpclient5-5.1.3.jar.sha1 b/solr/licenses/httpclient5-5.1.3.jar.sha1
diff --git a/solr/licenses/httpclient5-5.2.1.jar.sha1 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
diff --git a/solr/licenses/httpcore5-5.2.3.jar.sha1 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
diff --git a/solr/licenses/httpcore5-h2-5.2.jar.sha1 b/solr/licenses/httpcore5-h2-5.2.jar.sha1
@@ -0,0 +1 @@
+698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16
diff --git a/solr/licenses/janino-3.1.11.jar.sha1 b/solr/licenses/janino-3.1.11.jar.sha1
@@ -0,0 +1 @@
+878a02f3ab98d37206c9852c025a46b86dc882d0
diff --git a/solr/licenses/janino-3.1.9.jar.sha1 b/solr/licenses/janino-3.1.9.jar.sha1
diff --git 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.17.2 (12 constraints: bafcbe83)
-com.fasterxml.jackson.core:jackson-annotations:2.17.2 (10 constraints: ffc2cf0f)
-com.fasterxml.jackson.core:jackson-core:2.17.2 (13 constraints: aa067718)
-com.fasterxml.jackson.core:jackson-databind:2.17.2 (18 constraints: f667f314)
+com.fasterxml.jackson.core:jackson-annotations:2.17.2 (10 constraints: 03c3c711)
+com.fasterxml.jackson.core:jackson-core:2.17.2 (13 constraints: ae067719)
+com.fasterxml.jackson.core:jackson-databind:2.17.2 (18 constraints: fa67eb18)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 (2 constraints: 651ca0f1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.2 (1 constraints: bc0eb166)
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.17.2 (2 constraints: ac2451e1)
@@ -42,9 +42,9 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6)
 com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6)
 com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626)
 com.google.code.gson:gson:2.11.0 (7 constraints: 88614316)
-com.google.errorprone:error_prone_annotations:2.28.0 (15 constraints: 77c56493)
+com.google.errorprone:error_prone_annotations:2.28.0 (15 constraints: a5c51259)
 com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37)
-com.google.guava:guava:33.1.0-jre (26 constraints: 6c7c6e96)
+com.google.guava:guava:33.1.0-jre (26 constraints: 0280374a)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
 com.google.http-client:google-http-client:1.44.2 (11 constraints: 45bf29b8)
 com.google.http-client:google-http-client-apache-v2:1.44.2 (2 constraints: b9201d76)
@@ -63,7 +63,7 @@ com.healthmarketscience.jackcess:jackcess:4.0.2 (1 constraints: 5d0cf201)
 com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1 (1 constraints: 5c0cf101)
 com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484)
 com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830)
-com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6d12c02c)
+com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6f12c62c)
 com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36)
 com.mchange:c3p0:0.9.5.5 (1 constraints: c80c571b)
 com.mchange:mchange-commons-java:0.2.19 (1 constraints: 84075b75)
@@ -78,9 +78,9 @@ com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
 com.tdunning:t-digest:3.3 (1 constraints: aa04232c)
 com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
 commons-cli:commons-cli:1.8.0 (1 constraints: 0b050836)
-commons-codec:commons-codec:1.17.1 (12 constraints: 05a86a97)
+commons-codec:commons-codec:1.17.1 (11 constraints: 5a953ac4)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
-commons-io:commons-io:2.15.1 (10 constraints: 4375f24a)
+commons-io:commons-io:2.15.1 (10 constraints: 47759e4f)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
 edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
 edu.ucar:grib:4.5.5 (1 constraints: 650c0402)
@@ -174,18 +174,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.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.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
 org.apache.commons:commons-compress:1.26.1 (3 constraints: 011cf2d2)
 org.apache.commons:commons-configuration2:2.11.0 (1 constraints: 3605323b)
 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 (6 constraints: 414e7de4)
+org.apache.commons:commons-lang3:3.14.0 (6 constraints: cb4ea57a)
 org.apache.commons:commons-math3:3.6.1 (5 constraints: 57322799)
-org.apache.commons:commons-text:1.12.0 (1 constraints: db11b3f8)
+org.apache.commons:commons-text:1.12.0 (2 constraints: 651f97e5)
 org.apache.curator:curator-client:5.7.0 (2 constraints: ec14cea3)
 org.apache.curator:curator-framework:5.7.0 (2 constraints: 0914ad75)
 org.apache.curator:curator-recipes:5.7.0 (1 constraints: 0e051936)
@@ -198,9 +198,9 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0 (1 constraints: 0505f635)
 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)
@@ -280,9 +280,9 @@ 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.44.0 (5 constraints: 5a4628ee)
-org.codehaus.janino:commons-compiler:3.1.9 (2 constraints: 3119a8ec)
-org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
+org.checkerframework:checker-qual:3.44.0 (5 constraints: 6c46e5ef)
+org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319)
+org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a)
 org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 38155daf)
 org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
@@ -355,7 +355,7 @@ org.reactivestreams:reactive-streams:1.0.4 (4 constraints: 073bf033)
 org.semver4j:semver4j:5.3.0 (1 constraints: 0a050d36)
 org.slf4j:jcl-over-slf4j:2.0.13 (3 constraints: fa17e8b5)
 org.slf4j:jul-to-slf4j:2.0.13 (3 constraints: 54285f5f)
-org.slf4j:slf4j-api:2.0.13 (62 constraints: 9838ab87)
+org.slf4j:slf4j-api:2.0.13 (62 constraints: 9d3824a7)
 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
@@ -34,8 +34,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.25.0
+org.apache.calcite:*=1.37.0
 org.apache.commons:commons-collections4=4.4
 org.apache.commons:commons-compress=1.26.1
 org.apache.commons:commons-configuration2=2.11.0