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/common/utils/pom.xml b/common/utils/pom.xml index 1e30bfe67b90f..4242823c198e2 100644 --- a/common/utils/pom.xml +++ b/common/utils/pom.xml @@ -51,6 +51,10 @@ org.apache.commons commons-text + + org.apache.ivy + ivy + org.slf4j slf4j-api 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 ba208517507bb..f5085d8b0f24a 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-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 @@ -108,17 +108,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 @@ -146,7 +146,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 @@ -159,30 +159,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 @@ -194,11 +194,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.68.Final//netty-all-4.1.68.Final.jar objenesis/2.6//objenesis-2.6.jar @@ -221,16 +221,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 @@ -244,7 +244,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 @@ -252,4 +252,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 83d98ba60d653..740a18826c442 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -49,7 +49,7 @@ commons-lang3/3.13.0//commons-lang3-3.13.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 @@ -75,7 +75,6 @@ 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-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar -hadoop-openstack/3.3.6//hadoop-openstack-3.3.6.jar hadoop-yarn-server-web-proxy/3.3.6//hadoop-yarn-server-web-proxy-3.3.6.jar hive-beeline/2.3.9//hive-beeline-2.3.9.jar hive-cli/2.3.9//hive-cli-2.3.9.jar @@ -118,6 +117,7 @@ janino/3.1.9//janino-3.1.9.jar javassist/3.29.2-GA//javassist-3.29.2-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 jdo-api/3.0.1//jdo-api-3.0.1.jar diff --git a/pom.xml b/pom.xml index 84a25c29af715..85fa1e4e50c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -625,7 +625,7 @@ org.apache.commons commons-text - 1.10.0 + 1.11.0 commons-lang