diff --git a/.env b/.env
index 27531f473..769fb9b73 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.8.24
+JPOM_VERSION=2.8.25
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml
index 6d1d7e680..c84442eb3 100644
--- a/.workflow/MasterPipeline.yml
+++ b/.workflow/MasterPipeline.yml
@@ -29,14 +29,14 @@ stages:
artifacts:
- name: all_zip
path:
- - modules/server/target/server-2.8.24-release.zip
- - modules/agent/target/agent-2.8.24-release.zip
+ - modules/server/target/server-2.8.25-release.zip
+ - modules/agent/target/agent-2.8.25-release.zip
- name: server_zip
path:
- - modules/server/target/server-2.8.24-release.zip
+ - modules/server/target/server-2.8.25-release.zip
- name: agent_zip
path:
- - modules/agent/target/agent-2.8.24-release.zip
+ - modules/agent/target/agent-2.8.25-release.zip
settings: []
strategy:
retry: '0'
@@ -50,7 +50,7 @@ stages:
name: publish_general_artifacts
displayName: 合并打包
dependArtifact: all_zip
- artifactName: jpom-2.8.24
+ artifactName: jpom-2.8.25
strategy:
retry: '0'
strategy:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9322c7eb..24851483d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# 🚀 版本日志
-# 2.8.25
+# 2.8.25 (2022-06-10)
### 🐣 新增功能
diff --git a/docs/version.txt b/docs/version.txt
index 0668896a2..7ee492487 100644
--- a/docs/version.txt
+++ b/docs/version.txt
@@ -1 +1 @@
-2.8.24
+2.8.25
diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
index 2d4a25ffb..33a368a63 100644
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@@ -29,12 +29,12 @@
jpom-parent
io.jpom
- 2.8.24
+ 2.8.25
../../pom.xml
4.0.0
agent
- 2.8.24
+ 2.8.25
Jpom Agent
io.jpom.JpomAgentApplication
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 27c13909a..27fa388c1 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.8.24
+ 2.8.25
../../pom.xml
4.0.0
Jpom Common
common
- 2.8.24
+ 2.8.25
diff --git a/modules/common/src/main/resources/jpom-logo.txt b/modules/common/src/main/resources/jpom-logo.txt
index 88bc15daf..586fe0cce 100644
--- a/modules/common/src/main/resources/jpom-logo.txt
+++ b/modules/common/src/main/resources/jpom-logo.txt
@@ -7,4 +7,4 @@
| |
|_|
- ➜ Jpom \ (•◡•) / (v2.8.24)
\ No newline at end of file
+ ➜ Jpom \ (•◡•) / (v2.8.25)
\ No newline at end of file
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
index 21210344a..91eccb8a1 100644
--- a/modules/server/DockerfileRelease
+++ b/modules/server/DockerfileRelease
@@ -24,7 +24,7 @@
FROM maven:3.8.5-jdk-8
ENV JPOM_HOME /usr/local/jpom-server
-ENV JPOM_PKG server-2.8.24-release.tar.gz
+ENV JPOM_PKG server-2.8.25-release.tar.gz
ENV JPOM_DATA_PATH ${JPOM_HOME}/data
ENV JPOM_LOG_PATH ${JPOM_HOME}/log
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index bafdf7b3e..d65ead332 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.8.24
+ 2.8.25
../../pom.xml
4.0.0
Jpom Server
server
- 2.8.24
+ 2.8.25
io.jpom.JpomServerApplication
diff --git a/modules/sub-plugin/auto-charset-jchardet/pom.xml b/modules/sub-plugin/auto-charset-jchardet/pom.xml
index d66baa20c..d44abc1fb 100644
--- a/modules/sub-plugin/auto-charset-jchardet/pom.xml
+++ b/modules/sub-plugin/auto-charset-jchardet/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml
index 454756bc0..7d484ae47 100644
--- a/modules/sub-plugin/db-h2/pom.xml
+++ b/modules/sub-plugin/db-h2/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml
index 266538216..1906d7b21 100644
--- a/modules/sub-plugin/docker-cli/pom.xml
+++ b/modules/sub-plugin/docker-cli/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml
index 8f18c90a9..334b85497 100644
--- a/modules/sub-plugin/email/pom.xml
+++ b/modules/sub-plugin/email/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml
index e8ef6601a..6d41a4d98 100644
--- a/modules/sub-plugin/git-clone/pom.xml
+++ b/modules/sub-plugin/git-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml
index 3d2882b9e..ab919ff5d 100644
--- a/modules/sub-plugin/maven-plugin/pom.xml
+++ b/modules/sub-plugin/maven-plugin/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml
index 32024dd41..e4c5bf8bc 100644
--- a/modules/sub-plugin/pom.xml
+++ b/modules/sub-plugin/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.8.24
+ 2.8.25
../../pom.xml
pom
@@ -44,7 +44,7 @@
git-clone
4.0.0
- 2.8.24
+ 2.8.25
io.jpom.plugins
jpom-plugins-parent
Jpom Plugins
diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml
index ea475d1e7..56c3b4e9a 100644
--- a/modules/sub-plugin/svn-clone/pom.xml
+++ b/modules/sub-plugin/svn-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml
index 8cbcd793a..6bc8ea1a9 100644
--- a/modules/sub-plugin/webhook/pom.xml
+++ b/modules/sub-plugin/webhook/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.24
+ 2.8.25
../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 9146c5f45..5d75a7e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
2017
- 2.8.24
+ 2.8.25
https://gitee.com/dromara/Jpom
UTF-8
diff --git a/script/docker.sh b/script/docker.sh
index 360cc64b8..109274518 100644
--- a/script/docker.sh
+++ b/script/docker.sh
@@ -29,12 +29,12 @@
# https://hub.docker.com/r/jpomdocker/jpom
# 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.24 -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.25 -f ./modules/server/DockerfileRelease --push .
#
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
# docker logs --tail="100" jpom-server
-# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.8.24
+# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.8.25
# docker stop jpom-server
# docker rm jpom-server
# docker exec -it jpom-server /bin/bash
diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh
index 45706d3d3..2012911ad 100644
--- a/script/release-sha1sum.sh
+++ b/script/release-sha1sum.sh
@@ -24,7 +24,7 @@
# 版本
-jpom_version=2.8.24
+jpom_version=2.8.25
function checkItem()
{
diff --git a/web-vue/package.json b/web-vue/package.json
index 9372c26a6..05f79bafa 100644
--- a/web-vue/package.json
+++ b/web-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "jpom-vue",
- "version": "2.8.24",
+ "version": "2.8.25",
"private": true,
"scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",