Skip to content

Commit 4d40dcf

Browse files
prabhjyotsinghsenthh
authored andcommitted
ODP-1486|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 2a11891 commit 4d40dcf

File tree

5 files changed

+55
-59
lines changed

5 files changed

+55
-59
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())

common/utils/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
<groupId>org.apache.commons</groupId>
5252
<artifactId>commons-text</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.apache.ivy</groupId>
56+
<artifactId>ivy</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.slf4j</groupId>
5660
<artifactId>slf4j-api</artifactId>

dev/deps/spark-deps-hadoop-2.7-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
@@ -108,17 +108,17 @@ htrace-core/3.1.0-incubating//htrace-core-3.1.0-incubating.jar
108108
httpclient/4.5.13//httpclient-4.5.13.jar
109109
httpcore/4.4.14//httpcore-4.4.14.jar
110110
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
111-
ivy/2.5.1//ivy-2.5.1.jar
112-
jackson-annotations/2.14.0//jackson-annotations-2.14.0.jar
111+
ivy/2.5.0//ivy-2.5.0.jar
112+
jackson-annotations/2.13.4//jackson-annotations-2.13.4.jar
113113
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
114-
jackson-core/2.14.0//jackson-core-2.14.0.jar
115-
jackson-databind/2.14.0//jackson-databind-2.14.0.jar
116-
jackson-dataformat-cbor/2.14.0//jackson-dataformat-cbor-2.14.0.jar
117-
jackson-dataformat-yaml/2.14.0//jackson-dataformat-yaml-2.14.0.jar
118-
jackson-datatype-jsr310/2.14.0//jackson-datatype-jsr310-2.14.0.jar
114+
jackson-core/2.13.4//jackson-core-2.13.4.jar
115+
jackson-databind/2.13.4.1//jackson-databind-2.13.4.1.jar
116+
jackson-dataformat-cbor/2.13.4//jackson-dataformat-cbor-2.13.4.jar
117+
jackson-dataformat-yaml/2.13.4//jackson-dataformat-yaml-2.13.4.jar
118+
jackson-datatype-jsr310/2.13.4//jackson-datatype-jsr310-2.13.4.jar
119119
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
120120
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
121-
jackson-module-scala_2.12/2.14.0//jackson-module-scala_2.12-2.14.0.jar
121+
jackson-module-scala_2.12/2.13.4//jackson-module-scala_2.12-2.13.4.jar
122122
jackson-xc/1.9.13//jackson-xc-1.9.13.jar
123123
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
124124
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
146146
jetty-util/9.4.49.v20220914//jetty-util-9.4.49.v20220914.jar
147147
jetty/6.1.26//jetty-6.1.26.jar
148148
jline/2.14.6//jline-2.14.6.jar
149-
joda-time/2.12.0//joda-time-2.12.0.jar
149+
joda-time/2.11.2//joda-time-2.11.2.jar
150150
jodd-core/3.5.2//jodd-core-3.5.2.jar
151151
jpam/1.1//jpam-1.1.jar
152152
json/1.8//json-1.8.jar
@@ -159,30 +159,30 @@ jsr305/3.0.0//jsr305-3.0.0.jar
159159
jta/1.1//jta-1.1.jar
160160
jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar
161161
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
162-
kubernetes-client-api/6.2.0//kubernetes-client-api-6.2.0.jar
163-
kubernetes-client/6.2.0//kubernetes-client-6.2.0.jar
164-
kubernetes-httpclient-okhttp/6.2.0//kubernetes-httpclient-okhttp-6.2.0.jar
165-
kubernetes-model-admissionregistration/6.2.0//kubernetes-model-admissionregistration-6.2.0.jar
166-
kubernetes-model-apiextensions/6.2.0//kubernetes-model-apiextensions-6.2.0.jar
167-
kubernetes-model-apps/6.2.0//kubernetes-model-apps-6.2.0.jar
168-
kubernetes-model-autoscaling/6.2.0//kubernetes-model-autoscaling-6.2.0.jar
169-
kubernetes-model-batch/6.2.0//kubernetes-model-batch-6.2.0.jar
170-
kubernetes-model-certificates/6.2.0//kubernetes-model-certificates-6.2.0.jar
171-
kubernetes-model-common/6.2.0//kubernetes-model-common-6.2.0.jar
172-
kubernetes-model-coordination/6.2.0//kubernetes-model-coordination-6.2.0.jar
173-
kubernetes-model-core/6.2.0//kubernetes-model-core-6.2.0.jar
174-
kubernetes-model-discovery/6.2.0//kubernetes-model-discovery-6.2.0.jar
175-
kubernetes-model-events/6.2.0//kubernetes-model-events-6.2.0.jar
176-
kubernetes-model-extensions/6.2.0//kubernetes-model-extensions-6.2.0.jar
177-
kubernetes-model-flowcontrol/6.2.0//kubernetes-model-flowcontrol-6.2.0.jar
178-
kubernetes-model-gatewayapi/6.2.0//kubernetes-model-gatewayapi-6.2.0.jar
179-
kubernetes-model-metrics/6.2.0//kubernetes-model-metrics-6.2.0.jar
180-
kubernetes-model-networking/6.2.0//kubernetes-model-networking-6.2.0.jar
181-
kubernetes-model-node/6.2.0//kubernetes-model-node-6.2.0.jar
182-
kubernetes-model-policy/6.2.0//kubernetes-model-policy-6.2.0.jar
183-
kubernetes-model-rbac/6.2.0//kubernetes-model-rbac-6.2.0.jar
184-
kubernetes-model-scheduling/6.2.0//kubernetes-model-scheduling-6.2.0.jar
185-
kubernetes-model-storageclass/6.2.0//kubernetes-model-storageclass-6.2.0.jar
162+
kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar
163+
kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar
164+
kubernetes-httpclient-okhttp/6.1.1//kubernetes-httpclient-okhttp-6.1.1.jar
165+
kubernetes-model-admissionregistration/6.1.1//kubernetes-model-admissionregistration-6.1.1.jar
166+
kubernetes-model-apiextensions/6.1.1//kubernetes-model-apiextensions-6.1.1.jar
167+
kubernetes-model-apps/6.1.1//kubernetes-model-apps-6.1.1.jar
168+
kubernetes-model-autoscaling/6.1.1//kubernetes-model-autoscaling-6.1.1.jar
169+
kubernetes-model-batch/6.1.1//kubernetes-model-batch-6.1.1.jar
170+
kubernetes-model-certificates/6.1.1//kubernetes-model-certificates-6.1.1.jar
171+
kubernetes-model-common/6.1.1//kubernetes-model-common-6.1.1.jar
172+
kubernetes-model-coordination/6.1.1//kubernetes-model-coordination-6.1.1.jar
173+
kubernetes-model-core/6.1.1//kubernetes-model-core-6.1.1.jar
174+
kubernetes-model-discovery/6.1.1//kubernetes-model-discovery-6.1.1.jar
175+
kubernetes-model-events/6.1.1//kubernetes-model-events-6.1.1.jar
176+
kubernetes-model-extensions/6.1.1//kubernetes-model-extensions-6.1.1.jar
177+
kubernetes-model-flowcontrol/6.1.1//kubernetes-model-flowcontrol-6.1.1.jar
178+
kubernetes-model-gatewayapi/6.1.1//kubernetes-model-gatewayapi-6.1.1.jar
179+
kubernetes-model-metrics/6.1.1//kubernetes-model-metrics-6.1.1.jar
180+
kubernetes-model-networking/6.1.1//kubernetes-model-networking-6.1.1.jar
181+
kubernetes-model-node/6.1.1//kubernetes-model-node-6.1.1.jar
182+
kubernetes-model-policy/6.1.1//kubernetes-model-policy-6.1.1.jar
183+
kubernetes-model-rbac/6.1.1//kubernetes-model-rbac-6.1.1.jar
184+
kubernetes-model-scheduling/6.1.1//kubernetes-model-scheduling-6.1.1.jar
185+
kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar
186186
lapack/3.0.2//lapack-3.0.2.jar
187187
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
188188
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
194194
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
195195
lz4-java/1.8.0//lz4-java-1.8.0.jar
196196
mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar
197-
metrics-core/4.2.12//metrics-core-4.2.12.jar
198-
metrics-graphite/4.2.12//metrics-graphite-4.2.12.jar
199-
metrics-jmx/4.2.12//metrics-jmx-4.2.12.jar
200-
metrics-json/4.2.12//metrics-json-4.2.12.jar
201-
metrics-jvm/4.2.12//metrics-jvm-4.2.12.jar
197+
metrics-core/4.2.10//metrics-core-4.2.10.jar
198+
metrics-graphite/4.2.10//metrics-graphite-4.2.10.jar
199+
metrics-jmx/4.2.10//metrics-jmx-4.2.10.jar
200+
metrics-json/4.2.10//metrics-json-4.2.10.jar
201+
metrics-jvm/4.2.10//metrics-jvm-4.2.10.jar
202202
minlog/1.3.0//minlog-1.3.0.jar
203203
netty-all/4.1.68.Final//netty-all-4.1.68.Final.jar
204204
objenesis/2.6//objenesis-2.6.jar
@@ -221,16 +221,16 @@ pickle/1.2//pickle-1.2.jar
221221
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
222222
py4j/0.10.9.7//py4j-0.10.9.7.jar
223223
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
224-
rocksdbjni/7.7.3//rocksdbjni-7.7.3.jar
224+
rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar
225225
scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar
226226
scala-compiler/2.12.17//scala-compiler-2.12.17.jar
227227
scala-library/2.12.17//scala-library-2.12.17.jar
228228
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
229229
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
230230
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
231-
shims/0.9.35//shims-0.9.35.jar
231+
shims/0.9.32//shims-0.9.32.jar
232232
slf4j-api/2.0.3//slf4j-api-2.0.3.jar
233-
snakeyaml/1.33//snakeyaml-1.33.jar
233+
snakeyaml/1.31//snakeyaml-1.31.jar
234234
snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar
235235
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
236236
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
@@ -244,12 +244,12 @@ tink/1.7.0//tink-1.7.0.jar
244244
transaction-api/1.1//transaction-api-1.1.jar
245245
univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
246246
velocity/1.5//velocity-1.5.jar
247-
xbean-asm9-shaded/4.22//xbean-asm9-shaded-4.22.jar
247+
xbean-asm9-shaded/4.21//xbean-asm9-shaded-4.21.jar
248248
xercesImpl/2.12.2//xercesImpl-2.12.2.jar
249249
xml-apis/1.4.01//xml-apis-1.4.01.jar
250250
xmlenc/0.52//xmlenc-0.52.jar
251251
xz/1.8//xz-1.8.jar
252252
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
253253
zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
254254
zookeeper/3.6.2//zookeeper-3.6.2.jar
255-
zstd-jni/1.5.2-5//zstd-jni-1.5.2-5.jar
255+
zstd-jni/1.5.2-4//zstd-jni-1.5.2-4.jar

dev/deps/spark-deps-hadoop-3-hive-2.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ commons-lang3/3.13.0//commons-lang3-3.13.0.jar
4949
commons-logging/1.1.3//commons-logging-1.1.3.jar
5050
commons-math3/3.6.1//commons-math3-3.6.1.jar
5151
commons-pool/1.5.4//commons-pool-1.5.4.jar
52-
commons-text/1.10.0//commons-text-1.10.0.jar
52+
commons-text/1.11.0//commons-text-1.11.0.jar
5353
compress-lzf/1.1.2//compress-lzf-1.1.2.jar
5454
curator-client/5.2.0//curator-client-5.2.0.jar
5555
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
7575
hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar
7676
hadoop-cloud-storage/3.3.6//hadoop-cloud-storage-3.3.6.jar
7777
hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar
78-
hadoop-openstack/3.3.6//hadoop-openstack-3.3.6.jar
7978
hadoop-yarn-server-web-proxy/3.3.6//hadoop-yarn-server-web-proxy-3.3.6.jar
8079
hive-beeline/2.3.9//hive-beeline-2.3.9.jar
8180
hive-cli/2.3.9//hive-cli-2.3.9.jar
@@ -118,6 +117,7 @@ janino/3.1.9//janino-3.1.9.jar
118117
javassist/3.29.2-GA//javassist-3.29.2-GA.jar
119118
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
120119
javolution/5.5.1//javolution-5.5.1.jar
120+
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
121121
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
122122
jcl-over-slf4j/2.0.7//jcl-over-slf4j-2.0.7.jar
123123
jdo-api/3.0.1//jdo-api-3.0.1.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625
<dependency>
626626
<groupId>org.apache.commons</groupId>
627627
<artifactId>commons-text</artifactId>
628-
<version>1.10.0</version>
628+
<version>1.11.0</version>
629629
</dependency>
630630
<dependency>
631631
<groupId>commons-lang</groupId>

0 commit comments

Comments
 (0)