You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by bo...@apache.org on 2023/04/03 03:45:22 UTC
[kyuubi] branch master updated: [KYUUBI #4647] Bump Maven from 3.8.7 to 3.9.1 and Mvnd from 0.9.0 to 1.0-m6
This is an automated email from the ASF dual-hosted git repository.
bowenliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new b818c6fd8 [KYUUBI #4647] Bump Maven from 3.8.7 to 3.9.1 and Mvnd from 0.9.0 to 1.0-m6
b818c6fd8 is described below
commit b818c6fd84e04c5a3aa13a789bceb805c29c63aa
Author: liangbowen <li...@gf.com.cn>
AuthorDate: Mon Apr 3 11:45:10 2023 +0800
[KYUUBI #4647] Bump Maven from 3.8.7 to 3.9.1 and Mvnd from 0.9.0 to 1.0-m6
### _Why are the changes needed?_
- bump Maven from 3.8.7 to 3.9.1, 3.9.1 fixed the performance issue [MNG-7677](https://issues.apache.org/jira/browse/MNG-7677) in 3.9.0, release notes: https://maven.apache.org/docs/3.9.1/release-notes.html
- Mvnd from 0.9.0 to 1.0-m6 (with embedded maven 3.9.1), release notes: https://github.com/apache/maven-mvnd/releases/tag/1.0-m6
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [x] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #4647 from bowenliang123/maven-3.9.1.
Closes #4647
f803394df [liangbowen] remove property
efd199f7a [liangbowen] fix
87e18d70a [Bowen Liang] Update build/mvnd
10f4a25ff [liangbowen] bump Maven from 3.8.7 to 3.9.1, and Mvnd from 0.9.0 to 1.0-m6 (with embedded maven 3.9.1)
Lead-authored-by: liangbowen <li...@gf.com.cn>
Co-authored-by: Bowen Liang <li...@gf.com.cn>
Signed-off-by: liangbowen <li...@gf.com.cn>
---
build/mvnd | 9 +++++----
pom.xml | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build/mvnd b/build/mvnd
index 81a6f5c20..f0c72332f 100755
--- a/build/mvnd
+++ b/build/mvnd
@@ -94,8 +94,9 @@ function get_os_arch() {
# Determine the Mvnd version from the root pom.xml file and
# install mvnd under the build/ folder if needed.
function install_mvnd() {
- local MVND_VERSION=$(grep "<mvnd.version>" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}')
local MVN_VERSION=$(grep "<maven.version>" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}')
+ local MVND_VERSION=$(grep "<mvnd.version>" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}')
+ local MVND_MVN_SHORT_VERSION=$(echo "$MVN_VERSION" | awk -F . '{print $1$2}')
MVND_BIN="$(command -v mvnd)"
if [ "$MVND_BIN" ]; then
local MVND_DETECTED_VERSION="$(mvnd -v 2>&1 | grep '(mvnd)' | awk '{print $5}')"
@@ -111,10 +112,10 @@ function install_mvnd() {
install_app \
"${APACHE_MIRROR}/maven/mvnd/${MVND_VERSION}" \
- "maven-mvnd-${MVND_VERSION}-${OS_TYPE}-${ARCH}.tar.gz" \
- "maven-mvnd-${MVND_VERSION}-${OS_TYPE}-${ARCH}/bin/mvnd"
+ "maven-mvnd-${MVND_VERSION}-m${MVND_MVN_SHORT_VERSION}-${OS_TYPE}-${ARCH}.tar.gz" \
+ "maven-mvnd-${MVND_VERSION}-m${MVND_MVN_SHORT_VERSION}-${OS_TYPE}-${ARCH}/bin/mvnd"
- MVND_BIN="${_DIR}/maven-mvnd-${MVND_VERSION}-${OS_TYPE}-${ARCH}/bin/mvnd"
+ MVND_BIN="${_DIR}/maven-mvnd-${MVND_VERSION}-m${MVND_MVN_SHORT_VERSION}-${OS_TYPE}-${ARCH}/bin/mvnd"
else
if [ "$(version $MVN_DETECTED_VERSION)" -ne "$(version $MVN_VERSION)" ]; then
echo "Mvnd $MVND_DETECTED_VERSION embedded maven version $MVN_DETECTED_VERSION is not equivalent to $MVN_VERSION required in pom."
diff --git a/pom.xml b/pom.xml
index b2b0341e2..09ee14c08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,8 @@
<properties>
<java.version>1.8</java.version>
- <maven.version>3.8.7</maven.version>
- <mvnd.version>0.9.0</mvnd.version>
+ <maven.version>3.9.1</maven.version>
+ <mvnd.version>1.0-m6</mvnd.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<scala.version>2.12.17</scala.version>