Apache Solr open-source search software
Update org.apache.calcite to v1.35.0 (#1815)
Solr Botff6f601822a4
diff --git a/solr/licenses/calcite-core-1.34.0.jar.sha1 b/solr/licenses/calcite-core-1.34.0.jar.sha1deleted file mode 100644index c560453cbfc..00000000000--- a/solr/licenses/calcite-core-1.34.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d0fd918fd56baa3c6ebb34676b9aeeb05ce9d94ddiff --git a/solr/licenses/calcite-core-1.35.0.jar.sha1 b/solr/licenses/calcite-core-1.35.0.jar.sha1new file mode 100644index 00000000000..6be3a0c88b8--- /dev/null+++ b/solr/licenses/calcite-core-1.35.0.jar.sha1@@ -0,0 +1 @@+6014fcd74ebe58230becef8265d9b06f5f490a5fdiff --git a/solr/licenses/calcite-linq4j-1.34.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.34.0.jar.sha1deleted file mode 100644index 86dacd11c46..00000000000--- a/solr/licenses/calcite-linq4j-1.34.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-505eea67a7a11e002c6c760914c369bccef0330bdiff --git a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1new file mode 100644index 00000000000..8d51929b52d--- /dev/null+++ b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1@@ -0,0 +1 @@+2484ad1caf702341023883ed500f499aadfc1519diff --git a/solr/licenses/commons-compiler-3.1.8.jar.sha1 b/solr/licenses/commons-compiler-3.1.8.jar.sha1deleted file mode 100644index 4b5f44e7699..00000000000--- a/solr/licenses/commons-compiler-3.1.8.jar.sha1+++ /dev/null@@ -1 +0,0 @@-93a17483c93f7a5f6ca5c2af7173c9c0841294b2diff --git a/solr/licenses/commons-compiler-3.1.9.jar.sha1 b/solr/licenses/commons-compiler-3.1.9.jar.sha1new file mode 100644index 00000000000..ed7b96ad89e--- /dev/null+++ b/solr/licenses/commons-compiler-3.1.9.jar.sha1@@ -0,0 +1 @@+f0d70bb319e9339aea90a8665693e69848acc598diff --git a/solr/licenses/janino-3.1.8.jar.sha1 b/solr/licenses/janino-3.1.8.jar.sha1deleted file mode 100644index 09e48c471f2..00000000000--- a/solr/licenses/janino-3.1.8.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8dd648976fe0ea36918756b2257b183157d6e543diff --git a/solr/licenses/janino-3.1.9.jar.sha1 b/solr/licenses/janino-3.1.9.jar.sha1new file mode 100644index 00000000000..720933abedd--- /dev/null+++ b/solr/licenses/janino-3.1.9.jar.sha1@@ -0,0 +1 @@+536fb0c44627faae32ca7a8a24734f4aab38c878diff --git a/versions.lock b/versions.lockindex 8b681b8fa53..e327c46bedf 100644--- a/versions.lock+++ b/versions.lock@@ -7,9 +7,9 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraintscom.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)com.epam:parso:2.0.14 (1 constraints: 8e0c750e)com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55)-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6617)-com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42025e28)-com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63008e)+com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6817)+com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42026028)+com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 8c63028e)com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1)com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66)com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0)@@ -42,9 +42,9 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)com.google.code.gson:gson:2.10.1 (6 constraints: 0c5507c0)-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: b689f8ec)+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 8a894b63)com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)-com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)+com.google.guava:guava:32.1.2-jre (25 constraints: 646b5109)com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)@@ -164,8 +164,8 @@ 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.34.0 (1 constraints: 3a053d3b)-org.apache.calcite:calcite-linq4j:1.34.0 (2 constraints: c912b74b)+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.commons:commons-collections4:4.4 (3 constraints: 2a172a57)@@ -269,9 +269,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.37.0 (5 constraints: 12490114)-org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)-org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)+org.checkerframework:checker-qual:3.37.0 (5 constraints: 0e499f13)+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.1 (2 constraints: 36152eaf)org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)diff --git a/versions.props b/versions.propsindex dcb252f6ee2..50389930120 100644--- a/versions.props+++ b/versions.props@@ -32,7 +32,7 @@ net.sourceforge.argparse4j:argparse4j=0.9.0net.thisptr:jackson-jq=0.0.13no.nav.security:mock-oauth2-server=0.5.10org.apache.calcite.avatica:avatica-core=1.23.0-org.apache.calcite:*=1.34.0+org.apache.calcite:*=1.35.0org.apache.commons:commons-collections4=4.4org.apache.commons:commons-compress=1.24.0org.apache.commons:commons-configuration2=2.9.0