refactor(nexux): use maven_project_version for detect version

zanata · May 23, 2018 · f8ae674 · f8ae674
1 parent bb6c38c
commit f8ae674
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/zanata-nexus-release b/zanata-nexus-release
@@ -27,7 +27,7 @@
 export LC_ALL=C
 set -eu
 ScriptDir=$(dirname $(readlink  -q -f $0))
-FunctionScriptFile=${ScriptDir}/zanata-functions
+FunctionScriptFile=$ScriptDir/zanata-functions
 source "$FunctionScriptFile"
 trap exit_print_error EXIT
 
@@ -36,7 +36,7 @@ print_status -t parsing -s "Start"
 
 RepoName=$(repo_name_get)
 ArtifactId=$(get_artifact_id $RepoName)
-Version=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:exec)
+Version=$(maven_project_version)
 
 MavenReleaseProfiles=$(get_artifact_var_value $ArtifactId MAVEN_RELEASE_PROFILES)
 

diff --git a/zanata-nexus-staging b/zanata-nexus-staging
@@ -28,13 +28,13 @@
 export LC_ALL=C
 set -eu
 ScriptDir=$(dirname $(readlink  -q -f $0))
-FunctionScriptFile=${ScriptDir}/zanata-functions
+FunctionScriptFile=$ScriptDir/zanata-functions
 source "$FunctionScriptFile"
 trap exit_print_error EXIT
 
 RepoName=$(repo_name_get)
 ArtifactId=$(get_artifact_id $RepoName)
-Version=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:exec)
+Version=$(maven_project_version)
 
 MavenReleaseProfiles=$(get_artifact_var_value $ArtifactId MAVEN_RELEASE_PROFILES)
 
@@ -80,4 +80,4 @@ else
     ReleaseProfileOpts=
 fi
 
-run_command ./mvnw ${MAVEN_COMMON_OPTIONS:-} ${MAVEN_RELEASE_OPTIONS:-} $ReleaseProfileOpts $ProjectOpts $Goal -DstagingDescription="$ArtifactId:$Version"
+run_command $MvnCmd ${MAVEN_COMMON_OPTIONS:-} ${MAVEN_RELEASE_OPTIONS:-} $ReleaseProfileOpts $ProjectOpts $Goal -DstagingDescription="$ArtifactId:$Version"