From e9bdb590474ba99937b8c0920b603d66c3df3e7b Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 14 May 2020 14:45:54 -0700 Subject: [PATCH 1/2] [SPARK-31713][INFRA] Make test-dependencies.sh detect version string correctly --- 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 936ac00f6b9e7..0f492d8d55404 100755 --- a/dev/test-dependencies.sh +++ b/dev/test-dependencies.sh @@ -47,7 +47,7 @@ OLD_VERSION=$($MVN -q \ -Dexec.executable="echo" \ -Dexec.args='${project.version}' \ --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.6.0:exec) + org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -e '[0-9]\.[0-9]\.[0-9]') if [ $? != 0 ]; then echo -e "Error while getting version string from Maven:\n$OLD_VERSION" exit 1 From b96806ac992f6b0205895d1c13bbf271f3a37ad3 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 14 May 2020 18:45:52 -0700 Subject: [PATCH 2/2] Address comment --- 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 0f492d8d55404..46f1f55938120 100755 --- a/dev/test-dependencies.sh +++ b/dev/test-dependencies.sh @@ -47,7 +47,7 @@ OLD_VERSION=$($MVN -q \ -Dexec.executable="echo" \ -Dexec.args='${project.version}' \ --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -e '[0-9]\.[0-9]\.[0-9]') + org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+\.[0-9]+') if [ $? != 0 ]; then echo -e "Error while getting version string from Maven:\n$OLD_VERSION" exit 1