From c71f8429bf0b91ac092c06cff92b9600f2971ff4 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 6 Aug 2024 16:17:50 +0800 Subject: [PATCH 1/3] [SPARK-49120][BUILD] Bump Gson 2.11.0 --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 3 ++- pom.xml | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index cec071466fc3..3334c4be4ba5 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -62,11 +62,12 @@ derby/10.16.1.1//derby-10.16.1.1.jar derbyshared/10.16.1.1//derbyshared-10.16.1.1.jar derbytools/10.16.1.1//derbytools-10.16.1.1.jar dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar +error_prone_annotations/2.18.0//error_prone_annotations-2.18.0.jar esdk-obs-java/3.20.4.2//esdk-obs-java-3.20.4.2.jar flatbuffers-java/24.3.25//flatbuffers-java-24.3.25.jar gcs-connector/hadoop3-2.2.21/shaded/gcs-connector-hadoop3-2.2.21-shaded.jar gmetric4j/1.0.10//gmetric4j-1.0.10.jar -gson/2.2.4//gson-2.2.4.jar +gson/2.11.0//gson-2.11.0.jar guava/14.0.1//guava-14.0.1.jar hadoop-aliyun/3.4.0//hadoop-aliyun-3.4.0.jar hadoop-annotations/3.4.0//hadoop-annotations-3.4.0.jar diff --git a/pom.xml b/pom.xml index fef759409416..bc06db2691a3 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,7 @@ 2.12.0 4.1.17 14.0.1 + 2.11.0 3.1.9 3.0.12 2.12.7 @@ -572,6 +573,12 @@ + + com.google.code.gson + gson + ${gson.version} + + org.glassfish.jaxb From bdec9e07648ca20fc6230762822b29f9a108e3d7 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 6 Aug 2024 18:01:02 +0800 Subject: [PATCH 2/3] LICENSE --- LICENSE-binary | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE-binary b/LICENSE-binary index 6a8dc8ca3dd9..c8c78313ac3c 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -215,6 +215,7 @@ com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter com.google.code.findbugs:jsr305 com.google.code.gson:gson com.google.crypto.tink:tink +com.google.errorprone:error_prone_annotations com.google.flatbuffers:flatbuffers-java com.google.guava:guava com.jamesmurty.utils:java-xmlbuilder From 6ad319792c5727f90c34ef6a506050a8993ffc59 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 6 Aug 2024 18:09:31 +0800 Subject: [PATCH 3/3] exclude error_prone_annotations --- LICENSE-binary | 1 - dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 - pom.xml | 6 ++++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index c8c78313ac3c..6a8dc8ca3dd9 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -215,7 +215,6 @@ com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter com.google.code.findbugs:jsr305 com.google.code.gson:gson com.google.crypto.tink:tink -com.google.errorprone:error_prone_annotations com.google.flatbuffers:flatbuffers-java com.google.guava:guava com.jamesmurty.utils:java-xmlbuilder diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 3334c4be4ba5..a4b236bc8b81 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -62,7 +62,6 @@ derby/10.16.1.1//derby-10.16.1.1.jar derbyshared/10.16.1.1//derbyshared-10.16.1.1.jar derbytools/10.16.1.1//derbytools-10.16.1.1.jar dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar -error_prone_annotations/2.18.0//error_prone_annotations-2.18.0.jar esdk-obs-java/3.20.4.2//esdk-obs-java-3.20.4.2.jar flatbuffers-java/24.3.25//flatbuffers-java-24.3.25.jar gcs-connector/hadoop3-2.2.21/shaded/gcs-connector-hadoop3-2.2.21-shaded.jar diff --git a/pom.xml b/pom.xml index bc06db2691a3..286476a6c90b 100644 --- a/pom.xml +++ b/pom.xml @@ -577,6 +577,12 @@ com.google.code.gson gson ${gson.version} + + + com.google.errorprone + error_prone_annotations + +