From 941cfe8e08318c46b838099040b7c0d46cd072ec Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:58:41 +0000 Subject: [PATCH 1/2] Update dependency com.google.code.gson:gson to v2.14.0 --- gradle/libs.versions.toml | 2 +- solr/cross-dc-manager/gradle.lockfile | 2 +- solr/licenses/error_prone_annotations-2.48.0.jar.sha1 | 1 + solr/licenses/gson-2.13.1.jar.sha1 | 1 - solr/licenses/gson-2.14.0.jar.sha1 | 1 + solr/modules/gcs-repository/gradle.lockfile | 5 +++-- solr/modules/opentelemetry/gradle.lockfile | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 solr/licenses/error_prone_annotations-2.48.0.jar.sha1 delete mode 100644 solr/licenses/gson-2.13.1.jar.sha1 create mode 100644 solr/licenses/gson-2.14.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31e..e859e88a33a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,7 +104,7 @@ google-cloud-nio = "0.127.3" google-cloud-storage = "2.27.0" google-errorprone = "2.41.0" # @keep for version alignment -google-gson = "2.13.1" +google-gson = "2.14.0" google-guava = "33.5.0-jre" # @keep for version alignment google-j2objc = "3.1" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index a700b6be805..cb5826eb781 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -23,7 +23,7 @@ com.google.api.grpc:proto-google-common-protos:2.61.1=jarValidation,runtimeClass com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.code.gson:gson:2.14.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/licenses/error_prone_annotations-2.48.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.48.0.jar.sha1 new file mode 100644 index 00000000000..542856c0091 --- /dev/null +++ b/solr/licenses/error_prone_annotations-2.48.0.jar.sha1 @@ -0,0 +1 @@ +bbe30942a31d1778c74cb272321267eca82dc708 diff --git a/solr/licenses/gson-2.13.1.jar.sha1 b/solr/licenses/gson-2.13.1.jar.sha1 deleted file mode 100644 index 38d9652118a..00000000000 --- a/solr/licenses/gson-2.13.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -853ce06c11316b33a8eae5e9095da096a9528b8f diff --git a/solr/licenses/gson-2.14.0.jar.sha1 b/solr/licenses/gson-2.14.0.jar.sha1 new file mode 100644 index 00000000000..85df38a98a7 --- /dev/null +++ b/solr/licenses/gson-2.14.0.jar.sha1 @@ -0,0 +1 @@ +efc0e34ede4e3204eaefb84a00e55e8c86634382 diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index fcdce63db23..72941913f28 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -36,10 +36,11 @@ com.google.cloud:google-cloud-core-http:2.60.1=compileClasspath,jarValidation,ru com.google.cloud:google-cloud-core:2.60.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath 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.gson:gson:2.13.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.14.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.41.0=apiHelper com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index dab8526fa6f..7ff3c3db045 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -18,7 +18,7 @@ com.google.api.grpc:proto-google-common-protos:2.61.1=jarValidation,runtimeClass com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.google.code.gson:gson:2.14.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor From ec5c68347e0659e7a03a4e244f94aec448cc3a46 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 02:59:01 +0000 Subject: [PATCH 2/2] Update changelog entry --- .../PR#3661-update-com-google-code-gson-gson.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#3661-update-com-google-code-gson-gson.yml diff --git a/changelog/unreleased/PR#3661-update-com-google-code-gson-gson.yml b/changelog/unreleased/PR#3661-update-com-google-code-gson-gson.yml new file mode 100644 index 00000000000..0b4809cf1f4 --- /dev/null +++ b/changelog/unreleased/PR#3661-update-com-google-code-gson-gson.yml @@ -0,0 +1,7 @@ +title: Update com.google.code.gson:gson to v2.14.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3661 + url: https://github.com/apache/solr/pull/3661