From 23872be739f9b5605762ad3463878e209abf2b1e Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 17 Sep 2025 16:27:29 -0400 Subject: [PATCH 1/2] Add com.google.code.gson:gson to the gradle version catalog Signed-off-by: Craig Perkins --- gradle/libs.versions.toml | 2 ++ plugins/repository-gcs/build.gradle | 2 +- plugins/repository-gcs/licenses/gson-2.12.1.jar.sha1 | 1 - plugins/repository-gcs/licenses/gson-2.13.2.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- test/fixtures/hdfs-fixture/build.gradle | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/gson-2.12.1.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/gson-2.13.2.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26e6f202375c1..b1077eba5a6bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,6 +23,7 @@ woodstox = "6.4.0" kotlin = "1.7.10" antlr4 = "4.13.1" guava = "33.2.1-jre" +gson = "2.13.2" opensearchprotobufs = "0.13.0" protobuf = "3.25.8" jakarta_annotation = "1.3.5" @@ -109,6 +110,7 @@ bouncycastle-tls = { group = "org.bouncycastle", name = "bctls-fips", version.re bouncycastle-pkix = { group = "org.bouncycastle", name = "bcpkix-fips", version.ref = "bouncycastle_pkix"} bouncycastle-pg = { group = "org.bouncycastle", name = "bcpg-fips", version.ref = "bouncycastle_pg"} bouncycastle-util = { group = "org.bouncycastle", name = "bcutil-fips", version.ref = "bouncycastle_util"} +gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" } hdrhistogram = { group = "org.hdrhistogram", name = "HdrHistogram", version.ref = "hdrhistogram" } jackson-annotation = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" } diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 0aff77db3fd67..1ca6ea1dd4443 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation "org.threeten:threetenbp:1.7.0" runtimeOnly "com.google.protobuf:protobuf-java-util:${versions.protobuf}" runtimeOnly "com.google.protobuf:protobuf-java:${versions.protobuf}" - runtimeOnly "com.google.code.gson:gson:2.12.1" + runtimeOnly "com.google.code.gson:gson:${versions.gson}" runtimeOnly "com.google.api.grpc:proto-google-common-protos:2.60.0" runtimeOnly "com.google.api.grpc:proto-google-iam-v1:1.55.0" implementation "com.google.auth:google-auth-library-credentials:1.38.0" diff --git a/plugins/repository-gcs/licenses/gson-2.12.1.jar.sha1 b/plugins/repository-gcs/licenses/gson-2.12.1.jar.sha1 deleted file mode 100644 index 7d57e885daa08..0000000000000 --- a/plugins/repository-gcs/licenses/gson-2.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e773a317740b83b43cfc3d652962856041697cb \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gson-2.13.2.jar.sha1 b/plugins/repository-gcs/licenses/gson-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..1e5c1f3184ca8 --- /dev/null +++ b/plugins/repository-gcs/licenses/gson-2.13.2.jar.sha1 @@ -0,0 +1 @@ +48b8230771e573b54ce6e867a9001e75977fe78e \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 3085a4b6e446a..95d4efdd4d6c3 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -63,7 +63,7 @@ dependencies { api 'org.apache.htrace:htrace-core4:4.2.0-incubating' api "org.apache.logging.log4j:log4j-core:${versions.log4j}" api 'org.apache.avro:avro:1.12.0' - api 'com.google.code.gson:gson:2.13.2' + api "com.google.code.gson:gson:${versions.gson}" runtimeOnly "com.google.guava:guava:${versions.guava}" api "commons-logging:commons-logging:${versions.commonslogging}" api 'commons-cli:commons-cli:1.10.0' diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index c6c9f79c50967..b15c997d461e7 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -63,7 +63,7 @@ dependencies { api "commons-codec:commons-codec:${versions.commonscodec}" api "org.apache.logging.log4j:log4j-core:${versions.log4j}" api "io.netty:netty-all:${versions.netty}" - api 'com.google.code.gson:gson:2.13.2' + api "com.google.code.gson:gson:${versions.gson}" api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" From 01906e627e30ea77138c9edef18c78a2ca5858fa Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 17 Sep 2025 16:38:14 -0400 Subject: [PATCH 2/2] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9c5287f9bffc..049c90c76338e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `actions/stale` from 9 to 10 ([#19292](https://github.com/opensearch-project/OpenSearch/pull/19292)) - Bump `com.nimbusds:oauth2-oidc-sdk` from 11.25 to 11.28 ([#19291](https://github.com/opensearch-project/OpenSearch/pull/19291)) - Bump `log4j2` from 2.21.0 to 2.25.1 ([#19184](https://github.com/opensearch-project/OpenSearch/pull/19184)) +- Add com.google.code.gson:gson to the gradle version catalog ([#19328](https://github.com/opensearch-project/OpenSearch/pull/19328)) ### Deprecated