This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 92b708b6b767 [SPARK-48254][BUILD] Enhance Guava version extraction
rule in `dev/test-dependencies.sh`
92b708b6b767 is described below
commit 92b708b6b7672e827370139ecd430d448503b445
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Mon May 13 18:59:17 2024 +0900
[SPARK-48254][BUILD] Enhance Guava version extraction rule in
`dev/test-dependencies.sh`
### What changes were proposed in this pull request?
Enhance Guava version extraction rule(regex) in `dev/test-dependencies.sh`
### Why are the changes needed?
The existing regex `^[0-9.]+$` only matches older Guava versions, e.g.
14.0.1, while the recent Guava version has a suffix `-jre` or `-android`, for
example, `33.1.0-jre`
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Manually tested on upgrading Guava to `33.1.0-jre`
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #46555 from pan3793/SPARK-48254.
Authored-by: Cheng Pan <cheng...@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
---
dev/test-dependencies.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/test-dependencies.sh b/dev/test-dependencies.sh
index e645a66165a2..563a7e1acab4 100755
--- a/dev/test-dependencies.sh
+++ b/dev/test-dependencies.sh
@@ -49,7 +49,7 @@ OLD_VERSION=$($MVN -q \
--non-recursive \
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E
'[0-9]+\.[0-9]+\.[0-9]+')
# dependency:get for guava and jetty-io are workaround for SPARK-37302.
-GUAVA_VERSION=$(build/mvn help:evaluate -Dexpression=guava.version -q
-DforceStdout | grep -E "^[0-9.]+$")
+GUAVA_VERSION=$(build/mvn help:evaluate -Dexpression=guava.version -q
-DforceStdout | grep -E "^[0-9\.]+")
build/mvn dependency:get -Dartifact=com.google.guava:guava:${GUAVA_VERSION} -q
JETTY_VERSION=$(build/mvn help:evaluate -Dexpression=jetty.version -q
-DforceStdout | grep -E "[0-9]+\.[0-9]+\.[0-9]+")
build/mvn dependency:get
-Dartifact=org.eclipse.jetty:jetty-io:${JETTY_VERSION} -q
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
