Apache Solr open-source search software
Update org.apache.calcite:* to v1.33.0 and org.apache.calcite.avatica:* to v1.23.0 (#1420)
Solr Bot7215e20c89e3
diff --git a/solr/licenses/avatica-core-1.22.0.jar.sha1 b/solr/licenses/avatica-core-1.22.0.jar.sha1deleted file mode 100644index 0a92d9b195a..00000000000--- a/solr/licenses/avatica-core-1.22.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bc9b74c057f16201262e7c3cceb66e9e60e41cb9diff --git a/solr/licenses/avatica-core-1.23.0.jar.sha1 b/solr/licenses/avatica-core-1.23.0.jar.sha1new file mode 100644index 00000000000..1b82a81e7ac--- /dev/null+++ b/solr/licenses/avatica-core-1.23.0.jar.sha1@@ -0,0 +1 @@+e434691139bff7637983a7a5b9100393d1639d01diff --git a/solr/licenses/avatica-metrics-1.22.0.jar.sha1 b/solr/licenses/avatica-metrics-1.22.0.jar.sha1deleted file mode 100644index 6362d50ec63..00000000000--- a/solr/licenses/avatica-metrics-1.22.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-98a5c7ff9a867796deb6bca268d206b15d09c1e6diff --git a/solr/licenses/avatica-metrics-1.23.0.jar.sha1 b/solr/licenses/avatica-metrics-1.23.0.jar.sha1new file mode 100644index 00000000000..6ccbe42b059--- /dev/null+++ b/solr/licenses/avatica-metrics-1.23.0.jar.sha1@@ -0,0 +1 @@+e4e3da6966845ed3c96c71382c4afc65111dd07ddiff --git a/solr/licenses/calcite-core-1.32.0.jar.sha1 b/solr/licenses/calcite-core-1.32.0.jar.sha1deleted file mode 100644index 2dae5723372..00000000000--- a/solr/licenses/calcite-core-1.32.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-984545fa6d4c4d141a6f488d170df55ad1312be1diff --git a/solr/licenses/calcite-core-1.33.0.jar.sha1 b/solr/licenses/calcite-core-1.33.0.jar.sha1new file mode 100644index 00000000000..7d68512630d--- /dev/null+++ b/solr/licenses/calcite-core-1.33.0.jar.sha1@@ -0,0 +1 @@+fdafcde5c8ca58fc77064d1409ea5bb22c11f5d7diff --git a/solr/licenses/calcite-linq4j-1.32.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.32.0.jar.sha1deleted file mode 100644index cafde3fca6e..00000000000--- a/solr/licenses/calcite-linq4j-1.32.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-fdf36eb703ed957959efe0ae2f6385bbe9f0d270diff --git a/solr/licenses/calcite-linq4j-1.33.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.33.0.jar.sha1new file mode 100644index 00000000000..8413d5adea6--- /dev/null+++ b/solr/licenses/calcite-linq4j-1.33.0.jar.sha1@@ -0,0 +1 @@+3db9044dc15873cb7e4eb866246fd5cfbfe9779ddiff --git a/solr/licenses/proj4j-1.1.5.jar.sha1 b/solr/licenses/proj4j-1.1.5.jar.sha1deleted file mode 100644index 1509048b44e..00000000000--- a/solr/licenses/proj4j-1.1.5.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a494a0e5e85eac03c0d5d0f95ed0eee4f520fb58diff --git a/solr/licenses/proj4j-1.2.2.jar.sha1 b/solr/licenses/proj4j-1.2.2.jar.sha1new file mode 100644index 00000000000..fc4c6b7ef20--- /dev/null+++ b/solr/licenses/proj4j-1.2.2.jar.sha1@@ -0,0 +1 @@+6eb2c27f1b7d048a6912a42a0637e470cdc46562diff --git a/versions.lock b/versions.lockindex 83fdf58aa05..c0ee9d03b19 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.14.2 (12 constraints: 42f8fc44)-com.fasterxml.jackson.core:jackson-annotations:2.14.2 (10 constraints: 90be220d)-com.fasterxml.jackson.core:jackson-core:2.14.2 (13 constraints: 33028017)-com.fasterxml.jackson.core:jackson-databind:2.14.2 (18 constraints: d2639d24)+com.fasterxml.jackson.core:jackson-annotations:2.14.2 (10 constraints: 95be250f)+com.fasterxml.jackson.core:jackson-core:2.14.2 (13 constraints: 38024d18)+com.fasterxml.jackson.core:jackson-databind:2.14.2 (18 constraints: 78638fbe)com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.2 (1 constraints: b90ea866)com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.2 (2 constraints: a52484e0)com.fasterxml.woodstox:woodstox-core:6.5.0 (3 constraints: ab2868b8)@@ -53,7 +53,7 @@ com.google.http-client:google-http-client-gson:1.42.3 (6 constraints: f0616ba0)com.google.http-client:google-http-client-jackson2:1.42.3 (1 constraints: 1e1004a6)com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)-com.google.protobuf:protobuf-java:3.21.10 (11 constraints: c29697da)+com.google.protobuf:protobuf-java:3.21.10 (11 constraints: c59603db)com.google.protobuf:protobuf-java-util:3.21.10 (3 constraints: ba2b3997)com.google.re2j:re2j:1.7 (2 constraints: 3814d46f)com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)@@ -164,17 +164,17 @@ 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.5.1-1 (1 constraints: 2810eea6)-org.apache.calcite:calcite-core:1.32.0 (1 constraints: 3805373b)-org.apache.calcite:calcite-linq4j:1.32.0 (2 constraints: c512594b)-org.apache.calcite.avatica:avatica-core:1.22.0 (3 constraints: f82045cb)-org.apache.calcite.avatica:avatica-metrics:1.22.0 (1 constraints: 981046c4)+org.apache.calcite:calcite-core:1.33.0 (1 constraints: 39053a3b)+org.apache.calcite:calcite-linq4j:1.33.0 (2 constraints: c712884b)+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)org.apache.commons:commons-compress:1.22 (3 constraints: 9e1b5bae)org.apache.commons:commons-configuration2:2.8.0 (1 constraints: 0c050d36)org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)org.apache.commons:commons-lang3:3.12.0 (5 constraints: 9b3e0e36)-org.apache.commons:commons-math3:3.6.1 (4 constraints: 93247039)+org.apache.commons:commons-math3:3.6.1 (5 constraints: f431a634)org.apache.commons:commons-text:1.10.0 (2 constraints: 861680f8)org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)@@ -329,7 +329,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (3 constraints: 582c9186)org.junit:junit-bom:5.9.1 (1 constraints: c8116ede)org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)-org.locationtech.proj4j:proj4j:1.1.5 (1 constraints: 5f0daf2c)+org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: 59105498)org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)org.openjdk.jmh:jmh-core:1.36 (1 constraints: de04fb30)diff --git a/versions.props b/versions.propsindex 3f15079a0c2..c67b91ac545 100644--- a/versions.props+++ b/versions.props@@ -33,8 +33,8 @@ net.bytebuddy:byte-buddy=1.9.3net.sourceforge.argparse4j:argparse4j=0.9.0net.thisptr:jackson-jq=0.0.13no.nav.security:mock-oauth2-server=0.4.3-org.apache.calcite.avatica:avatica-core=1.22.0-org.apache.calcite:*=1.32.0+org.apache.calcite.avatica:avatica-core=1.23.0+org.apache.calcite:*=1.33.0org.apache.commons:commons-collections4=4.4org.apache.commons:commons-compress=1.22org.apache.commons:commons-configuration2=2.8.0