Skip to content

Commit 7aa10a3

Browse files
prabhjyotsinghprabhjyotsingh
committed
ODP-1303 [SPARK-45732][BUILD] Upgrade commons-text to 1.11.0
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 5cb61e758a955ca8c6e28bbdc95468facdf2b20a) # Conflicts: # pom.xml (cherry picked from commit 7ba99ec)
1 parent 58ad52c commit 7aa10a3

File tree

4 files changed

+188
-196
lines changed

4 files changed

+188
-196
lines changed

‎common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.spark.unsafe.types
1919

20-
import org.apache.commons.text.similarity.LevenshteinDistance
2120
import org.scalacheck.{Arbitrary, Gen}
2221
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
2322
// scalastyle:off
@@ -230,13 +229,6 @@ class UTF8StringPropertyCheckSuite extends AnyFunSuite with ScalaCheckDrivenProp
230229
}
231230
}
232231

233-
test("levenshteinDistance") {
234-
forAll { (one: String, another: String) =>
235-
assert(toUTF8(one).levenshteinDistance(toUTF8(another)) ===
236-
LevenshteinDistance.getDefaultInstance.apply(one, another))
237-
}
238-
}
239-
240232
test("hashCode") {
241233
forAll { (s: String) =>
242234
assert(toUTF8(s).hashCode() === toUTF8(s).hashCode())

‎dev/deps/spark-deps-hadoop-2-hive-2.3‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
HikariCP/2.5.1//HikariCP-2.5.1.jar
22
JLargeArrays/1.5//JLargeArrays-1.5.jar
33
JTransforms/3.1//JTransforms-3.1.jar
4-
RoaringBitmap/0.9.35//RoaringBitmap-0.9.35.jar
4+
RoaringBitmap/0.9.32//RoaringBitmap-0.9.32.jar
55
ST4/4.0.4//ST4-4.0.4.jar
66
activation/1.1.1//activation-1.1.1.jar
77
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
1717
api-util/1.0.0-M20//api-util-1.0.0-M20.jar
1818
arpack/3.0.2//arpack-3.0.2.jar
1919
arpack_combined_all/0.1//arpack_combined_all-0.1.jar
20-
arrow-format/10.0.0//arrow-format-10.0.0.jar
21-
arrow-memory-core/10.0.0//arrow-memory-core-10.0.0.jar
22-
arrow-memory-netty/10.0.0//arrow-memory-netty-10.0.0.jar
23-
arrow-vector/10.0.0//arrow-vector-10.0.0.jar
20+
arrow-format/9.0.0//arrow-format-9.0.0.jar
21+
arrow-memory-core/9.0.0//arrow-memory-core-9.0.0.jar
22+
arrow-memory-netty/9.0.0//arrow-memory-netty-9.0.0.jar
23+
arrow-vector/9.0.0//arrow-vector-9.0.0.jar
2424
audience-annotations/0.5.0//audience-annotations-0.5.0.jar
2525
avro-ipc/1.11.1//avro-ipc-1.11.1.jar
2626
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
109109
httpclient/4.5.13//httpclient-4.5.13.jar
110110
httpcore/4.4.14//httpcore-4.4.14.jar
111111
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
112-
ivy/2.5.1//ivy-2.5.1.jar
113-
jackson-annotations/2.14.0//jackson-annotations-2.14.0.jar
112+
ivy/2.5.0//ivy-2.5.0.jar
113+
jackson-annotations/2.13.4//jackson-annotations-2.13.4.jar
114114
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
115-
jackson-core/2.14.0//jackson-core-2.14.0.jar
116-
jackson-databind/2.14.0//jackson-databind-2.14.0.jar
117-
jackson-dataformat-cbor/2.14.0//jackson-dataformat-cbor-2.14.0.jar
118-
jackson-dataformat-yaml/2.14.0//jackson-dataformat-yaml-2.14.0.jar
119-
jackson-datatype-jsr310/2.14.0//jackson-datatype-jsr310-2.14.0.jar
115+
jackson-core/2.13.4//jackson-core-2.13.4.jar
116+
jackson-databind/2.13.4.1//jackson-databind-2.13.4.1.jar
117+
jackson-dataformat-cbor/2.13.4//jackson-dataformat-cbor-2.13.4.jar
118+
jackson-dataformat-yaml/2.13.4//jackson-dataformat-yaml-2.13.4.jar
119+
jackson-datatype-jsr310/2.13.4//jackson-datatype-jsr310-2.13.4.jar
120120
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
121121
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
122-
jackson-module-scala_2.12/2.14.0//jackson-module-scala_2.12-2.14.0.jar
122+
jackson-module-scala_2.12/2.13.4//jackson-module-scala_2.12-2.13.4.jar
123123
jackson-xc/1.9.13//jackson-xc-1.9.13.jar
124124
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
125125
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
147147
jetty-util/9.4.49.v20220914//jetty-util-9.4.49.v20220914.jar
148148
jetty/6.1.26//jetty-6.1.26.jar
149149
jline/2.14.6//jline-2.14.6.jar
150-
joda-time/2.12.0//joda-time-2.12.0.jar
150+
joda-time/2.11.2//joda-time-2.11.2.jar
151151
jodd-core/3.5.2//jodd-core-3.5.2.jar
152152
jpam/1.1//jpam-1.1.jar
153153
json/1.8//json-1.8.jar
@@ -160,30 +160,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar
160160
jta/1.1//jta-1.1.jar
161161
jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar
162162
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
163-
kubernetes-client-api/6.2.0//kubernetes-client-api-6.2.0.jar
164-
kubernetes-client/6.2.0//kubernetes-client-6.2.0.jar
165-
kubernetes-httpclient-okhttp/6.2.0//kubernetes-httpclient-okhttp-6.2.0.jar
166-
kubernetes-model-admissionregistration/6.2.0//kubernetes-model-admissionregistration-6.2.0.jar
167-
kubernetes-model-apiextensions/6.2.0//kubernetes-model-apiextensions-6.2.0.jar
168-
kubernetes-model-apps/6.2.0//kubernetes-model-apps-6.2.0.jar
169-
kubernetes-model-autoscaling/6.2.0//kubernetes-model-autoscaling-6.2.0.jar
170-
kubernetes-model-batch/6.2.0//kubernetes-model-batch-6.2.0.jar
171-
kubernetes-model-certificates/6.2.0//kubernetes-model-certificates-6.2.0.jar
172-
kubernetes-model-common/6.2.0//kubernetes-model-common-6.2.0.jar
173-
kubernetes-model-coordination/6.2.0//kubernetes-model-coordination-6.2.0.jar
174-
kubernetes-model-core/6.2.0//kubernetes-model-core-6.2.0.jar
175-
kubernetes-model-discovery/6.2.0//kubernetes-model-discovery-6.2.0.jar
176-
kubernetes-model-events/6.2.0//kubernetes-model-events-6.2.0.jar
177-
kubernetes-model-extensions/6.2.0//kubernetes-model-extensions-6.2.0.jar
178-
kubernetes-model-flowcontrol/6.2.0//kubernetes-model-flowcontrol-6.2.0.jar
179-
kubernetes-model-gatewayapi/6.2.0//kubernetes-model-gatewayapi-6.2.0.jar
180-
kubernetes-model-metrics/6.2.0//kubernetes-model-metrics-6.2.0.jar
181-
kubernetes-model-networking/6.2.0//kubernetes-model-networking-6.2.0.jar
182-
kubernetes-model-node/6.2.0//kubernetes-model-node-6.2.0.jar
183-
kubernetes-model-policy/6.2.0//kubernetes-model-policy-6.2.0.jar
184-
kubernetes-model-rbac/6.2.0//kubernetes-model-rbac-6.2.0.jar
185-
kubernetes-model-scheduling/6.2.0//kubernetes-model-scheduling-6.2.0.jar
186-
kubernetes-model-storageclass/6.2.0//kubernetes-model-storageclass-6.2.0.jar
163+
kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar
164+
kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar
165+
kubernetes-httpclient-okhttp/6.1.1//kubernetes-httpclient-okhttp-6.1.1.jar
166+
kubernetes-model-admissionregistration/6.1.1//kubernetes-model-admissionregistration-6.1.1.jar
167+
kubernetes-model-apiextensions/6.1.1//kubernetes-model-apiextensions-6.1.1.jar
168+
kubernetes-model-apps/6.1.1//kubernetes-model-apps-6.1.1.jar
169+
kubernetes-model-autoscaling/6.1.1//kubernetes-model-autoscaling-6.1.1.jar
170+
kubernetes-model-batch/6.1.1//kubernetes-model-batch-6.1.1.jar
171+
kubernetes-model-certificates/6.1.1//kubernetes-model-certificates-6.1.1.jar
172+
kubernetes-model-common/6.1.1//kubernetes-model-common-6.1.1.jar
173+
kubernetes-model-coordination/6.1.1//kubernetes-model-coordination-6.1.1.jar
174+
kubernetes-model-core/6.1.1//kubernetes-model-core-6.1.1.jar
175+
kubernetes-model-discovery/6.1.1//kubernetes-model-discovery-6.1.1.jar
176+
kubernetes-model-events/6.1.1//kubernetes-model-events-6.1.1.jar
177+
kubernetes-model-extensions/6.1.1//kubernetes-model-extensions-6.1.1.jar
178+
kubernetes-model-flowcontrol/6.1.1//kubernetes-model-flowcontrol-6.1.1.jar
179+
kubernetes-model-gatewayapi/6.1.1//kubernetes-model-gatewayapi-6.1.1.jar
180+
kubernetes-model-metrics/6.1.1//kubernetes-model-metrics-6.1.1.jar
181+
kubernetes-model-networking/6.1.1//kubernetes-model-networking-6.1.1.jar
182+
kubernetes-model-node/6.1.1//kubernetes-model-node-6.1.1.jar
183+
kubernetes-model-policy/6.1.1//kubernetes-model-policy-6.1.1.jar
184+
kubernetes-model-rbac/6.1.1//kubernetes-model-rbac-6.1.1.jar
185+
kubernetes-model-scheduling/6.1.1//kubernetes-model-scheduling-6.1.1.jar
186+
kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar
187187
lapack/3.0.2//lapack-3.0.2.jar
188188
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
189189
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
195195
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
196196
lz4-java/1.8.0//lz4-java-1.8.0.jar
197197
mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar
198-
metrics-core/4.2.12//metrics-core-4.2.12.jar
199-
metrics-graphite/4.2.12//metrics-graphite-4.2.12.jar
200-
metrics-jmx/4.2.12//metrics-jmx-4.2.12.jar
201-
metrics-json/4.2.12//metrics-json-4.2.12.jar
202-
metrics-jvm/4.2.12//metrics-jvm-4.2.12.jar
198+
metrics-core/4.2.10//metrics-core-4.2.10.jar
199+
metrics-graphite/4.2.10//metrics-graphite-4.2.10.jar
200+
metrics-jmx/4.2.10//metrics-jmx-4.2.10.jar
201+
metrics-json/4.2.10//metrics-json-4.2.10.jar
202+
metrics-jvm/4.2.10//metrics-jvm-4.2.10.jar
203203
minlog/1.3.0//minlog-1.3.0.jar
204204
netty-all/4.1.84.Final//netty-all-4.1.84.Final.jar
205205
netty-buffer/4.1.84.Final//netty-buffer-4.1.84.Final.jar
@@ -240,16 +240,16 @@ pickle/1.2//pickle-1.2.jar
240240
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
241241
py4j/0.10.9.7//py4j-0.10.9.7.jar
242242
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
243-
rocksdbjni/7.7.3//rocksdbjni-7.7.3.jar
243+
rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar
244244
scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar
245245
scala-compiler/2.12.17//scala-compiler-2.12.17.jar
246246
scala-library/2.12.17//scala-library-2.12.17.jar
247247
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
248248
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
249249
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
250-
shims/0.9.35//shims-0.9.35.jar
250+
shims/0.9.32//shims-0.9.32.jar
251251
slf4j-api/2.0.3//slf4j-api-2.0.3.jar
252-
snakeyaml/1.33//snakeyaml-1.33.jar
252+
snakeyaml/1.31//snakeyaml-1.31.jar
253253
snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar
254254
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
255255
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
@@ -263,12 +263,12 @@ tink/1.7.0//tink-1.7.0.jar
263263
transaction-api/1.1//transaction-api-1.1.jar
264264
univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
265265
velocity/1.5//velocity-1.5.jar
266-
xbean-asm9-shaded/4.22//xbean-asm9-shaded-4.22.jar
266+
xbean-asm9-shaded/4.21//xbean-asm9-shaded-4.21.jar
267267
xercesImpl/2.12.2//xercesImpl-2.12.2.jar
268268
xml-apis/1.4.01//xml-apis-1.4.01.jar
269269
xmlenc/0.52//xmlenc-0.52.jar
270270
xz/1.8//xz-1.8.jar
271271
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
272272
zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
273273
zookeeper/3.6.2//zookeeper-3.6.2.jar
274-
zstd-jni/1.5.2-5//zstd-jni-1.5.2-5.jar
274+
zstd-jni/1.5.2-4//zstd-jni-1.5.2-4.jar

0 commit comments

Comments
 (0)