From 2437394e1cd482b649c0110d41cda4b0c292eba3 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 31 Jan 2025 00:43:18 +0000 Subject: [PATCH] chore(deps): update dependency com.google.code.gson:gson to v2.12.1 --- gradle/libs.versions.toml | 2 +- solr/cross-dc-manager/gradle.lockfile | 5 +++-- solr/licenses/error_prone_annotations-2.36.0.jar.sha1 | 1 + solr/licenses/gson-2.11.0.jar.sha1 | 1 - solr/licenses/gson-2.12.1.jar.sha1 | 1 + solr/modules/extraction/gradle.lockfile | 5 +++-- solr/modules/gcs-repository/gradle.lockfile | 5 +++-- solr/modules/llm/gradle.lockfile | 5 +++-- solr/modules/opentelemetry/gradle.lockfile | 5 +++-- 9 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 solr/licenses/error_prone_annotations-2.36.0.jar.sha1 delete mode 100644 solr/licenses/gson-2.11.0.jar.sha1 create mode 100644 solr/licenses/gson-2.12.1.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e72bc9bed4f..c03e2f3893b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -99,7 +99,7 @@ google-cloud-nio = "0.127.3" google-cloud-storage = "2.27.0" google-errorprone = "2.31.0" # @keep for version alignment -google-gson = "2.11.0" +google-gson = "2.12.1" google-guava = "33.1.0-jre" # @keep for version alignment google-j2objc = "3.0.0" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 196758ae1ae..172f63ba338 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -21,9 +21,10 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.11.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.code.gson:gson:2.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.36.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/licenses/error_prone_annotations-2.36.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.36.0.jar.sha1 new file mode 100644 index 00000000000..57538779bcb --- /dev/null +++ b/solr/licenses/error_prone_annotations-2.36.0.jar.sha1 @@ -0,0 +1 @@ +227d4d4957ccc3dc5761bd897e3a0ee587e750a7 diff --git a/solr/licenses/gson-2.11.0.jar.sha1 b/solr/licenses/gson-2.11.0.jar.sha1 deleted file mode 100644 index 590ee0411c2..00000000000 --- a/solr/licenses/gson-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -527175ca6d81050b53bdd4c457a6d6e017626b0e diff --git a/solr/licenses/gson-2.12.1.jar.sha1 b/solr/licenses/gson-2.12.1.jar.sha1 new file mode 100644 index 00000000000..a7845e200a1 --- /dev/null +++ b/solr/licenses/gson-2.12.1.jar.sha1 @@ -0,0 +1 @@ +4e773a317740b83b43cfc3d652962856041697cb diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 418fe652e1e..3ec230f868d 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -24,9 +24,10 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.12.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,errorprone,solrPlatformLibs,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 0cc8327e74c..a7703833c3c 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -37,9 +37,10 @@ com.google.cloud:google-cloud-core:2.40.0=compileClasspath,jarValidation,runtime com.google.cloud:google-cloud-nio:0.127.20=jarValidation,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.40.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.12.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,apiHelper,errorprone,solrPlatformLibs,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index c5ff1b34785..7bc3d846b58 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -18,9 +18,10 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.12.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,errorprone,solrPlatformLibs,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index e63d707c983..b8ed53dbeb5 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -19,9 +19,10 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.11.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.code.gson:gson:2.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,compileClasspath,errorprone,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.36.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor