From 1ceb76ca0055bd535240c4ed16a0227ccd87ffe0 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 28 May 2025 20:36:08 +0000 Subject: [PATCH] Update google.protobuf to v4 --- gradle/libs.versions.toml | 2 +- solr/api/gradle.lockfile | 2 +- solr/benchmark/gradle.lockfile | 2 +- solr/core/gradle.lockfile | 2 +- solr/cross-dc-manager/gradle.lockfile | 4 ++-- solr/licenses/protobuf-java-3.25.3.jar.sha1 | 1 - solr/licenses/protobuf-java-4.31.1.jar.sha1 | 1 + solr/licenses/protobuf-java-util-3.25.3.jar.sha1 | 1 - solr/licenses/protobuf-java-util-4.31.1.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 2 +- solr/modules/clustering/gradle.lockfile | 2 +- solr/modules/cross-dc/gradle.lockfile | 2 +- solr/modules/extraction/gradle.lockfile | 2 +- solr/modules/gcs-repository/gradle.lockfile | 4 ++-- solr/modules/jwt-auth/gradle.lockfile | 2 +- solr/modules/langid/gradle.lockfile | 2 +- solr/modules/llm/gradle.lockfile | 2 +- solr/modules/ltr/gradle.lockfile | 2 +- solr/modules/opentelemetry/gradle.lockfile | 2 +- solr/modules/s3-repository/gradle.lockfile | 2 +- solr/modules/scripting/gradle.lockfile | 2 +- solr/modules/sql/gradle.lockfile | 2 +- solr/prometheus-exporter/gradle.lockfile | 2 +- solr/server/gradle.lockfile | 2 +- solr/solr-ref-guide/gradle.lockfile | 2 +- solr/solrj-streaming/gradle.lockfile | 2 +- solr/solrj-zookeeper/gradle.lockfile | 2 +- solr/solrj/gradle.lockfile | 2 +- solr/test-framework/gradle.lockfile | 2 +- solr/webapp/gradle.lockfile | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 solr/licenses/protobuf-java-3.25.3.jar.sha1 create mode 100644 solr/licenses/protobuf-java-4.31.1.jar.sha1 delete mode 100644 solr/licenses/protobuf-java-util-3.25.3.jar.sha1 create mode 100644 solr/licenses/protobuf-java-util-4.31.1.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c0d4cb7239..69f7459e883 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -108,7 +108,7 @@ google-j2objc = "3.0.0" # @keep This is GJF version for spotless/ tidy. google-javaformat = "1.18.1" # @keep for version alignment -google-protobuf = "3.25.3" +google-protobuf = "4.31.1" # @keep Gradle version to run the build gradle = "8.10" grpc = "1.65.1" diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index f6def777ba9..1fb41d52be3 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidatio com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.sun.activation:jakarta.activation:2.0.1=swaggerBuild diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 9d2ee9ecd3f..ece99cca5b2 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index ebf566d7c7f..08a6711b4ab 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -35,7 +35,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.ibm.icu:icu4j:74.2=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index a3924b7db3e..178b748d8e3 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -32,8 +32,8 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java-util:3.25.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:4.31.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath com.helger:profiler:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/protobuf-java-3.25.3.jar.sha1 b/solr/licenses/protobuf-java-3.25.3.jar.sha1 deleted file mode 100644 index 41b763811b4..00000000000 --- a/solr/licenses/protobuf-java-3.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d3200261955f3298e0d85c9892201e70492ce8eb diff --git a/solr/licenses/protobuf-java-4.31.1.jar.sha1 b/solr/licenses/protobuf-java-4.31.1.jar.sha1 new file mode 100644 index 00000000000..64f1ee93e84 --- /dev/null +++ b/solr/licenses/protobuf-java-4.31.1.jar.sha1 @@ -0,0 +1 @@ +1828b20315b63d5f71b3c61b094494a8f1acdc5a diff --git a/solr/licenses/protobuf-java-util-3.25.3.jar.sha1 b/solr/licenses/protobuf-java-util-3.25.3.jar.sha1 deleted file mode 100644 index a3d39b7af21..00000000000 --- a/solr/licenses/protobuf-java-util-3.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2284abc8c484d64ee5cb79bf61d5b7a819f6d50 diff --git a/solr/licenses/protobuf-java-util-4.31.1.jar.sha1 b/solr/licenses/protobuf-java-util-4.31.1.jar.sha1 new file mode 100644 index 00000000000..7ebe610b744 --- /dev/null +++ b/solr/licenses/protobuf-java-util-4.31.1.jar.sha1 @@ -0,0 +1 @@ +834e2b2b2a8a969720cd3bf99c509a283389c93a diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index ccf64762b5a..02798f94846 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.ibm.icu:icu4j:74.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 64038232abf..0a0b1ecc45f 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 52bb300918c..7e93b7b703c 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -28,7 +28,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 4d39678198f..a16a8ad0beb 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -35,7 +35,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.googlecode.plist:dd-plist:1.24=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index aaab5418abc..ce4cb678d5a 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -54,8 +54,8 @@ com.google.http-client:google-http-client-jackson2:1.44.2=compileClasspath,jarVa com.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.oauth-client:google-oauth-client:1.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:4.31.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 66418fb565b..b3d6ef6f2b8 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -29,7 +29,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index a13233c6da5..a7a4b99517d 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -28,7 +28,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index 97c64b4174e..562fb5b4382 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -29,7 +29,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.knuddels:jtokkit:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 82beea7fa92..c4fbe1ca9c0 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index c987846ebcc..a268c524ab1 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -30,7 +30,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index acfa83c78ef..9e7e3597dd8 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 58646b28e5a..91d5a214bdf 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,errorp com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index a16b3b4041f..3fb1dafb951 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -32,7 +32,7 @@ com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorpron com.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.protobuf:protobuf-java:3.21.9=permitUnusedDeclared -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:74.2=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index 819991354c3..97401c3441c 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidatio com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 65162f0f938..8790b0fa843 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -24,7 +24,7 @@ com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,er com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,solrCore com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,solrCore com.lmax:disruptor:3.4.4=jarValidation,libExt,runtimeClasspath diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index fd26f6593cb..039b32ec058 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -27,7 +27,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,testAnnotati com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspath com.tdunning:t-digest:3.3=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 5ad3ba653d0..cdda0f82a3c 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -29,7 +29,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidatio com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 68c127c061f..ed543e4d4da 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -32,7 +32,7 @@ com.google.guava:guava:33.1.0-jre=annotationProcessor,compileClasspath,errorpron com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=apiHelper com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 9e6881fd028..6b350b16583 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -30,7 +30,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidatio com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 053b7399a39..81c6b5dbef2 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -28,7 +28,7 @@ com.google.guava:failureaccess:1.0.2=annotationProcessor,apiHelper,compileClassp com.google.guava:guava:33.1.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.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.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 5caff1c65d9..8712e01c3a5 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -25,7 +25,7 @@ com.google.errorprone:javac:9+181-r4173-1=errorproneJavac com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,permitUnusedDeclared,solrCore,testAnnotationProcessor com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,permitUnusedDeclared,solrCore,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,permitUnusedDeclared,solrCore,testAnnotationProcessor -com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor +com.google.protobuf:protobuf-java:4.31.1=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=permitUnusedDeclared,solrCore com.jayway.jsonpath:json-path:2.9.0=permitUnusedDeclared,solrCore com.lmax:disruptor:3.4.4=serverLib