From d7af5f3c44e82fa42c4a2055029fe3ef248f56f3 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:23:53 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 9 +++++----
src/main/java/git_study.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c65cea3..b7eea16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,14 +51,15 @@
####maven编译部署#####
##mvn clean package -U
##处理结果包
- old_version=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*(([0-9]+\\.)*[0-9]+).*;/\\1/p\')
- if [ "\$old_version_all" =~ "-" ];then
+ versionFile=\$(find . -iname "${projectName}.java")
+ old_version_all=\$(cat \$versionFile | sed -nr \'s/^[^0-9]*"([^"]+)".*;/\\1/p\')
+ echo "old_version_all \$old_version_all"
+ echo "project_name \$project_name"
+ if [ ["\$old_version_all" =~ "-"] ];then
echo "包含"
else
echo "不包含"
fi
- echo "old_version_all \$old_version_all"
- echo "project_name \$project_name"
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
diff --git a/src/main/java/git_study.java b/src/main/java/git_study.java
index e34d009..02e0e3a 100644
--- a/src/main/java/git_study.java
+++ b/src/main/java/git_study.java
@@ -5,7 +5,7 @@
/**
* 保证每次打包发现场部署时增长（目前仅增长末位 +1）
*/
- String version = "1.9.0-SNAPSHOT-3";
+ String version = "1.9.0-";
/**
* 获取版本号。可用于前端资源引用版本化，解决浏览器缓存问题。
--
Gitblit v1.9.1