Repository: kylin Updated Branches: refs/heads/master 3a3e96786 -> 9d8bf2b34
minor, enhance project version search pattern Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9d8bf2b3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9d8bf2b3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9d8bf2b3 Branch: refs/heads/master Commit: 9d8bf2b340738289d0a3d23664868ae3f5b40cd1 Parents: 3a3e967 Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Mar 13 18:57:01 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Mon Mar 13 18:57:01 2017 +0800 ---------------------------------------------------------------------- build/script/compress.sh | 2 +- build/script/download-tomcat.sh | 2 +- build/script/package.sh | 2 +- build/script/package_diag.sh | 4 ++-- build/script/package_libs.sh | 4 ++-- build/script/prepare.sh | 2 +- build/script/prepare_libs.sh | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/compress.sh ---------------------------------------------------------------------- diff --git a/build/script/compress.sh b/build/script/compress.sh index 39e429c..13580f5 100755 --- a/build/script/compress.sh +++ b/build/script/compress.sh @@ -24,7 +24,7 @@ cd ${dir}/../.. if [ -z "$version" ] then echo 'version not set' - version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` + version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` echo "${version}" fi http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/download-tomcat.sh ---------------------------------------------------------------------- diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh index b3aa509..964400f 100755 --- a/build/script/download-tomcat.sh +++ b/build/script/download-tomcat.sh @@ -59,7 +59,7 @@ echo "context.xml overwritten..." if [ -z "$version" ] then echo 'version not set' - version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` + version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` fi echo "version ${version}" export version http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/package.sh ---------------------------------------------------------------------- diff --git a/build/script/package.sh b/build/script/package.sh index a58a5ce..dedd10d 100755 --- a/build/script/package.sh +++ b/build/script/package.sh @@ -50,7 +50,7 @@ fi dir=$(dirname ${0}) cd ${dir}/../.. -version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)'` +version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` echo "kylin version: ${version}" export version http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/package_diag.sh ---------------------------------------------------------------------- diff --git a/build/script/package_diag.sh b/build/script/package_diag.sh index d0542ab..5d163e3 100755 --- a/build/script/package_diag.sh +++ b/build/script/package_diag.sh @@ -39,7 +39,7 @@ fi dir=$(dirname ${0}) cd ${dir}/../.. -version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` +version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` if [ "$version" == "" ];then echo "Failed to identify kylin version (current: `pwd`)" @@ -74,4 +74,4 @@ mkdir -p ../dist tar -cvzf ../dist/${package_name}.tar.gz ${package_name} rm -rf ${package_name} -echo "Library package ready: dist/${package_name}.tar.gz" \ No newline at end of file +echo "Library package ready: dist/${package_name}.tar.gz" http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/package_libs.sh ---------------------------------------------------------------------- diff --git a/build/script/package_libs.sh b/build/script/package_libs.sh index 71c1e8c..7ef6b5d 100755 --- a/build/script/package_libs.sh +++ b/build/script/package_libs.sh @@ -39,7 +39,7 @@ fi dir=$(dirname ${0}) cd ${dir}/../.. -version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` +version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` if [ "$version" == "" ];then echo "Failed to identify kylin version (current: `pwd`)" @@ -97,4 +97,4 @@ mkdir -p ../dist tar -cvzf ../dist/${package_name}.tar.gz ${package_name} rm -rf ${package_name} -echo "Library package ready: dist/${package_name}.tar.gz" \ No newline at end of file +echo "Library package ready: dist/${package_name}.tar.gz" http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/prepare.sh ---------------------------------------------------------------------- diff --git a/build/script/prepare.sh b/build/script/prepare.sh index a1c02ba..a8dde10 100755 --- a/build/script/prepare.sh +++ b/build/script/prepare.sh @@ -23,7 +23,7 @@ cd ${dir}/../.. if [ -z "$version" ] then echo 'version not set' - version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` + version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` fi echo "version ${version}" export version http://git-wip-us.apache.org/repos/asf/kylin/blob/9d8bf2b3/build/script/prepare_libs.sh ---------------------------------------------------------------------- diff --git a/build/script/prepare_libs.sh b/build/script/prepare_libs.sh index 3dbdf21..ae5c5e4 100755 --- a/build/script/prepare_libs.sh +++ b/build/script/prepare_libs.sh @@ -23,7 +23,7 @@ cd ${dir}/../.. if [ -z "$version" ] then echo 'version not set' - version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` + version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' ` fi echo "version ${version}" @@ -39,4 +39,4 @@ cp tool-assembly/target/kylin-tool-assembly-${version}-assembly.jar build/tool/k chmod 644 build/lib/kylin-job-${version}.jar chmod 644 build/lib/kylin-coprocessor-${version}.jar chmod 644 build/lib/kylin-jdbc-${version}.jar -chmod 644 build/tool/kylin-tool-${version}.jar \ No newline at end of file +chmod 644 build/tool/kylin-tool-${version}.jar
