From c269b7e54e13c6023c75b42ad15faa4131494214 Mon Sep 17 00:00:00 2001 From: Hyukjin Kwon Date: Thu, 14 Oct 2021 11:14:55 +0900 Subject: [PATCH 1/3] [SPARK-36994][BUILD] Update Thrift to 0.15.0 --- dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 3 ++- dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 3 ++- pom.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index d37b38b6fbbe1..e2389a396d3ad 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -130,6 +130,7 @@ jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar janino/3.0.16//janino-3.0.16.jar javassist/3.25.0-GA//javassist-3.25.0-GA.jar +javax.annotation-api/1.3.2//javax.annotation-api-1.3.2.jar javax.inject/1//javax.inject-1.jar javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar javolution/5.5.1//javolution-5.5.1.jar @@ -185,7 +186,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.12.0//libthrift-0.12.0.jar +libthrift/0.15.0//libthrift-0.15.0.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index 3040ffe44c6f3..c12d54525715d 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -120,6 +120,7 @@ jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar janino/3.0.16//janino-3.0.16.jar javassist/3.25.0-GA//javassist-3.25.0-GA.jar +javax.annotation-api/1.3.2//javax.annotation-api-1.3.2.jar javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar javolution/5.5.1//javolution-5.5.1.jar jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar @@ -172,7 +173,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.12.0//libthrift-0.12.0.jar +libthrift/0.15.0//libthrift-0.15.0.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar diff --git a/pom.xml b/pom.xml index e36495f9106f6..0e1f03236f83d 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 2.10.12 3.5.2 3.0.0 - 0.12.0 + 0.15.0 4.8 1.1 3.141.59 From de3f92f66f49a95b1fcd7531da9341de202602e7 Mon Sep 17 00:00:00 2001 From: Hyukjin Kwon Date: Mon, 18 Oct 2021 13:05:09 +0900 Subject: [PATCH 2/3] Try 0.14.2 --- dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 4 +++- dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 4 +++- pom.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index e2389a396d3ad..ed3b3bf4cbeb1 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -186,7 +186,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.15.0//libthrift-0.15.0.jar +libthrift/0.14.2//libthrift-0.14.2.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar @@ -241,6 +241,8 @@ stream/2.9.6//stream-2.9.6.jar super-csv/2.2.0//super-csv-2.2.0.jar threeten-extra/1.5.0//threeten-extra-1.5.0.jar tink/1.6.0//tink-1.6.0.jar +tomcat-annotations-api/8.5.46//tomcat-annotations-api-8.5.46.jar +tomcat-embed-core/8.5.46//tomcat-embed-core-8.5.46.jar transaction-api/1.1//transaction-api-1.1.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar velocity/1.5//velocity-1.5.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index c12d54525715d..d8f5a1a6c812e 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -173,7 +173,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.15.0//libthrift-0.15.0.jar +libthrift/0.14.2//libthrift-0.14.2.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar @@ -228,6 +228,8 @@ stream/2.9.6//stream-2.9.6.jar super-csv/2.2.0//super-csv-2.2.0.jar threeten-extra/1.5.0//threeten-extra-1.5.0.jar tink/1.6.0//tink-1.6.0.jar +tomcat-annotations-api/8.5.46//tomcat-annotations-api-8.5.46.jar +tomcat-embed-core/8.5.46//tomcat-embed-core-8.5.46.jar transaction-api/1.1//transaction-api-1.1.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar velocity/1.5//velocity-1.5.jar diff --git a/pom.xml b/pom.xml index 0e1f03236f83d..a726b9c379263 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 2.10.12 3.5.2 3.0.0 - 0.15.0 + 0.14.2 4.8 1.1 3.141.59 From a796548ee98b171f9894a343c93d3b76ab4a3072 Mon Sep 17 00:00:00 2001 From: Hyukjin Kwon Date: Mon, 18 Oct 2021 14:01:38 +0900 Subject: [PATCH 3/3] Try 0.13.0 --- dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 4 +--- dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 4 +--- pom.xml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index ed3b3bf4cbeb1..b57cddaf3a6c7 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -186,7 +186,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.14.2//libthrift-0.14.2.jar +libthrift/0.13.0//libthrift-0.13.0.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar @@ -241,8 +241,6 @@ stream/2.9.6//stream-2.9.6.jar super-csv/2.2.0//super-csv-2.2.0.jar threeten-extra/1.5.0//threeten-extra-1.5.0.jar tink/1.6.0//tink-1.6.0.jar -tomcat-annotations-api/8.5.46//tomcat-annotations-api-8.5.46.jar -tomcat-embed-core/8.5.46//tomcat-embed-core-8.5.46.jar transaction-api/1.1//transaction-api-1.1.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar velocity/1.5//velocity-1.5.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index d8f5a1a6c812e..169372086d7ed 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -173,7 +173,7 @@ kubernetes-model-storageclass/5.8.0//kubernetes-model-storageclass-5.8.0.jar lapack/2.2.0//lapack-2.2.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar -libthrift/0.14.2//libthrift-0.14.2.jar +libthrift/0.13.0//libthrift-0.13.0.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar @@ -228,8 +228,6 @@ stream/2.9.6//stream-2.9.6.jar super-csv/2.2.0//super-csv-2.2.0.jar threeten-extra/1.5.0//threeten-extra-1.5.0.jar tink/1.6.0//tink-1.6.0.jar -tomcat-annotations-api/8.5.46//tomcat-annotations-api-8.5.46.jar -tomcat-embed-core/8.5.46//tomcat-embed-core-8.5.46.jar transaction-api/1.1//transaction-api-1.1.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar velocity/1.5//velocity-1.5.jar diff --git a/pom.xml b/pom.xml index a726b9c379263..82afd746585d5 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 2.10.12 3.5.2 3.0.0 - 0.14.2 + 0.13.0 4.8 1.1 3.141.59