Skip to content

Commit

Permalink
ODP-1303 [SPARK-45732][BUILD] Upgrade commons-text to 1.11.0
Browse files Browse the repository at this point in the history 
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 apache#452. Fixes [TEXT-228](https://issues.apache.org/jira/browse/TEXT-228).
- TextStringBuidler#hashCode() allocates a String on each call apache#387.

No.

Pass GA.

No.

Closes apache#43590 from panbingkun/SPARK-45732.

Authored-by: panbingkun <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
(cherry picked from commit d38f074)
[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 apache#38262 from bjornjorgensen/commons-text-1.10.

Authored-by: Bjørn <[email protected]>
Signed-off-by: Yuming Wang <[email protected]>
(cherry picked from commit 99abc94)
[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 apache#35542 from LuciferYang/upgrade-common-text.

Authored-by: yangjie01 <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 70f5bfd)
(cherry picked from commit 5cb61e7)

# Conflicts:
#	pom.xml
  • Loading branch information
@prabhjyotsingh
prabhjyotsingh committed May 2, 2024
1 parent 222356d commit 7ba99ec
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 196 deletions.
8 changes: 0 additions & 8 deletions ...on/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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())
Expand Down
96 changes: 48 additions & 48 deletions dev/deps/spark-deps-hadoop-2-hive-2.3
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -263,12 +263,12 @@ 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
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
Loading

0 comments on commit 7ba99ec

Please sign in to comment.