From d0cf8aab000211e027f49b43afdefd6c44f0a465 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 16:08:16 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 15 ++++++++++-----
src/main/java/git_study.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7c4cca9..323b555 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,17 +49,22 @@
steps {
sh '''#!/bin/sh
####maven编译部署#####
- mvn clean package -U
+ ##mvn clean package -U
##处理结果包
old_version_all=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
+ 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
- mkdir \$dir_name
- cp *.war \$dir_name
- zip -r "\$dir_name.zip" \$dir_name
+ ##cd target
+ ##mkdir \$dir_name
+ ##cp *.war \$dir_name
+ ##zip -r "\$dir_name.zip" \$dir_name
'''
}
}
diff --git a/src/main/java/git_study.java b/src/main/java/git_study.java
index d39c45c..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-1";
+ String version = "1.9.0-";
/**
* 获取版本号。可用于前端资源引用版本化，解决浏览器缓存问题。
--
Gitblit v1.9.1