From 6e795d571b01f07e63d0665b19688ebbba71e378 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Tue, 01 Mar 2022 10:10:07 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 7 +------
pom.xml | 4 ++--
src/main/java/git_study.java | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 08b42c6..3738f9a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,11 +56,6 @@
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}" =~ "\$str" ]];then
- echo "包含"
- else
- echo "不包含"
- fi
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
@@ -83,7 +78,7 @@
steps {
//http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
echo "todo version add"
- //versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
diff --git a/pom.xml b/pom.xml
index d13d285..c7c5865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.hbbohua</groupId>
<artifactId>git_study</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<packaging>war</packaging>
<dependencies>
<dependency>
@@ -25,7 +25,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!--当前项目版本号-->
- <revision>1.9.0-SNAPSHOT</revision>
+ <revision>1.9.0</revision>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
diff --git a/src/main/java/git_study.java b/src/main/java/git_study.java
index 85065f6..2577795 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-1";
+ String version = "1.9.0";
/**
* 获取版本号。可用于前端资源引用版本化，解决浏览器缓存问题。
--
Gitblit v1.9.1