From ca69e40853743a67ed09db7d710af925d5562793 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Mon, 27 Mar 2023 20:32:49 +0800 Subject: [PATCH] commit beta 2.10.38.3 --- .workflow/MasterPipeline.yml | 10 +++++----- env-beta.env | 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 | 5 +++-- modules/server/DockerfileBeta | 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/encrypt/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/tag.beta.txt | 2 +- web-vue/package.json | 2 +- 25 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index 182da7da4..7a4fc40c4 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.38.2-release.zip - - modules/agent/target/agent-2.10.38.2-release.zip + - modules/server/target/server-2.10.38.3-release.zip + - modules/agent/target/agent-2.10.38.3-release.zip - name: server_zip path: - - modules/server/target/server-2.10.38.2-release.zip + - modules/server/target/server-2.10.38.3-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.10.38.2-release.zip + - modules/agent/target/agent-2.10.38.3-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.10.38.2 + artifactName: jpom-2.10.38.3 strategy: retry: '0' strategy: diff --git a/env-beta.env b/env-beta.env index cfa6007f3..0178a27c3 100644 --- a/env-beta.env +++ b/env-beta.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.38.2 +JPOM_VERSION=2.10.38.3 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index f59d28920..f8e11a3b7 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.38.2 + 2.10.38.3 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 4a0f06c66..39f16e3a7 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.38.2 + 2.10.38.3 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index bf26a55bd..2b3a866a4 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.38.2 + 2.10.38.3 io.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index c32c09391..5398e25b6 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml 4.0.0 agent - 2.10.38.2 + 2.10.38.3 Jpom Agent io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 9fa13a25a..4195e375d 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml 4.0.0 Jpom Common common - 2.10.38.2 + 2.10.38.3 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index 7ec3cc917..a1c36650e 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -1,10 +1,11 @@ _ | | | |_ __ ___ _ __ ___ - _ | | '_ \ / _ \| '_ ` _ | |__| | |_) | (_) | | | | | | + _ | | '_ \ / _ \| '_ ` _ \ + | |__| | |_) | (_) | | | | | | \____/| .__/ \___/|_| |_| |_| | | |_| - ➜ Jpom \ (•◡•) / (v2.10.38.2) + ➜ Jpom \ (•◡•) / (v2.10.38.3) diff --git a/modules/server/DockerfileBeta b/modules/server/DockerfileBeta index 99bf55f88..dc583660e 100644 --- a/modules/server/DockerfileBeta +++ b/modules/server/DockerfileBeta @@ -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.38.2 +ENV JPOM_PKG_VERSION 2.10.38.3 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 2ddc86eea..8f9f51f55 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml 4.0.0 Jpom Server server - 2.10.38.2 + 2.10.38.3 io.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 90ac312f9..c7a30a376 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.38.2 + 2.10.38.3 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 e4aa1a9e7..649e56aef 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.38.2 + 2.10.38.3 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 4100425bc..aff714c78 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.38.2 + 2.10.38.3 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index d23eef32e..6db3aad41 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.38.2 + 2.10.38.3 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 017ec30b3..4bc867c0e 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.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 388499400..1d3d6de53 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.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 3f4a75995..0bd43b73b 100644 --- a/modules/sub-plugin/encrypt/pom.xml +++ b/modules/sub-plugin/encrypt/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.10.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index edeff662c..dd912dfaa 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.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 9cd1b805e..22eba15af 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml pom @@ -42,7 +42,7 @@ encrypt 4.0.0 - 2.10.38.2 + 2.10.38.3 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 f3f984fa3..d7de98110 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.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index e0b05695d..c6c9b1ae8 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.38.2 + 2.10.38.3 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index a7c75d678..91516e54e 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.38.2 + 2.10.38.3 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 9d44bdcd9..109561c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.38.2 + 2.10.38.3 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/tag.beta.txt b/script/tag.beta.txt index d0d6fc031..dfd9f1f9c 100644 --- a/script/tag.beta.txt +++ b/script/tag.beta.txt @@ -1 +1 @@ -2.10.38.2 +2.10.38.3 diff --git a/web-vue/package.json b/web-vue/package.json index fafce5e76..bca50be2b 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.10.38.2", + "version": "2.10.38.3", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",