From b242e6994c7aadab1c763784e6aee878be35dd6a Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Fri, 3 Mar 2023 16:15:23 +0800 Subject: [PATCH] commit 2.10.25 --- .env | 2 +- .workflow/MasterPipeline.yml | 10 +++++----- docs/version.txt | 2 +- modules/agent-transport/agent-transport-common/pom.xml | 2 +- modules/agent-transport/agent-transport-http/pom.xml | 2 +- modules/agent-transport/pom.xml | 4 ++-- modules/agent/pom.xml | 4 ++-- modules/common/pom.xml | 4 ++-- modules/common/src/main/resources/banner.txt | 2 +- modules/server/DockerfileRelease | 2 +- modules/server/pom.xml | 4 ++-- modules/storage-module/pom.xml | 4 ++-- modules/storage-module/storage-module-common/pom.xml | 2 +- modules/storage-module/storage-module-h2/pom.xml | 2 +- modules/storage-module/storage-module-mysql/pom.xml | 2 +- modules/sub-plugin/docker-cli/pom.xml | 2 +- modules/sub-plugin/email/pom.xml | 2 +- modules/sub-plugin/git-clone/pom.xml | 2 +- modules/sub-plugin/pom.xml | 4 ++-- modules/sub-plugin/svn-clone/pom.xml | 2 +- modules/sub-plugin/webhook/pom.xml | 2 +- modules/updater/pom.xml | 2 +- pom.xml | 2 +- script/docker.sh | 4 ++-- script/release-sha1sum.sh | 2 +- web-vue/package.json | 2 +- 26 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.env b/.env index 07eaaefdb..8adf49335 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.24 +JPOM_VERSION=2.10.25 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index 780fe2971..bb5286f42 100644 --- a/.workflow/MasterPipeline.yml +++ b/.workflow/MasterPipeline.yml @@ -29,14 +29,14 @@ stages: artifacts: - name: all_zip path: - - modules/server/target/server-2.10.24-release.zip - - modules/agent/target/agent-2.10.24-release.zip + - modules/server/target/server-2.10.25-release.zip + - modules/agent/target/agent-2.10.25-release.zip - name: server_zip path: - - modules/server/target/server-2.10.24-release.zip + - modules/server/target/server-2.10.25-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.10.24-release.zip + - modules/agent/target/agent-2.10.25-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.10.24 + artifactName: jpom-2.10.25 strategy: retry: '0' strategy: diff --git a/docs/version.txt b/docs/version.txt index 8f8b6c0c1..49f987fee 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -2.10.24 +2.10.25 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index d14b97cb2..1dcc1722e 100644 --- a/modules/agent-transport/agent-transport-common/pom.xml +++ b/modules/agent-transport/agent-transport-common/pom.xml @@ -30,7 +30,7 @@ io.jpom.agent-transport jpom-agent-transport-parent - 2.10.24 + 2.10.25 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 484820929..b7ae628d0 100644 --- a/modules/agent-transport/agent-transport-http/pom.xml +++ b/modules/agent-transport/agent-transport-http/pom.xml @@ -30,7 +30,7 @@ io.jpom.agent-transport jpom-agent-transport-parent - 2.10.24 + 2.10.25 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index 4829245da..4c5f6a61f 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.24 + 2.10.25 io.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index 0eea437eb..7af437942 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml 4.0.0 agent - 2.10.24 + 2.10.25 Jpom Agent io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4e024d443..2da335323 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml 4.0.0 Jpom Common common - 2.10.24 + 2.10.25 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index b9f626d6e..eb62df109 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -8,4 +8,4 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.24) + ➜ Jpom \ (•◡•) / (v2.10.25) diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index d60e72389..e7685cee7 100644 --- a/modules/server/DockerfileRelease +++ b/modules/server/DockerfileRelease @@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.10.24 +ENV JPOM_PKG_VERSION 2.10.25 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 0b4474df5..9e9fe4c01 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml 4.0.0 Jpom Server server - 2.10.24 + 2.10.25 io.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index c1a86b925..fd1bf600a 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.24 + 2.10.25 io.jpom.storage-module jpom-storage-module-parent Jpom storage module diff --git a/modules/storage-module/storage-module-common/pom.xml b/modules/storage-module/storage-module-common/pom.xml index a48d23999..7ff6190c8 100644 --- a/modules/storage-module/storage-module-common/pom.xml +++ b/modules/storage-module/storage-module-common/pom.xml @@ -30,7 +30,7 @@ io.jpom.storage-module jpom-storage-module-parent - 2.10.24 + 2.10.25 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 7f61e898b..4aab75b79 100644 --- a/modules/storage-module/storage-module-h2/pom.xml +++ b/modules/storage-module/storage-module-h2/pom.xml @@ -30,7 +30,7 @@ io.jpom.storage-module jpom-storage-module-parent - 2.10.24 + 2.10.25 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index d79fb7a4f..2b7cd27a1 100644 --- a/modules/storage-module/storage-module-mysql/pom.xml +++ b/modules/storage-module/storage-module-mysql/pom.xml @@ -30,7 +30,7 @@ io.jpom.storage-module jpom-storage-module-parent - 2.10.24 + 2.10.25 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 526be9f23..733998160 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.10.24 + 2.10.25 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 4f0b54497..959d3d22e 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.10.24 + 2.10.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 d94ee211e..721af5469 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.10.24 + 2.10.25 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index faf9eccbf..39968f360 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml pom @@ -41,7 +41,7 @@ git-clone 4.0.0 - 2.10.24 + 2.10.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 dab206b43..f393f42b4 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.10.24 + 2.10.25 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index 88e11ba37..7a5edec88 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.10.24 + 2.10.25 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index 9398ac20c..3e1c9c912 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.24 + 2.10.25 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f940b25cc..574201487 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.24 + 2.10.25 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index ce3d18c47..df91eeaf3 100644 --- a/script/docker.sh +++ b/script/docker.sh @@ -31,12 +31,12 @@ # docker buildx create --use # 服务端 -docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.24 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.25 -t jpomdocker/jpom:latest -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.10.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.10.25 # docker run -d -p 2122:2122 --name jpom-server -v D:/home/jpom-server/logs:/usr/local/jpom-server/logs -v D:/home/jpom-server/data:/usr/local/jpom-server/data -v D:/home/jpom-server/conf:/usr/local/jpom-server/conf jpomdocker/jpom # docker stop jpom-server # docker rm jpom-server diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh index b46570129..71cdcbbbd 100644 --- a/script/release-sha1sum.sh +++ b/script/release-sha1sum.sh @@ -24,7 +24,7 @@ # 版本 -jpom_version=2.10.24 +jpom_version=2.10.25 #Mirror_Host=download.fastgit.org #Mirror_Host=hub.fastgit.xyz diff --git a/web-vue/package.json b/web-vue/package.json index 226a05e03..46bee615d 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.10.24", + "version": "2.10.25", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",