From 09c35ab6006f8427f3fd6ccc770f068b3ca9738d Mon Sep 17 00:00:00 2001 From: panbingkun Date: Tue, 31 Oct 2023 20:51:07 +0900 Subject: [PATCH] [SPARK-45732][BUILD] Upgrade commons-text to 1.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pr aims to upgrade `commons-text` from `1.10.0` to `1.11.0`. Release note: https://commons.apache.org/proper/commons-text/changes-report.html#a1.11.0 includes some bug fix, eg: - Fix StringTokenizer.getTokenList to return an independent modifiable list. Fixes [TEXT-219](https://issues.apache.org/jira/browse/TEXT-219). - Fix TextStringBuilder to over-allocate when ensuring capacity #452. Fixes [TEXT-228](https://issues.apache.org/jira/browse/TEXT-228). - TextStringBuidler#hashCode() allocates a String on each call #387. No. Pass GA. No. Closes #43590 from panbingkun/SPARK-45732. Authored-by: panbingkun Signed-off-by: Hyukjin Kwon (cherry picked from commit d38f07459494a99177b0436c1b4a784a8af8cbab) [SPARK-40801][BUILD] Upgrade `Apache commons-text` to 1.10 Upgrade Apache commons-text from 1.9 to 1.10.0 [CVE-2022-42889](https://nvd.nist.gov/vuln/detail/CVE-2022-42889) No. Pass github action Closes #38262 from bjornjorgensen/commons-text-1.10. Authored-by: Bjørn Signed-off-by: Yuming Wang (cherry picked from commit 99abc94039e3c069d0fc8b8e7025522fea124cbb) [SPARK-38231][BUILD] Upgrade commons-text to 1.9 This PR aims to upgrade commons-text to 1.9. 1.9 is the latest and popular than 1.6. - https://commons.apache.org/proper/commons-text/changes-report.html#a1.9 - https://mvnrepository.com/artifact/org.apache.commons/commons-text No Pass GA Closes #35542 from LuciferYang/upgrade-common-text. Authored-by: yangjie01 Signed-off-by: Dongjoon Hyun (cherry picked from commit 70f5bfd665b449fb3d7223c81fbd5a53d7985b9d) --- .../types/UTF8StringPropertyCheckSuite.scala | 8 - dev/deps/spark-deps-hadoop-2-hive-2.3 | 96 +++--- dev/deps/spark-deps-hadoop-3-hive-2.3 | 278 +++++++++--------- pom.xml | 2 +- 4 files changed, 188 insertions(+), 196 deletions(-) diff --git a/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala b/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala index ab488e18ba3f4..9693a037d50c3 100644 --- a/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala +++ b/common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala @@ -17,7 +17,6 @@ package org.apache.spark.unsafe.types -import org.apache.commons.text.similarity.LevenshteinDistance import org.scalacheck.{Arbitrary, Gen} import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks // scalastyle:off @@ -230,13 +229,6 @@ class UTF8StringPropertyCheckSuite extends AnyFunSuite with ScalaCheckDrivenProp } } - test("levenshteinDistance") { - forAll { (one: String, another: String) => - assert(toUTF8(one).levenshteinDistance(toUTF8(another)) === - LevenshteinDistance.getDefaultInstance.apply(one, another)) - } - } - test("hashCode") { forAll { (s: String) => assert(toUTF8(s).hashCode() === toUTF8(s).hashCode()) diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3 b/dev/deps/spark-deps-hadoop-2-hive-2.3 index 283d93a4e60a3..934b5e7e407cc 100644 --- a/dev/deps/spark-deps-hadoop-2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2-hive-2.3 @@ -1,7 +1,7 @@ HikariCP/2.5.1//HikariCP-2.5.1.jar JLargeArrays/1.5//JLargeArrays-1.5.jar JTransforms/3.1//JTransforms-3.1.jar -RoaringBitmap/0.9.35//RoaringBitmap-0.9.35.jar +RoaringBitmap/0.9.32//RoaringBitmap-0.9.32.jar ST4/4.0.4//ST4-4.0.4.jar activation/1.1.1//activation-1.1.1.jar aircompressor/0.21//aircompressor-0.21.jar @@ -17,10 +17,10 @@ api-asn1-api/1.0.0-M20//api-asn1-api-1.0.0-M20.jar api-util/1.0.0-M20//api-util-1.0.0-M20.jar arpack/3.0.2//arpack-3.0.2.jar arpack_combined_all/0.1//arpack_combined_all-0.1.jar -arrow-format/10.0.0//arrow-format-10.0.0.jar -arrow-memory-core/10.0.0//arrow-memory-core-10.0.0.jar -arrow-memory-netty/10.0.0//arrow-memory-netty-10.0.0.jar -arrow-vector/10.0.0//arrow-vector-10.0.0.jar +arrow-format/9.0.0//arrow-format-9.0.0.jar +arrow-memory-core/9.0.0//arrow-memory-core-9.0.0.jar +arrow-memory-netty/9.0.0//arrow-memory-netty-9.0.0.jar +arrow-vector/9.0.0//arrow-vector-9.0.0.jar audience-annotations/0.5.0//audience-annotations-0.5.0.jar avro-ipc/1.11.1//avro-ipc-1.11.1.jar avro-mapred/1.11.1//avro-mapred-1.11.1.jar @@ -109,17 +109,17 @@ htrace-core/3.1.0-incubating//htrace-core-3.1.0-incubating.jar httpclient/4.5.13//httpclient-4.5.13.jar httpcore/4.4.14//httpcore-4.4.14.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar -ivy/2.5.1//ivy-2.5.1.jar -jackson-annotations/2.14.0//jackson-annotations-2.14.0.jar +ivy/2.5.0//ivy-2.5.0.jar +jackson-annotations/2.13.4//jackson-annotations-2.13.4.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar -jackson-core/2.14.0//jackson-core-2.14.0.jar -jackson-databind/2.14.0//jackson-databind-2.14.0.jar -jackson-dataformat-cbor/2.14.0//jackson-dataformat-cbor-2.14.0.jar -jackson-dataformat-yaml/2.14.0//jackson-dataformat-yaml-2.14.0.jar -jackson-datatype-jsr310/2.14.0//jackson-datatype-jsr310-2.14.0.jar +jackson-core/2.13.4//jackson-core-2.13.4.jar +jackson-databind/2.13.4.1//jackson-databind-2.13.4.1.jar +jackson-dataformat-cbor/2.13.4//jackson-dataformat-cbor-2.13.4.jar +jackson-dataformat-yaml/2.13.4//jackson-dataformat-yaml-2.13.4.jar +jackson-datatype-jsr310/2.13.4//jackson-datatype-jsr310-2.13.4.jar jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar -jackson-module-scala_2.12/2.14.0//jackson-module-scala_2.12-2.14.0.jar +jackson-module-scala_2.12/2.13.4//jackson-module-scala_2.12-2.13.4.jar jackson-xc/1.9.13//jackson-xc-1.9.13.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar @@ -147,7 +147,7 @@ jetty-util/6.1.26//jetty-util-6.1.26.jar jetty-util/9.4.49.v20220914//jetty-util-9.4.49.v20220914.jar jetty/6.1.26//jetty-6.1.26.jar jline/2.14.6//jline-2.14.6.jar -joda-time/2.12.0//joda-time-2.12.0.jar +joda-time/2.11.2//joda-time-2.11.2.jar jodd-core/3.5.2//jodd-core-3.5.2.jar jpam/1.1//jpam-1.1.jar json/1.8//json-1.8.jar @@ -160,30 +160,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar -kubernetes-client-api/6.2.0//kubernetes-client-api-6.2.0.jar -kubernetes-client/6.2.0//kubernetes-client-6.2.0.jar -kubernetes-httpclient-okhttp/6.2.0//kubernetes-httpclient-okhttp-6.2.0.jar -kubernetes-model-admissionregistration/6.2.0//kubernetes-model-admissionregistration-6.2.0.jar -kubernetes-model-apiextensions/6.2.0//kubernetes-model-apiextensions-6.2.0.jar -kubernetes-model-apps/6.2.0//kubernetes-model-apps-6.2.0.jar -kubernetes-model-autoscaling/6.2.0//kubernetes-model-autoscaling-6.2.0.jar -kubernetes-model-batch/6.2.0//kubernetes-model-batch-6.2.0.jar -kubernetes-model-certificates/6.2.0//kubernetes-model-certificates-6.2.0.jar -kubernetes-model-common/6.2.0//kubernetes-model-common-6.2.0.jar -kubernetes-model-coordination/6.2.0//kubernetes-model-coordination-6.2.0.jar -kubernetes-model-core/6.2.0//kubernetes-model-core-6.2.0.jar -kubernetes-model-discovery/6.2.0//kubernetes-model-discovery-6.2.0.jar -kubernetes-model-events/6.2.0//kubernetes-model-events-6.2.0.jar -kubernetes-model-extensions/6.2.0//kubernetes-model-extensions-6.2.0.jar -kubernetes-model-flowcontrol/6.2.0//kubernetes-model-flowcontrol-6.2.0.jar -kubernetes-model-gatewayapi/6.2.0//kubernetes-model-gatewayapi-6.2.0.jar -kubernetes-model-metrics/6.2.0//kubernetes-model-metrics-6.2.0.jar -kubernetes-model-networking/6.2.0//kubernetes-model-networking-6.2.0.jar -kubernetes-model-node/6.2.0//kubernetes-model-node-6.2.0.jar -kubernetes-model-policy/6.2.0//kubernetes-model-policy-6.2.0.jar -kubernetes-model-rbac/6.2.0//kubernetes-model-rbac-6.2.0.jar -kubernetes-model-scheduling/6.2.0//kubernetes-model-scheduling-6.2.0.jar -kubernetes-model-storageclass/6.2.0//kubernetes-model-storageclass-6.2.0.jar +kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar +kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar +kubernetes-httpclient-okhttp/6.1.1//kubernetes-httpclient-okhttp-6.1.1.jar +kubernetes-model-admissionregistration/6.1.1//kubernetes-model-admissionregistration-6.1.1.jar +kubernetes-model-apiextensions/6.1.1//kubernetes-model-apiextensions-6.1.1.jar +kubernetes-model-apps/6.1.1//kubernetes-model-apps-6.1.1.jar +kubernetes-model-autoscaling/6.1.1//kubernetes-model-autoscaling-6.1.1.jar +kubernetes-model-batch/6.1.1//kubernetes-model-batch-6.1.1.jar +kubernetes-model-certificates/6.1.1//kubernetes-model-certificates-6.1.1.jar +kubernetes-model-common/6.1.1//kubernetes-model-common-6.1.1.jar +kubernetes-model-coordination/6.1.1//kubernetes-model-coordination-6.1.1.jar +kubernetes-model-core/6.1.1//kubernetes-model-core-6.1.1.jar +kubernetes-model-discovery/6.1.1//kubernetes-model-discovery-6.1.1.jar +kubernetes-model-events/6.1.1//kubernetes-model-events-6.1.1.jar +kubernetes-model-extensions/6.1.1//kubernetes-model-extensions-6.1.1.jar +kubernetes-model-flowcontrol/6.1.1//kubernetes-model-flowcontrol-6.1.1.jar +kubernetes-model-gatewayapi/6.1.1//kubernetes-model-gatewayapi-6.1.1.jar +kubernetes-model-metrics/6.1.1//kubernetes-model-metrics-6.1.1.jar +kubernetes-model-networking/6.1.1//kubernetes-model-networking-6.1.1.jar +kubernetes-model-node/6.1.1//kubernetes-model-node-6.1.1.jar +kubernetes-model-policy/6.1.1//kubernetes-model-policy-6.1.1.jar +kubernetes-model-rbac/6.1.1//kubernetes-model-rbac-6.1.1.jar +kubernetes-model-scheduling/6.1.1//kubernetes-model-scheduling-6.1.1.jar +kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar lapack/3.0.2//lapack-3.0.2.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar @@ -195,11 +195,11 @@ log4j-slf4j2-impl/2.19.0//log4j-slf4j2-impl-2.19.0.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar -metrics-core/4.2.12//metrics-core-4.2.12.jar -metrics-graphite/4.2.12//metrics-graphite-4.2.12.jar -metrics-jmx/4.2.12//metrics-jmx-4.2.12.jar -metrics-json/4.2.12//metrics-json-4.2.12.jar -metrics-jvm/4.2.12//metrics-jvm-4.2.12.jar +metrics-core/4.2.10//metrics-core-4.2.10.jar +metrics-graphite/4.2.10//metrics-graphite-4.2.10.jar +metrics-jmx/4.2.10//metrics-jmx-4.2.10.jar +metrics-json/4.2.10//metrics-json-4.2.10.jar +metrics-jvm/4.2.10//metrics-jvm-4.2.10.jar minlog/1.3.0//minlog-1.3.0.jar netty-all/4.1.84.Final//netty-all-4.1.84.Final.jar netty-buffer/4.1.84.Final//netty-buffer-4.1.84.Final.jar @@ -240,16 +240,16 @@ pickle/1.2//pickle-1.2.jar protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.9.7//py4j-0.10.9.7.jar remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar -rocksdbjni/7.7.3//rocksdbjni-7.7.3.jar +rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar scala-compiler/2.12.17//scala-compiler-2.12.17.jar scala-library/2.12.17//scala-library-2.12.17.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar scala-reflect/2.12.17//scala-reflect-2.12.17.jar scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar -shims/0.9.35//shims-0.9.35.jar +shims/0.9.32//shims-0.9.32.jar slf4j-api/2.0.3//slf4j-api-2.0.3.jar -snakeyaml/1.33//snakeyaml-1.33.jar +snakeyaml/1.31//snakeyaml-1.31.jar snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar @@ -263,7 +263,7 @@ tink/1.7.0//tink-1.7.0.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 -xbean-asm9-shaded/4.22//xbean-asm9-shaded-4.22.jar +xbean-asm9-shaded/4.21//xbean-asm9-shaded-4.21.jar xercesImpl/2.12.2//xercesImpl-2.12.2.jar xml-apis/1.4.01//xml-apis-1.4.01.jar xmlenc/0.52//xmlenc-0.52.jar @@ -271,4 +271,4 @@ xz/1.8//xz-1.8.jar zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar zookeeper/3.6.2//zookeeper-3.6.2.jar -zstd-jni/1.5.2-5//zstd-jni-1.5.2-5.jar +zstd-jni/1.5.2-4//zstd-jni-1.5.2-4.jar diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index cd5b2159bff86..56c24679deb74 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -1,10 +1,10 @@ HikariCP/2.5.1//HikariCP-2.5.1.jar JLargeArrays/1.5//JLargeArrays-1.5.jar JTransforms/3.1//JTransforms-3.1.jar -RoaringBitmap/0.9.45//RoaringBitmap-0.9.45.jar +RoaringBitmap/0.9.32//RoaringBitmap-0.9.32.jar ST4/4.0.4//ST4-4.0.4.jar activation/1.1.1//activation-1.1.1.jar -aircompressor/0.25//aircompressor-0.25.jar +aircompressor/0.21//aircompressor-0.21.jar algebra_2.12/2.0.1//algebra_2.12-2.0.1.jar aliyun-java-sdk-core/4.5.10//aliyun-java-sdk-core-4.5.10.jar aliyun-java-sdk-kms/2.11.0//aliyun-java-sdk-kms-2.11.0.jar @@ -14,21 +14,21 @@ annotations/17.0.0//annotations-17.0.0.jar antlr-runtime/3.5.2//antlr-runtime-3.5.2.jar antlr4-runtime/4.9.3//antlr4-runtime-4.9.3.jar aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar -arpack/3.0.3//arpack-3.0.3.jar +arpack/3.0.2//arpack-3.0.2.jar arpack_combined_all/0.1//arpack_combined_all-0.1.jar -arrow-format/12.0.1//arrow-format-12.0.1.jar -arrow-memory-core/12.0.1//arrow-memory-core-12.0.1.jar -arrow-memory-netty/12.0.1//arrow-memory-netty-12.0.1.jar -arrow-vector/12.0.1//arrow-vector-12.0.1.jar +arrow-format/9.0.0//arrow-format-9.0.0.jar +arrow-memory-core/9.0.0//arrow-memory-core-9.0.0.jar +arrow-memory-netty/9.0.0//arrow-memory-netty-9.0.0.jar +arrow-vector/9.0.0//arrow-vector-9.0.0.jar audience-annotations/0.5.0//audience-annotations-0.5.0.jar -avro-ipc/1.11.2//avro-ipc-1.11.2.jar -avro-mapred/1.11.2//avro-mapred-1.11.2.jar -avro/1.11.2//avro-1.11.2.jar -aws-java-sdk-bundle/1.12.367//aws-java-sdk-bundle-1.12.367.jar +avro-ipc/1.11.1//avro-ipc-1.11.1.jar +avro-mapred/1.11.1//avro-mapred-1.11.1.jar +avro/1.11.1//avro-1.11.1.jar +aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar azure-data-lake-store-sdk/2.3.9//azure-data-lake-store-sdk-2.3.9.jar azure-keyvault-core/1.0.0//azure-keyvault-core-1.0.0.jar azure-storage/7.0.1//azure-storage-7.0.1.jar -blas/3.0.3//blas-3.0.3.jar +blas/3.0.2//blas-3.0.2.jar bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar breeze_2.12/2.1.0//breeze_2.12-2.1.0.jar @@ -36,20 +36,20 @@ cats-kernel_2.12/2.1.1//cats-kernel_2.12-2.1.1.jar chill-java/0.10.0//chill-java-0.10.0.jar chill_2.12/0.10.0//chill_2.12-0.10.0.jar commons-cli/1.5.0//commons-cli-1.5.0.jar -commons-codec/1.16.0//commons-codec-1.16.0.jar +commons-codec/1.15//commons-codec-1.15.jar commons-collections/3.2.2//commons-collections-3.2.2.jar commons-collections4/4.4//commons-collections4-4.4.jar -commons-compiler/3.1.9//commons-compiler-3.1.9.jar -commons-compress/1.23.0//commons-compress-1.23.0.jar +commons-compiler/3.1.7//commons-compiler-3.1.7.jar +commons-compress/1.21//commons-compress-1.21.jar commons-crypto/1.1.0//commons-crypto-1.1.0.jar commons-dbcp/1.4//commons-dbcp-1.4.jar -commons-io/2.13.0//commons-io-2.13.0.jar +commons-io/2.11.0//commons-io-2.11.0.jar commons-lang/2.6//commons-lang-2.6.jar -commons-lang3/3.13.0//commons-lang3-3.13.0.jar +commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar commons-math3/3.6.1//commons-math3-3.6.1.jar commons-pool/1.5.4//commons-pool-1.5.4.jar -commons-text/1.10.0//commons-text-1.10.0.jar +commons-text/1.11.0//commons-text-1.11.0.jar compress-lzf/1.1.2//compress-lzf-1.1.2.jar curator-client/5.2.0//curator-client-5.2.0.jar curator-framework/5.2.0//curator-framework-5.2.0.jar @@ -57,25 +57,24 @@ curator-recipes/5.2.0//curator-recipes-5.2.0.jar datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar -datasketches-java/3.3.0//datasketches-java-3.3.0.jar -datasketches-memory/2.1.0//datasketches-memory-2.1.0.jar derby/10.14.2.0//derby-10.14.2.0.jar dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar -gcs-connector/hadoop3-2.2.17/shaded/gcs-connector-hadoop3-2.2.17-shaded.jar +gcs-connector/hadoop3-2.2.7/shaded/gcs-connector-hadoop3-2.2.7-shaded.jar gmetric4j/1.0.10//gmetric4j-1.0.10.jar gson/2.2.4//gson-2.2.4.jar guava/14.0.1//guava-14.0.1.jar -hadoop-aliyun/3.3.6//hadoop-aliyun-3.3.6.jar -hadoop-annotations/3.3.6//hadoop-annotations-3.3.6.jar -hadoop-aws/3.3.6//hadoop-aws-3.3.6.jar -hadoop-azure-datalake/3.3.6//hadoop-azure-datalake-3.3.6.jar -hadoop-azure/3.3.6//hadoop-azure-3.3.6.jar -hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar -hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar -hadoop-cloud-storage/3.3.6//hadoop-cloud-storage-3.3.6.jar +hadoop-aliyun/3.3.4//hadoop-aliyun-3.3.4.jar +hadoop-annotations/3.3.4//hadoop-annotations-3.3.4.jar +hadoop-aws/3.3.4//hadoop-aws-3.3.4.jar +hadoop-azure-datalake/3.3.4//hadoop-azure-datalake-3.3.4.jar +hadoop-azure/3.3.4//hadoop-azure-3.3.4.jar +hadoop-client-api/3.3.4//hadoop-client-api-3.3.4.jar +hadoop-client-runtime/3.3.4//hadoop-client-runtime-3.3.4.jar +hadoop-cloud-storage/3.3.4//hadoop-cloud-storage-3.3.4.jar +hadoop-openstack/3.3.4//hadoop-openstack-3.3.4.jar hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar -hadoop-yarn-server-web-proxy/3.3.6//hadoop-yarn-server-web-proxy-3.3.6.jar +hadoop-yarn-server-web-proxy/3.3.4//hadoop-yarn-server-web-proxy-3.3.4.jar hive-beeline/2.3.9//hive-beeline-2.3.9.jar hive-cli/2.3.9//hive-cli-2.3.9.jar hive-common/2.3.9//hive-common-2.3.9.jar @@ -89,49 +88,51 @@ hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.9.jar hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar hive-shims-scheduler/2.3.9//hive-shims-scheduler-2.3.9.jar hive-shims/2.3.9//hive-shims-2.3.9.jar -hive-storage-api/2.8.1//hive-storage-api-2.8.1.jar +hive-storage-api/2.7.3//hive-storage-api-2.7.3.jar +hive-vector-code-gen/2.3.9//hive-vector-code-gen-2.3.9.jar hk2-api/2.6.1//hk2-api-2.6.1.jar hk2-locator/2.6.1//hk2-locator-2.6.1.jar hk2-utils/2.6.1//hk2-utils-2.6.1.jar -httpclient/4.5.14//httpclient-4.5.14.jar -httpcore/4.4.16//httpcore-4.4.16.jar +httpclient/4.5.13//httpclient-4.5.13.jar +httpcore/4.4.14//httpcore-4.4.14.jar ini4j/0.5.4//ini4j-0.5.4.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar -ivy/2.5.2//ivy-2.5.2.jar -jackson-annotations/2.16.1//jackson-annotations-2.16.1.jar +ivy/2.5.0//ivy-2.5.0.jar +jackson-annotations/2.13.4//jackson-annotations-2.13.4.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar -jackson-core/2.15.2//jackson-core-2.15.2.jar -jackson-databind/2.15.2//jackson-databind-2.15.2.jar -jackson-dataformat-cbor/2.15.2//jackson-dataformat-cbor-2.15.2.jar -jackson-dataformat-yaml/2.15.2//jackson-dataformat-yaml-2.15.2.jar -jackson-datatype-jsr310/2.15.2//jackson-datatype-jsr310-2.15.2.jar +jackson-core/2.13.4//jackson-core-2.13.4.jar +jackson-databind/2.13.4.1//jackson-databind-2.13.4.1.jar +jackson-dataformat-cbor/2.13.4//jackson-dataformat-cbor-2.13.4.jar +jackson-dataformat-yaml/2.13.4//jackson-dataformat-yaml-2.13.4.jar +jackson-datatype-jsr310/2.13.4//jackson-datatype-jsr310-2.13.4.jar jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar -jackson-module-scala_2.12/2.15.2//jackson-module-scala_2.12-2.15.2.jar +jackson-module-scala_2.12/2.13.4//jackson-module-scala_2.12-2.13.4.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar 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.1.9//janino-3.1.9.jar -javassist/3.29.2-GA//javassist-3.29.2-GA.jar +janino/3.1.7//janino-3.1.7.jar +javassist/3.25.0-GA//javassist-3.25.0-GA.jar javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar javolution/5.5.1//javolution-5.5.1.jar +jaxb-api/2.2.11//jaxb-api-2.2.11.jar jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar -jcl-over-slf4j/2.0.7//jcl-over-slf4j-2.0.7.jar +jcl-over-slf4j/2.0.3//jcl-over-slf4j-2.0.3.jar jdo-api/3.0.1//jdo-api-3.0.1.jar jdom2/2.0.6//jdom2-2.0.6.jar -jersey-client/2.40//jersey-client-2.40.jar -jersey-common/2.40//jersey-common-2.40.jar -jersey-container-servlet-core/2.40//jersey-container-servlet-core-2.40.jar -jersey-container-servlet/2.40//jersey-container-servlet-2.40.jar -jersey-hk2/2.40//jersey-hk2-2.40.jar -jersey-server/2.40//jersey-server-2.40.jar -jettison/1.5.4//jettison-1.5.4.jar -jetty-util-ajax/9.4.51.v20230217//jetty-util-ajax-9.4.51.v20230217.jar -jetty-util/9.4.51.v20230217//jetty-util-9.4.51.v20230217.jar +jersey-client/2.36//jersey-client-2.36.jar +jersey-common/2.36//jersey-common-2.36.jar +jersey-container-servlet-core/2.36//jersey-container-servlet-core-2.36.jar +jersey-container-servlet/2.36//jersey-container-servlet-2.36.jar +jersey-hk2/2.36//jersey-hk2-2.36.jar +jersey-server/2.36//jersey-server-2.36.jar +jettison/1.1//jettison-1.1.jar +jetty-util-ajax/9.4.49.v20220914//jetty-util-ajax-9.4.49.v20220914.jar +jetty-util/9.4.49.v20220914//jetty-util-9.4.49.v20220914.jar jline/2.14.6//jline-2.14.6.jar -joda-time/2.12.5//joda-time-2.12.5.jar +joda-time/2.11.2//joda-time-2.11.2.jar jodd-core/3.5.2//jodd-core-3.5.2.jar jpam/1.1//jpam-1.1.jar json/1.8//json-1.8.jar @@ -141,102 +142,102 @@ json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar json4s-scalap_2.12/3.7.0-M11//json4s-scalap_2.12-3.7.0-M11.jar jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar -jul-to-slf4j/2.0.7//jul-to-slf4j-2.0.7.jar +jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar -kubernetes-client-api/6.8.1//kubernetes-client-api-6.8.1.jar -kubernetes-client/6.8.1//kubernetes-client-6.8.1.jar -kubernetes-httpclient-okhttp/6.8.1//kubernetes-httpclient-okhttp-6.8.1.jar -kubernetes-model-admissionregistration/6.8.1//kubernetes-model-admissionregistration-6.8.1.jar -kubernetes-model-apiextensions/6.8.1//kubernetes-model-apiextensions-6.8.1.jar -kubernetes-model-apps/6.8.1//kubernetes-model-apps-6.8.1.jar -kubernetes-model-autoscaling/6.8.1//kubernetes-model-autoscaling-6.8.1.jar -kubernetes-model-batch/6.8.1//kubernetes-model-batch-6.8.1.jar -kubernetes-model-certificates/6.8.1//kubernetes-model-certificates-6.8.1.jar -kubernetes-model-common/6.8.1//kubernetes-model-common-6.8.1.jar -kubernetes-model-coordination/6.8.1//kubernetes-model-coordination-6.8.1.jar -kubernetes-model-core/6.8.1//kubernetes-model-core-6.8.1.jar -kubernetes-model-discovery/6.8.1//kubernetes-model-discovery-6.8.1.jar -kubernetes-model-events/6.8.1//kubernetes-model-events-6.8.1.jar -kubernetes-model-extensions/6.8.1//kubernetes-model-extensions-6.8.1.jar -kubernetes-model-flowcontrol/6.8.1//kubernetes-model-flowcontrol-6.8.1.jar -kubernetes-model-gatewayapi/6.8.1//kubernetes-model-gatewayapi-6.8.1.jar -kubernetes-model-metrics/6.8.1//kubernetes-model-metrics-6.8.1.jar -kubernetes-model-networking/6.8.1//kubernetes-model-networking-6.8.1.jar -kubernetes-model-node/6.8.1//kubernetes-model-node-6.8.1.jar -kubernetes-model-policy/6.8.1//kubernetes-model-policy-6.8.1.jar -kubernetes-model-rbac/6.8.1//kubernetes-model-rbac-6.8.1.jar -kubernetes-model-resource/6.8.1//kubernetes-model-resource-6.8.1.jar -kubernetes-model-scheduling/6.8.1//kubernetes-model-scheduling-6.8.1.jar -kubernetes-model-storageclass/6.8.1//kubernetes-model-storageclass-6.8.1.jar -lapack/3.0.3//lapack-3.0.3.jar +kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar +kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar +kubernetes-httpclient-okhttp/6.1.1//kubernetes-httpclient-okhttp-6.1.1.jar +kubernetes-model-admissionregistration/6.1.1//kubernetes-model-admissionregistration-6.1.1.jar +kubernetes-model-apiextensions/6.1.1//kubernetes-model-apiextensions-6.1.1.jar +kubernetes-model-apps/6.1.1//kubernetes-model-apps-6.1.1.jar +kubernetes-model-autoscaling/6.1.1//kubernetes-model-autoscaling-6.1.1.jar +kubernetes-model-batch/6.1.1//kubernetes-model-batch-6.1.1.jar +kubernetes-model-certificates/6.1.1//kubernetes-model-certificates-6.1.1.jar +kubernetes-model-common/6.1.1//kubernetes-model-common-6.1.1.jar +kubernetes-model-coordination/6.1.1//kubernetes-model-coordination-6.1.1.jar +kubernetes-model-core/6.1.1//kubernetes-model-core-6.1.1.jar +kubernetes-model-discovery/6.1.1//kubernetes-model-discovery-6.1.1.jar +kubernetes-model-events/6.1.1//kubernetes-model-events-6.1.1.jar +kubernetes-model-extensions/6.1.1//kubernetes-model-extensions-6.1.1.jar +kubernetes-model-flowcontrol/6.1.1//kubernetes-model-flowcontrol-6.1.1.jar +kubernetes-model-gatewayapi/6.1.1//kubernetes-model-gatewayapi-6.1.1.jar +kubernetes-model-metrics/6.1.1//kubernetes-model-metrics-6.1.1.jar +kubernetes-model-networking/6.1.1//kubernetes-model-networking-6.1.1.jar +kubernetes-model-node/6.1.1//kubernetes-model-node-6.1.1.jar +kubernetes-model-policy/6.1.1//kubernetes-model-policy-6.1.1.jar +kubernetes-model-rbac/6.1.1//kubernetes-model-rbac-6.1.1.jar +kubernetes-model-scheduling/6.1.1//kubernetes-model-scheduling-6.1.1.jar +kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar +lapack/3.0.2//lapack-3.0.2.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 -log4j-1.2-api/2.20.0//log4j-1.2-api-2.20.0.jar -log4j-api/2.20.0//log4j-api-2.20.0.jar -log4j-core/2.20.0//log4j-core-2.20.0.jar -log4j-slf4j2-impl/2.20.0//log4j-slf4j2-impl-2.20.0.jar +log4j-1.2-api/2.19.0//log4j-1.2-api-2.19.0.jar +log4j-api/2.19.0//log4j-api-2.19.0.jar +log4j-core/2.19.0//log4j-core-2.19.0.jar +log4j-slf4j2-impl/2.19.0//log4j-slf4j2-impl-2.19.0.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar -metrics-core/4.2.19//metrics-core-4.2.19.jar -metrics-graphite/4.2.19//metrics-graphite-4.2.19.jar -metrics-jmx/4.2.19//metrics-jmx-4.2.19.jar -metrics-json/4.2.19//metrics-json-4.2.19.jar -metrics-jvm/4.2.19//metrics-jvm-4.2.19.jar +metrics-core/4.2.10//metrics-core-4.2.10.jar +metrics-graphite/4.2.10//metrics-graphite-4.2.10.jar +metrics-jmx/4.2.10//metrics-jmx-4.2.10.jar +metrics-json/4.2.10//metrics-json-4.2.10.jar +metrics-jvm/4.2.10//metrics-jvm-4.2.10.jar minlog/1.3.0//minlog-1.3.0.jar -netty-all/4.1.96.Final//netty-all-4.1.96.Final.jar -netty-buffer/4.1.96.Final//netty-buffer-4.1.96.Final.jar -netty-codec-http/4.1.96.Final//netty-codec-http-4.1.96.Final.jar -netty-codec-http2/4.1.96.Final//netty-codec-http2-4.1.96.Final.jar -netty-codec-socks/4.1.96.Final//netty-codec-socks-4.1.96.Final.jar -netty-codec/4.1.96.Final//netty-codec-4.1.96.Final.jar -netty-common/4.1.96.Final//netty-common-4.1.96.Final.jar -netty-handler-proxy/4.1.96.Final//netty-handler-proxy-4.1.96.Final.jar -netty-handler/4.1.96.Final//netty-handler-4.1.96.Final.jar -netty-resolver/4.1.96.Final//netty-resolver-4.1.96.Final.jar -netty-transport-classes-epoll/4.1.96.Final//netty-transport-classes-epoll-4.1.96.Final.jar -netty-transport-classes-kqueue/4.1.96.Final//netty-transport-classes-kqueue-4.1.96.Final.jar -netty-transport-native-epoll/4.1.96.Final/linux-aarch_64/netty-transport-native-epoll-4.1.96.Final-linux-aarch_64.jar -netty-transport-native-epoll/4.1.96.Final/linux-x86_64/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar -netty-transport-native-kqueue/4.1.96.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.96.Final-osx-aarch_64.jar -netty-transport-native-kqueue/4.1.96.Final/osx-x86_64/netty-transport-native-kqueue-4.1.96.Final-osx-x86_64.jar -netty-transport-native-unix-common/4.1.96.Final//netty-transport-native-unix-common-4.1.96.Final.jar -netty-transport/4.1.96.Final//netty-transport-4.1.96.Final.jar -objenesis/3.3//objenesis-3.3.jar +netty-all/4.1.84.Final//netty-all-4.1.84.Final.jar +netty-buffer/4.1.84.Final//netty-buffer-4.1.84.Final.jar +netty-codec-http/4.1.84.Final//netty-codec-http-4.1.84.Final.jar +netty-codec-http2/4.1.84.Final//netty-codec-http2-4.1.84.Final.jar +netty-codec-socks/4.1.84.Final//netty-codec-socks-4.1.84.Final.jar +netty-codec/4.1.84.Final//netty-codec-4.1.84.Final.jar +netty-common/4.1.84.Final//netty-common-4.1.84.Final.jar +netty-handler-proxy/4.1.84.Final//netty-handler-proxy-4.1.84.Final.jar +netty-handler/4.1.84.Final//netty-handler-4.1.84.Final.jar +netty-resolver/4.1.84.Final//netty-resolver-4.1.84.Final.jar +netty-tcnative-classes/2.0.54.Final//netty-tcnative-classes-2.0.54.Final.jar +netty-transport-classes-epoll/4.1.84.Final//netty-transport-classes-epoll-4.1.84.Final.jar +netty-transport-classes-kqueue/4.1.84.Final//netty-transport-classes-kqueue-4.1.84.Final.jar +netty-transport-native-epoll/4.1.84.Final/linux-aarch_64/netty-transport-native-epoll-4.1.84.Final-linux-aarch_64.jar +netty-transport-native-epoll/4.1.84.Final/linux-x86_64/netty-transport-native-epoll-4.1.84.Final-linux-x86_64.jar +netty-transport-native-kqueue/4.1.84.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.84.Final-osx-aarch_64.jar +netty-transport-native-kqueue/4.1.84.Final/osx-x86_64/netty-transport-native-kqueue-4.1.84.Final-osx-x86_64.jar +netty-transport-native-unix-common/4.1.84.Final//netty-transport-native-unix-common-4.1.84.Final.jar +netty-transport/4.1.84.Final//netty-transport-4.1.84.Final.jar +objenesis/3.2//objenesis-3.2.jar okhttp/3.12.12//okhttp-3.12.12.jar okio/1.15.0//okio-1.15.0.jar opencsv/2.3//opencsv-2.3.jar opentracing-api/0.33.0//opentracing-api-0.33.0.jar opentracing-noop/0.33.0//opentracing-noop-0.33.0.jar opentracing-util/0.33.0//opentracing-util-0.33.0.jar -orc-core/1.9.1/shaded-protobuf/orc-core-1.9.1-shaded-protobuf.jar -orc-mapreduce/1.9.1/shaded-protobuf/orc-mapreduce-1.9.1-shaded-protobuf.jar -orc-shims/1.9.1//orc-shims-1.9.1.jar +orc-core/1.8.0/shaded-protobuf/orc-core-1.8.0-shaded-protobuf.jar +orc-mapreduce/1.8.0/shaded-protobuf/orc-mapreduce-1.8.0-shaded-protobuf.jar +orc-shims/1.8.0//orc-shims-1.8.0.jar oro/2.0.8//oro-2.0.8.jar osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar paranamer/2.8//paranamer-2.8.jar -parquet-column/1.13.1//parquet-column-1.13.1.jar -parquet-common/1.13.1//parquet-common-1.13.1.jar -parquet-encoding/1.13.1//parquet-encoding-1.13.1.jar -parquet-format-structures/1.13.1//parquet-format-structures-1.13.1.jar -parquet-hadoop/1.13.1//parquet-hadoop-1.13.1.jar -parquet-jackson/1.13.1//parquet-jackson-1.13.1.jar -pickle/1.3//pickle-1.3.jar +parquet-column/1.12.3//parquet-column-1.12.3.jar +parquet-common/1.12.3//parquet-common-1.12.3.jar +parquet-encoding/1.12.3//parquet-encoding-1.12.3.jar +parquet-format-structures/1.12.3//parquet-format-structures-1.12.3.jar +parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar +parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar +pickle/1.2//pickle-1.2.jar +protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.9.7//py4j-0.10.9.7.jar remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar -rocksdbjni/8.3.2//rocksdbjni-8.3.2.jar +rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar -scala-compiler/2.12.18//scala-compiler-2.12.18.jar -scala-library/2.12.18//scala-library-2.12.18.jar -scala-parser-combinators_2.12/2.3.0//scala-parser-combinators_2.12-2.3.0.jar -scala-reflect/2.12.18//scala-reflect-2.12.18.jar -scala-xml_2.12/2.2.0//scala-xml_2.12-2.2.0.jar -shims/0.9.45//shims-0.9.45.jar -slf4j-api/2.0.7//slf4j-api-2.0.7.jar -snakeyaml-engine/2.6//snakeyaml-engine-2.6.jar -snakeyaml/2.0//snakeyaml-2.0.jar -snappy-java/1.1.10.3//snappy-java-1.1.10.3.jar +scala-compiler/2.12.17//scala-compiler-2.12.17.jar +scala-library/2.12.17//scala-library-2.12.17.jar +scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar +scala-reflect/2.12.17//scala-reflect-2.12.17.jar +scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar +shims/0.9.32//shims-0.9.32.jar +slf4j-api/2.0.3//slf4j-api-2.0.3.jar +snakeyaml/1.31//snakeyaml-1.31.jar +snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar @@ -245,15 +246,14 @@ stax-api/1.0.1//stax-api-1.0.1.jar stream/2.9.6//stream-2.9.6.jar super-csv/2.2.0//super-csv-2.2.0.jar threeten-extra/1.7.1//threeten-extra-1.7.1.jar -tink/1.9.0//tink-1.9.0.jar +tink/1.7.0//tink-1.7.0.jar transaction-api/1.1//transaction-api-1.1.jar -txw2/3.0.2//txw2-3.0.2.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar -wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar -xbean-asm9-shaded/4.23//xbean-asm9-shaded-4.23.jar -xmlschema-core/2.3.0//xmlschema-core-2.3.0.jar -xz/1.9//xz-1.9.jar +velocity/1.5//velocity-1.5.jar +wildfly-openssl/1.0.7.Final//wildfly-openssl-1.0.7.Final.jar +xbean-asm9-shaded/4.21//xbean-asm9-shaded-4.21.jar +xz/1.8//xz-1.8.jar zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar -zookeeper-jute/3.6.3//zookeeper-jute-3.6.3.jar -zookeeper/3.6.3//zookeeper-3.6.3.jar -zstd-jni/1.5.5-5//zstd-jni-1.5.5-5.jar +zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar +zookeeper/3.6.2//zookeeper-3.6.2.jar +zstd-jni/1.5.2-4//zstd-jni-1.5.2-4.jar diff --git a/pom.xml b/pom.xml index 0b8b4c0ccdf52..897f3549d5c57 100644 --- a/pom.xml +++ b/pom.xml @@ -579,7 +579,7 @@ org.apache.commons commons-text - 1.6 + 1.11.0 commons-lang