Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/PR#3119-update-org-apache-calcite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Update org.apache.calcite
type: dependency_update
authors:
- name: solrbot
links:
- name: PR#3119
url: https://github.com/apache/solr/pull/3119
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ antora = "3.1.12"
antora-default-ui = "782311344b54aaa734d4c86629b8cd75e4da36d6"
# @keep Antora Lunr extensions version used in ref-guide
antora-lunr-extension = "1.0.0-alpha.10"
apache-calcite = "1.37.0"
apache-calcite-avatica = "1.25.0"
apache-calcite = "1.41.0"
apache-calcite-avatica = "1.27.0"
apache-commons-collections4 = "4.5.0"
apache-commons-compress = "1.28.0"
apache-commons-configuration2 = "2.12.0"
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/avatica-core-1.25.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/avatica-core-1.27.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
59990a6fd24dc7f398fcb06cdd570a99de7a7c4f
1 change: 0 additions & 1 deletion solr/licenses/avatica-metrics-1.25.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/avatica-metrics-1.27.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c7f6fd9e073a0681e68ef9ed12796f49f8392df2
1 change: 0 additions & 1 deletion solr/licenses/calcite-core-1.37.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/calcite-core-1.41.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0dd7b4be638f0cea174f78cc851322b64d813a1e
1 change: 0 additions & 1 deletion solr/licenses/calcite-linq4j-1.37.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/calcite-linq4j-1.41.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd399fb76918f6f688b458da2f1c8dd7fc07e3f8
1 change: 0 additions & 1 deletion solr/licenses/commons-compiler-3.1.11.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/commons-compiler-3.1.12.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0501779107b06a981ff359eab7369ff7a2bf077e
1 change: 0 additions & 1 deletion solr/licenses/httpclient5-5.2.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/httpclient5-5.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4b3d253351cf74eb0ae8eb21ca5a5fb9815ef861
1 change: 0 additions & 1 deletion solr/licenses/httpcore5-5.2.3.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/httpcore5-5.3.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
172790b48b0d8cb5d74f28dcf712b5e5a70c3440
1 change: 0 additions & 1 deletion solr/licenses/httpcore5-h2-5.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/httpcore5-h2-5.3.4.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3742a9a9ba3a5a0d45be230093b52a1302a561e2
1 change: 0 additions & 1 deletion solr/licenses/janino-3.1.11.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/janino-3.1.12.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ffcd3dfa84057ef76092b6b66c53871a97ae40b8
1 change: 1 addition & 0 deletions solr/licenses/joou-java-6-0.9.4.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d7e3ec7fbba4616cb61f1b1627348fa9fe16a541
19 changes: 10 additions & 9 deletions solr/modules/sql/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.25.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.25.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite:calcite-core:1.37.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.37.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.27.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.27.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite:calcite-core:1.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-text:1.15.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.3.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath
Expand Down Expand Up @@ -138,8 +138,8 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath
org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath
org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.janino:janino:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.janino:janino:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down Expand Up @@ -174,6 +174,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtim
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.immutables:value-annotations:2.10.1=compileClasspath,compileOnlyHelper,jarValidation
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jooq:joou-java-6:0.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
Expand Down
19 changes: 10 additions & 9 deletions solr/solr-ref-guide/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.25.0=testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.25.0=testRuntimeClasspath
org.apache.calcite:calcite-core:1.37.0=testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.37.0=testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.27.0=testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.27.0=testRuntimeClasspath
org.apache.calcite:calcite-core:1.41.0=testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.41.0=testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=testRuntimeClasspath
org.apache.commons:commons-math3:3.6.1=testRuntimeClasspath
org.apache.commons:commons-text:1.15.0=testRuntimeClasspath
org.apache.curator:curator-client:5.9.0=testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.9.0=testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.9.0=testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.2.1=testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.2=testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.2.3=testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.5=testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.3.5=testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=testRuntimeClasspath
Expand Down Expand Up @@ -123,8 +123,8 @@ org.apache.zookeeper:zookeeper-jute:3.9.4=testCompileClasspath,testRuntimeClassp
org.apache.zookeeper:zookeeper:3.9.4=testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.11=testRuntimeClasspath
org.codehaus.janino:janino:3.1.11=testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.12=testRuntimeClasspath
org.codehaus.janino:janino:3.1.12=testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.27=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=testRuntimeClasspath
Expand Down Expand Up @@ -158,6 +158,7 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.11=testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=testRuntimeClasspath
org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=testRuntimeClasspath
org.jooq:joou-java-6:0.9.4=testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.6.2=testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=testRuntimeClasspath
Expand Down
19 changes: 10 additions & 9 deletions solr/solrj-streaming/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,testRuntime
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.25.0=jarValidation,testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.25.0=jarValidation,testRuntimeClasspath
org.apache.calcite:calcite-core:1.37.0=jarValidation,testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.37.0=jarValidation,testRuntimeClasspath
org.apache.calcite.avatica:avatica-core:1.27.0=jarValidation,testRuntimeClasspath
org.apache.calcite.avatica:avatica-metrics:1.27.0=jarValidation,testRuntimeClasspath
org.apache.calcite:calcite-core:1.41.0=jarValidation,testRuntimeClasspath
org.apache.calcite:calcite-linq4j:1.41.0=jarValidation,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=jarValidation,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspath
org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.15.0=jarValidation,testRuntimeClasspath
org.apache.curator:curator-client:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.5=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=jarValidation,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.3.5=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath
Expand Down Expand Up @@ -122,8 +122,8 @@ org.apache.zookeeper:zookeeper-jute:3.9.4=jarValidation,testCompileClasspath,tes
org.apache.zookeeper:zookeeper:3.9.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=jarValidation,testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.11=jarValidation,testRuntimeClasspath
org.codehaus.janino:janino:3.1.11=jarValidation,testRuntimeClasspath
org.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspath
org.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,runtimeClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -158,6 +158,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,testRu
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.hsqldb:hsqldb:2.7.4=jarValidation,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath
org.jooq:joou-java-6:0.9.4=jarValidation,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
Expand Down
Loading