diff --git a/.env b/.env index 1ad47a02dd..a3856c1d79 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.43 +JPOM_VERSION=2.10.44 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index fa105bc433..251eb69bb8 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.43-release.zip - - modules/agent/target/agent-2.10.43-release.zip + - modules/server/target/server-2.10.44-release.zip + - modules/agent/target/agent-2.10.44-release.zip - name: server_zip path: - - modules/server/target/server-2.10.43-release.zip + - modules/server/target/server-2.10.44-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.10.43-release.zip + - modules/agent/target/agent-2.10.44-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.10.43 + artifactName: jpom-2.10.44 strategy: retry: '0' strategy: diff --git a/env-release.env b/env-release.env index 1ad47a02dd..a3856c1d79 100644 --- a/env-release.env +++ b/env-release.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.43 +JPOM_VERSION=2.10.44 # 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 534b3bbc07..7123f7b4be 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.44.4 + 2.10.44 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 6323b92917..0e3b4469f0 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.44.4 + 2.10.44 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index b2a7334b33..6e572f91e4 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.44.4 + 2.10.44 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 36f18a4f23..f100db7ace 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml 4.0.0 agent - 2.10.44.4 + 2.10.44 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 7f688f91ac..d07d614fa8 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml 4.0.0 Jpom Common common - 2.10.44.4 + 2.10.44 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index 3ec677ee7c..2cb382e23b 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,5 +7,5 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.44.4) + ➜ Jpom \ (•◡•) / (v2.10.44) diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index 4b2b872e3f..adc5c2cd1f 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.43 +ENV JPOM_PKG_VERSION 2.10.44 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/DockerfileReleaseJdk17 b/modules/server/DockerfileReleaseJdk17 index 931f329572..899153fe45 100644 --- a/modules/server/DockerfileReleaseJdk17 +++ b/modules/server/DockerfileReleaseJdk17 @@ -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.43 +ENV JPOM_PKG_VERSION 2.10.44 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 3b696f290d..49e12010fc 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml 4.0.0 Jpom Server server - 2.10.44.4 + 2.10.44 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 5babf26343..bd771f6db0 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.44.4 + 2.10.44 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 6256b63819..ae7018c6f4 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.44.4 + 2.10.44 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index a568e65bbc..65d33261c3 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.44.4 + 2.10.44 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index bbfe37d189..21674e999d 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.44.4 + 2.10.44 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index f3a0361acf..fe0a466ed4 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 609bdae45b..343be068fc 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 7c97b3f0dd..2c06ea4106 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 91d7cf08a5..3ac6c2f28b 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index ca4ca8c68b..d819344033 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml pom @@ -43,7 +43,7 @@ ssh-jsch 4.0.0 - 2.10.44.4 + 2.10.44 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 237114c849..64ec6625ce 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.44.4 + 2.10.44 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index 7839212dde..4c7366b821 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index f7af24c581..2641144cb0 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.44.4 + 2.10.44 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index 7565bd3527..c18168304d 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.44.4 + 2.10.44 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e27bf3dd30..b119bc3bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.44.4 + 2.10.44 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 2f9f40bb29..b16637c9be 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.43.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.44.1 -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.43.1 +# 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.44.1 # 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/tag.release.txt b/script/tag.release.txt index dd8e0eea32..66af996975 100644 --- a/script/tag.release.txt +++ b/script/tag.release.txt @@ -1 +1 @@ -2.10.43 +2.10.44 diff --git a/web-vue/package.json b/web-vue/package.json index 771c878422..3b45f9cc50 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.10.43", + "version": "2.10.44", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",