From f33e3fab49dc290a274063ba829020c291799674 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 16:40:25 +0800 Subject: [PATCH] commit beta 2.10.42.6 --- 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 | 2 +- modules/server/DockerfileBeta | 2 +- modules/server/DockerfileBetaJdk17 | 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/ssh-jsch/pom.xml | 2 +- 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 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/env-beta.env b/env-beta.env index fdbbee64e..0a7fb9cac 100644 --- a/env-beta.env +++ b/env-beta.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.42.5 +JPOM_VERSION=2.10.42.6 # 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 79d78324a..eb187c8fe 100644 --- a/modules/agent-transport/agent-transport-common/pom.xml +++ b/modules/agent-transport/agent-transport-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index f7ff6da7d..c3790851c 100644 --- a/modules/agent-transport/agent-transport-http/pom.xml +++ b/modules/agent-transport/agent-transport-http/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index 680ca72e0..2106d7195 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index d7f30a7b4..03315d34c 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 agent - 2.10.42.5 + 2.10.42.6 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 27df83913..c033f57cc 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 Jpom Common common - 2.10.42.5 + 2.10.42.6 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index f17e150ca..204fb47a9 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,5 +7,5 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.42.5) + ➜ Jpom \ (•◡•) / (v2.10.42.6) diff --git a/modules/server/DockerfileBeta b/modules/server/DockerfileBeta index 01a97ad9d..472536206 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.42.5 +ENV JPOM_PKG_VERSION 2.10.42.6 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/DockerfileBetaJdk17 b/modules/server/DockerfileBetaJdk17 index 803457f9e..6233a03d7 100644 --- a/modules/server/DockerfileBetaJdk17 +++ b/modules/server/DockerfileBetaJdk17 @@ -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.42.5 +ENV JPOM_PKG_VERSION 2.10.42.6 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 a339809f7..ee0bd29d6 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 Jpom Server server - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 9e2e9e1b4..ea762b040 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.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 c816fa0a2..90f3502e1 100644 --- a/modules/storage-module/storage-module-common/pom.xml +++ b/modules/storage-module/storage-module-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 34245d159..759ac7fd1 100644 --- a/modules/storage-module/storage-module-h2/pom.xml +++ b/modules/storage-module/storage-module-h2/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index 371bd5d8c..b41d776c6 100644 --- a/modules/storage-module/storage-module-mysql/pom.xml +++ b/modules/storage-module/storage-module-mysql/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 38be63b78..cce51b006 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 1381381a5..c13a89d5d 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 458589685..e819f3188 100644 --- a/modules/sub-plugin/encrypt/pom.xml +++ b/modules/sub-plugin/encrypt/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 1f518b5af..998cbd396 100644 --- a/modules/sub-plugin/git-clone/pom.xml +++ b/modules/sub-plugin/git-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 20093a182..7e448921e 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -43,7 +43,7 @@ ssh-jsch 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.plugins jpom-plugins-parent Jpom Plugins diff --git a/modules/sub-plugin/ssh-jsch/pom.xml b/modules/sub-plugin/ssh-jsch/pom.xml index 3faeb3fb2..c44520e0b 100644 --- a/modules/sub-plugin/ssh-jsch/pom.xml +++ b/modules/sub-plugin/ssh-jsch/pom.xml @@ -30,7 +30,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index f903d98bf..b09c5a7c1 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index b226ea22e..33668ed95 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index 1d54b1c45..7653d3c57 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 4e64ccb97..d3a990f39 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.42.5 + 2.10.42.6 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/tag.beta.txt b/script/tag.beta.txt index 6eda71125..1232cb90f 100644 --- a/script/tag.beta.txt +++ b/script/tag.beta.txt @@ -1 +1 @@ -2.10.42.5 +2.10.42.6