Apache Solr open-source search software
Update Google Cloud (#4848)
Solr Bot406fca5fb7e8
diff --git a/changelog/unreleased/PR#4848-update-google-cloud.yml b/changelog/unreleased/PR#4848-update-google-cloud.ymlnew file mode 100644index 00000000000..e53878ba0b2--- /dev/null+++ b/changelog/unreleased/PR#4848-update-google-cloud.yml@@ -0,0 +1,7 @@+title: Update Google Cloud+type: dependency_update+authors:+- name: solrbot+links:+- name: PR#4848+ url: https://github.com/apache/solr/pull/4848diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 607ed54ecfe..f064afa7993 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -95,10 +95,10 @@ fasterxml-woodstox = "7.2.1"# @keep Flexmark used in classpathflexmark = "0.64.8"# @keep for version alignment-google-api-grpc-proto = "2.74.0"+google-api-grpc-proto = "2.75.0"# @keep for version alignmentgoogle-autovalue = "1.11.1"-google-cloud-bom = "0.267.0"+google-cloud-bom = "0.268.0"google-errorprone = "2.41.0"# @keep for version alignmentgoogle-gson = "2.14.0"diff --git a/solr/licenses/api-common-2.66.0.jar.sha1 b/solr/licenses/api-common-2.66.0.jar.sha1deleted file mode 100644index 6bdbbad4997..00000000000--- a/solr/licenses/api-common-2.66.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4c84be5a666044546fd024bbb101fb700beb856ddiff --git a/solr/licenses/api-common-2.67.0.jar.sha1 b/solr/licenses/api-common-2.67.0.jar.sha1new file mode 100644index 00000000000..c83cdb81c1d--- /dev/null+++ b/solr/licenses/api-common-2.67.0.jar.sha1@@ -0,0 +1 @@+d62a4b61a75548c0ee16b9e6861ee8c93ead5440diff --git a/solr/licenses/conscrypt-openjdk-uber-2.6.0.jar.sha1 b/solr/licenses/conscrypt-openjdk-uber-2.6.0.jar.sha1deleted file mode 100644index e4c2749637b..00000000000--- a/solr/licenses/conscrypt-openjdk-uber-2.6.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-90c4e599306175dddbc9c0b64edc5d31c6d52a1adiff --git a/solr/licenses/conscrypt-openjdk-uber-2.6.2.jar.sha1 b/solr/licenses/conscrypt-openjdk-uber-2.6.2.jar.sha1new file mode 100644index 00000000000..ad5ba27190f--- /dev/null+++ b/solr/licenses/conscrypt-openjdk-uber-2.6.2.jar.sha1@@ -0,0 +1 @@+65c5977595ee9cc12e6017b9d43b1d2e3d1bab63diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.71.0.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.71.0.jar.sha1deleted file mode 100644index 70f616ba6c7..00000000000--- a/solr/licenses/gapic-google-cloud-storage-v2-2.71.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-db1bea8b030b794e6fa447a8058e18cd4f6d797adiff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.72.0.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.72.0.jar.sha1new file mode 100644index 00000000000..8639875aea2--- /dev/null+++ b/solr/licenses/gapic-google-cloud-storage-v2-2.72.0.jar.sha1@@ -0,0 +1 @@+3fb21e9dca8701a573db5bc76e4c42bb22d05135diff --git a/solr/licenses/gax-2.83.0.jar.sha1 b/solr/licenses/gax-2.83.0.jar.sha1deleted file mode 100644index ee799885825..00000000000--- a/solr/licenses/gax-2.83.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b6f4ddcf84e106bbd833541aad5ead50feb7d3e7diff --git a/solr/licenses/gax-2.84.0.jar.sha1 b/solr/licenses/gax-2.84.0.jar.sha1new file mode 100644index 00000000000..c008153937e--- /dev/null+++ b/solr/licenses/gax-2.84.0.jar.sha1@@ -0,0 +1 @@+9a20326c415957d7404ebde2e949cf2b8da7718adiff --git a/solr/licenses/gax-grpc-2.83.0.jar.sha1 b/solr/licenses/gax-grpc-2.83.0.jar.sha1deleted file mode 100644index c819cb4e4f4..00000000000--- a/solr/licenses/gax-grpc-2.83.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0109627cc4fffab86291c27813842e9669eb5ca8diff --git a/solr/licenses/gax-grpc-2.84.0.jar.sha1 b/solr/licenses/gax-grpc-2.84.0.jar.sha1new file mode 100644index 00000000000..49c1846a5a6--- /dev/null+++ b/solr/licenses/gax-grpc-2.84.0.jar.sha1@@ -0,0 +1 @@+649de22bde1d660941cf385fdfefe031cf272435diff --git a/solr/licenses/gax-httpjson-2.83.0.jar.sha1 b/solr/licenses/gax-httpjson-2.83.0.jar.sha1deleted file mode 100644index aa018702505..00000000000--- a/solr/licenses/gax-httpjson-2.83.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-00cd6c63e021f92c357af2b6079271405efb5122diff --git a/solr/licenses/gax-httpjson-2.84.0.jar.sha1 b/solr/licenses/gax-httpjson-2.84.0.jar.sha1new file mode 100644index 00000000000..0af18359f3f--- /dev/null+++ b/solr/licenses/gax-httpjson-2.84.0.jar.sha1@@ -0,0 +1 @@+ff79f15d5073c6da0d0b597241602ef3f24e538ediff --git a/solr/licenses/google-auth-library-credentials-1.50.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.50.0.jar.sha1deleted file mode 100644index efa28e2eade..00000000000--- a/solr/licenses/google-auth-library-credentials-1.50.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ab4b3f13b658ed03793e1ced1303a021e745b071diff --git a/solr/licenses/google-auth-library-credentials-1.51.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.51.0.jar.sha1new file mode 100644index 00000000000..a285d097e26--- /dev/null+++ b/solr/licenses/google-auth-library-credentials-1.51.0.jar.sha1@@ -0,0 +1 @@+806342224c6afd70d3c7c6dc3d68928a032ce266diff --git a/solr/licenses/google-auth-library-oauth2-http-1.50.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.50.0.jar.sha1deleted file mode 100644index 8d77decdf73..00000000000--- a/solr/licenses/google-auth-library-oauth2-http-1.50.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8982eca763682709a533740544191fcc966e6032diff --git a/solr/licenses/google-auth-library-oauth2-http-1.51.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.51.0.jar.sha1new file mode 100644index 00000000000..777c789b6e9--- /dev/null+++ b/solr/licenses/google-auth-library-oauth2-http-1.51.0.jar.sha1@@ -0,0 +1 @@+9e4070b228d1159c09e6becb2fe6b3dae81e3a61diff --git a/solr/licenses/google-cloud-core-2.73.0.jar.sha1 b/solr/licenses/google-cloud-core-2.73.0.jar.sha1deleted file mode 100644index f17c4024a5f..00000000000--- a/solr/licenses/google-cloud-core-2.73.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a607d12b9d3a78939b33fe9d93266dc6b6997626diff --git a/solr/licenses/google-cloud-core-2.74.0.jar.sha1 b/solr/licenses/google-cloud-core-2.74.0.jar.sha1new file mode 100644index 00000000000..def7383d1fa--- /dev/null+++ b/solr/licenses/google-cloud-core-2.74.0.jar.sha1@@ -0,0 +1 @@+d5db8cc3f209c9fe622afc486be3e0a09142664ediff --git a/solr/licenses/google-cloud-core-grpc-2.73.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.73.0.jar.sha1deleted file mode 100644index 991eb30f049..00000000000--- a/solr/licenses/google-cloud-core-grpc-2.73.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4f5014903395552ad259a015adca35af19d7e748diff --git a/solr/licenses/google-cloud-core-grpc-2.74.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.74.0.jar.sha1new file mode 100644index 00000000000..31804f0d72c--- /dev/null+++ b/solr/licenses/google-cloud-core-grpc-2.74.0.jar.sha1@@ -0,0 +1 @@+98fe8dbf348b8c85de9f326c2c110515025fa2b6diff --git a/solr/licenses/google-cloud-core-http-2.73.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.73.0.jar.sha1deleted file mode 100644index 7749d9b516a..00000000000--- a/solr/licenses/google-cloud-core-http-2.73.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-630f144cbb469bbb41420d7da432a4fb3d107b39diff --git a/solr/licenses/google-cloud-core-http-2.74.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.74.0.jar.sha1new file mode 100644index 00000000000..e48fbca39bb--- /dev/null+++ b/solr/licenses/google-cloud-core-http-2.74.0.jar.sha1@@ -0,0 +1 @@+30d2a07d5e1c9c7ce1b0546e4963f33eccd9da63diff --git a/solr/licenses/google-cloud-nio-0.135.0.jar.sha1 b/solr/licenses/google-cloud-nio-0.135.0.jar.sha1deleted file mode 100644index c8ff2319938..00000000000--- a/solr/licenses/google-cloud-nio-0.135.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-46939b6f2eed6b5d1e7bc4f3c64dec9ed4fe28a8diff --git a/solr/licenses/google-cloud-nio-0.136.0.jar.sha1 b/solr/licenses/google-cloud-nio-0.136.0.jar.sha1new file mode 100644index 00000000000..fe16cb2c49e--- /dev/null+++ b/solr/licenses/google-cloud-nio-0.136.0.jar.sha1@@ -0,0 +1 @@+a481749948548980a4cb6aed1862a1f3f9d67126diff --git a/solr/licenses/google-cloud-storage-2.71.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.71.0.jar.sha1deleted file mode 100644index da867d31da1..00000000000--- a/solr/licenses/google-cloud-storage-2.71.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-df92b44161a9b882e45660007e515536cf11b7f0diff --git a/solr/licenses/google-cloud-storage-2.72.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.72.0.jar.sha1new file mode 100644index 00000000000..f51ad3b6121--- /dev/null+++ b/solr/licenses/google-cloud-storage-2.72.0.jar.sha1@@ -0,0 +1 @@+58653d77eddcdd8a1d0e83cafd18c6b032f79ea8diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.71.0.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.71.0.jar.sha1deleted file mode 100644index d1e43fcd634..00000000000--- a/solr/licenses/grpc-google-cloud-storage-v2-2.71.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-190eb35f4cb1ea09851c1fe79aa6ba2c004dd192diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.72.0.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.72.0.jar.sha1new file mode 100644index 00000000000..49d00f97e24--- /dev/null+++ b/solr/licenses/grpc-google-cloud-storage-v2-2.72.0.jar.sha1@@ -0,0 +1 @@+6c2431ea12f11de3292da986c1662f22ac40fcd4diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.71.0.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.71.0.jar.sha1deleted file mode 100644index 0b3db3382a5..00000000000--- a/solr/licenses/proto-google-cloud-storage-v2-2.71.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-cd6d9f5efb9222ba79262d14d6187678e0935139diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.72.0.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.72.0.jar.sha1new file mode 100644index 00000000000..ccfaf9c6616--- /dev/null+++ b/solr/licenses/proto-google-cloud-storage-v2-2.72.0.jar.sha1@@ -0,0 +1 @@+83aa8b19bc60d9c3e3e81f12d46ee27ee2c63a3adiff --git a/solr/licenses/proto-google-common-protos-2.74.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.74.0.jar.sha1deleted file mode 100644index 6e1104c9ee1..00000000000--- a/solr/licenses/proto-google-common-protos-2.74.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-82ca61e9ae4bb00035d4d06a0c4512b2dd9b6c7ddiff --git a/solr/licenses/proto-google-common-protos-2.75.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.75.0.jar.sha1new file mode 100644index 00000000000..8ca414b0fd7--- /dev/null+++ b/solr/licenses/proto-google-common-protos-2.75.0.jar.sha1@@ -0,0 +1 @@+fa3362c7229100fdb6f67ebd04f57d1785fee766diff --git a/solr/licenses/proto-google-iam-v1-1.69.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.69.0.jar.sha1deleted file mode 100644index 7be1cd5815f..00000000000--- a/solr/licenses/proto-google-iam-v1-1.69.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-04ea23ad467fc4d523c08c1bb0fec347dabbd8dcdiff --git a/solr/licenses/proto-google-iam-v1-1.70.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.70.0.jar.sha1new file mode 100644index 00000000000..4329b2ba95b--- /dev/null+++ b/solr/licenses/proto-google-iam-v1-1.70.0.jar.sha1@@ -0,0 +1 @@+084b63426f64fa1fde457340f314f5b691fc6d58diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex 54918d7719d..9b480a83272 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -18,27 +18,27 @@ com.github.ben-manes.caffeine:caffeine:3.2.4=annotationProcessor,errorprone,jarVcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathcom.google.api-client:google-api-client:2.7.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api.grpc:gapic-google-cloud-storage-v2:2.71.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api.grpc:grpc-google-cloud-storage-v2:2.71.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api.grpc:proto-google-cloud-storage-v2:2.71.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api.grpc:proto-google-common-protos:2.74.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api.grpc:proto-google-iam-v1:1.69.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api:api-common:2.66.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api:gax-grpc:2.83.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api:gax-httpjson:2.83.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.api:gax:2.83.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api.grpc:gapic-google-cloud-storage-v2:2.72.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api.grpc:grpc-google-cloud-storage-v2:2.72.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api.grpc:proto-google-cloud-storage-v2:2.72.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api.grpc:proto-google-common-protos:2.75.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api.grpc:proto-google-iam-v1:1.70.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api:api-common:2.67.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api:gax-grpc:2.84.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api:gax-httpjson:2.84.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.api:gax:2.84.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.apis:google-api-services-storage:v1-rev20260524-2.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.auth:google-auth-library-credentials:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.auth:google-auth-library-oauth2-http:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.auth:google-auth-library-credentials:1.51.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.auth:google-auth-library-oauth2-http:1.51.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.cloud:google-cloud-bom:0.267.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.cloud:google-cloud-core-grpc:2.73.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.cloud:google-cloud-core-http:2.73.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.cloud:google-cloud-core:2.73.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.cloud:google-cloud-nio:0.135.0=jarValidation,testCompileClasspath,testRuntimeClasspath-com.google.cloud:google-cloud-storage:2.71.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-bom:0.268.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-core-grpc:2.74.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-core-http:2.74.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-core:2.74.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-nio:0.136.0=jarValidation,testCompileClasspath,testRuntimeClasspath+com.google.cloud:google-cloud-storage:2.72.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.code.gson:gson:2.14.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath@@ -175,7 +175,7 @@ org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClassorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.checkerframework:checker-qual:4.2.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.conscrypt:conscrypt-openjdk-uber:2.6.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.conscrypt:conscrypt-openjdk-uber:2.6.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspathdiff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfileindex 2a0144af510..140406144c3 100644--- a/solr/ui/gradle.lockfile+++ b/solr/ui/gradle.lockfile@@ -343,26 +343,26 @@ org.jetbrains.compose.ui:ui-wasm-js:1.11.1=wasmJsCompileClasspath,wasmJsNpmAggreorg.jetbrains.compose.ui:ui:1.10.0=composeHotReloadDevToolsorg.jetbrains.compose.ui:ui:1.11.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.kotlin:kotlin-build-tools-api:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath-org.jetbrains.kotlin:kotlin-build-tools-api:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-build-tools-api:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-build-tools-compat:2.4.0=kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspathorg.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-build-tools-impl:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath-org.jetbrains.kotlin:kotlin-build-tools-impl:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-build-tools-impl:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-compiler-embeddable:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-compiler-runner:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath-org.jetbrains.kotlin:kotlin-compiler-runner:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-compiler-runner:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.4.0=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTestorg.jetbrains.kotlin:kotlin-daemon-client:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath-org.jetbrains.kotlin:kotlin-daemon-client:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-daemon-client:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-daemon-embeddable:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.4.0=kotlinKlibCommonizerClasspathorg.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspathorg.jetbrains.kotlin:kotlin-reflect:2.3.21=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspathorg.jetbrains.kotlin:kotlin-script-runtime:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath-org.jetbrains.kotlin:kotlin-script-runtime:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-script-runtime:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-scripting-common:2.4.0=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTestorg.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.4.0=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTestorg.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.4.0=kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest@@ -375,12 +375,12 @@ org.jetbrains.kotlin:kotlin-stdlib-wasm-js:2.4.0=wasmJsCompileClasspath,wasmJsNporg.jetbrains.kotlin:kotlin-stdlib:2.1.21=composeHotReloadRuntimeorg.jetbrains.kotlin:kotlin-stdlib:2.2.21=composeHotReloadDevToolsorg.jetbrains.kotlin:kotlin-stdlib:2.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathJvmDev,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-org.jetbrains.kotlin:kotlin-stdlib:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-stdlib:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlin:kotlin-test-junit:2.4.0=composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspathorg.jetbrains.kotlin:kotlin-test-wasm-js:2.4.0=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathorg.jetbrains.kotlin:kotlin-test:2.4.0=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmTestRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadataorg.jetbrains.kotlin:kotlin-tooling-core:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath-org.jetbrains.kotlin:kotlin-tooling-core:2.4.20-RC=kotlinAbiValidationCompatClasspath+org.jetbrains.kotlin:kotlin-tooling-core:2.4.20-RC2=kotlinAbiValidationCompatClasspathorg.jetbrains.kotlinx:atomicfu-jvm:0.23.2=composeHotReloadDevToolsorg.jetbrains.kotlinx:atomicfu-jvm:0.33.0=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmDevRuntimeClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestRuntimeClasspathorg.jetbrains.kotlinx:atomicfu-wasm-js:0.33.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath