Apache Solr open-source search software
Update dependency com.google.j2objc:j2objc-annotations to v3.1 (#3481)
Solr Botb8312a4f9db1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 942065f33bd..0deca1c3b46 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -104,7 +104,7 @@ google-errorprone = "2.31.0"google-gson = "2.13.1"google-guava = "33.1.0-jre"# @keep for version alignment-google-j2objc = "3.0.0"+google-j2objc = "3.1"# @keep This is GJF version for spotless/ tidy.google-javaformat = "1.18.1"# @keep for version alignmentdiff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex 1fb8d14c90c..b1699398f29 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -38,7 +38,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathdiff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex 5d2ebdbba00..551595a7da9 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 54633915d62..871791aaeac 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -33,7 +33,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspathcom.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 6db2d1caf2b..5f9489507f9 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -31,7 +31,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspathcom.helger:profiler:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/licenses/j2objc-annotations-3.0.0.jar.sha1 b/solr/licenses/j2objc-annotations-3.0.0.jar.sha1deleted file mode 100644index fc28aa44f6a..00000000000--- a/solr/licenses/j2objc-annotations-3.0.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7399e65dd7e9ff3404f4535b2f017093bdb134c7diff --git a/solr/licenses/j2objc-annotations-3.1.jar.sha1 b/solr/licenses/j2objc-annotations-3.1.jar.sha1new file mode 100644index 00000000000..26cbe2bd1a6--- /dev/null+++ b/solr/licenses/j2objc-annotations-3.1.jar.sha1@@ -0,0 +1 @@+a892ca9507839bbdb900d64310ac98256cab992fdiff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex cf51c65e80a..97ac6137e83 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.ibm.icu:icu4j:77.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex 2ca1033e404..1553a1b8b93 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex b15d74cf098..39f82e7e355 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -26,7 +26,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex 67f02ede0a3..70d9c02e693 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -34,7 +34,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex 2d054c568e0..a94dd3df7b0 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -52,7 +52,7 @@ com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,jarVcom.google.http-client:google-http-client-gson:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.http-client:google-http-client-jackson2:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.http-client:google-http-client:1.44.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.protobuf:protobuf-java-util:3.25.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 3d3a3b77ff6..0b159940cc5 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -27,7 +27,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex 2209eff21b8..6e43265675e 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -26,7 +26,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfileindex 8dff07a60e8..3b605b765cd 100644--- a/solr/modules/llm/gradle.lockfile+++ b/solr/modules/llm/gradle.lockfile@@ -28,7 +28,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex cb463b200fc..5ca3745db57 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex 7b4876b2f5f..2e3e189677c 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -29,7 +29,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspathcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex be1cd59f99f..18a411cad3c 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -36,7 +36,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex d6857a077d8..1196568e682 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex 291bde99f00..b1eb3bf0808 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -29,7 +29,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.21.9=permitUnusedDeclaredcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfileindex 5d6e16e191b..505a17ec558 100644--- a/solr/prometheus-exporter/gradle.lockfile+++ b/solr/prometheus-exporter/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,solrPlatformLibs,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex 6161bf159be..ca581e142e2 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspathdiff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex 75a988f8200..e88677e0bf8 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -25,7 +25,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspathcom.googlecode.json-simple:json-simple:1.1.1=jarValidation,testRuntimeClasspathcom.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 0825069a185..b1a8c2da180 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -30,7 +30,7 @@ com.google.guava:guava:32.0.0-jre=apiHelpercom.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.j2objc:j2objc-annotations:2.8=apiHelper-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex f0f8d82c521..c27e67a3c31 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -26,7 +26,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspathdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex 32e611d0d6c..19a834a601e 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -26,7 +26,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,ercom.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath+com.google.j2objc:j2objc-annotations:3.1=compileClasspath,testCompileClasspathcom.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessorcom.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath