This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch maven_wrapper
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/maven_wrapper by this push:
new 474b9812c mavenWrapper improvement
474b9812c is described below
commit 474b9812cf3b8a19cdcd7527f109010a31619314
Author: benjobs <[email protected]>
AuthorDate: Sat Dec 2 12:42:18 2023 +0800
mavenWrapper improvement
---
mvnw | 6 +++---
.../streampark-console-service/src/main/assembly/bin/mvnw | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mvnw b/mvnw
index d5a26d254..9a7fa3704 100755
--- a/mvnw
+++ b/mvnw
@@ -210,7 +210,7 @@ fi
if [ -r "$wrapperJarPath" ]; then
log "Found $wrapperJarPath"
log "Check found $wrapperJarPath starting"
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "verify"
"$wrapperJarPath" "$wrapperProperties")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "verify" "$wrapperJarPath" "$wrapperProperties")
if [ $? -eq 1 ]; then
echo "WARN: Check found $wrapperJarPath invalided."
rm -f $wrapperJarPath
@@ -255,7 +255,7 @@ if [ ! -e "$wrapperJarPath" ]; then
else
log "Falling back to using Java to download"
log " - Running MavenWrapperHelper.java ..."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "download"
"$wrapperUrl" "$wrapperJarPath")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "download" "$wrapperUrl" "$wrapperJarPath")
if [ $? -ne 0 ]; then
rm -f "$wrapperJarPath"
echo "ERROR: download wrapperJar by Java failed, please retry"
@@ -264,7 +264,7 @@ if [ ! -e "$wrapperJarPath" ]; then
fi
log "Check $wrapperJarPath."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "verify"
"$wrapperJarPath" "$wrapperProperties")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "verify" "$wrapperJarPath" "$wrapperProperties")
if [ $? -eq 1 ]; then
echo "ERROR: Check $wrapperJarPath invalided, please retry"
exit 1
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
b/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
index d5a26d254..9a7fa3704 100755
--- a/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
+++ b/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
@@ -210,7 +210,7 @@ fi
if [ -r "$wrapperJarPath" ]; then
log "Found $wrapperJarPath"
log "Check found $wrapperJarPath starting"
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "verify"
"$wrapperJarPath" "$wrapperProperties")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "verify" "$wrapperJarPath" "$wrapperProperties")
if [ $? -eq 1 ]; then
echo "WARN: Check found $wrapperJarPath invalided."
rm -f $wrapperJarPath
@@ -255,7 +255,7 @@ if [ ! -e "$wrapperJarPath" ]; then
else
log "Falling back to using Java to download"
log " - Running MavenWrapperHelper.java ..."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "download"
"$wrapperUrl" "$wrapperJarPath")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "download" "$wrapperUrl" "$wrapperJarPath")
if [ $? -ne 0 ]; then
rm -f "$wrapperJarPath"
echo "ERROR: download wrapperJar by Java failed, please retry"
@@ -264,7 +264,7 @@ if [ ! -e "$wrapperJarPath" ]; then
fi
log "Check $wrapperJarPath."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperHelper "verify"
"$wrapperJarPath" "$wrapperProperties")
+ ("$JAVA_HOME/bin/java" -cp "$MAVEN_PROJECTBASEDIR/.mvn/wrapper"
MavenWrapperHelper "verify" "$wrapperJarPath" "$wrapperProperties")
if [ $? -eq 1 ]; then
echo "ERROR: Check $wrapperJarPath invalided, please retry"
exit 1
