From 7af8a4084151160e74dd8f416315c85746c6774a Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Thu, 18 Jan 2024 15:57:08 +0800 Subject: [PATCH] commit release 2.11.1 --- .env | 2 +- .workflow/MasterPipeline.yml | 10 +++++----- env-release.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/DockerfileRelease | 2 +- modules/server/DockerfileReleaseJdk17 | 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 +- pom.xml | 2 +- script/docker.sh | 4 ++-- script/tag.release.txt | 2 +- web-vue/package.json | 2 +- 28 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.env b/.env index 97e9b6787a..d6b795212f 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.11.0 +JPOM_VERSION=2.11.1 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index f07c7326e3..0c5ab12abe 100644 --- a/.workflow/MasterPipeline.yml +++ b/.workflow/MasterPipeline.yml @@ -29,14 +29,14 @@ stages: artifacts: - name: all_zip path: - - modules/server/target/server-2.11.0-release.zip - - modules/agent/target/agent-2.11.0-release.zip + - modules/server/target/server-2.11.1-release.zip + - modules/agent/target/agent-2.11.1-release.zip - name: server_zip path: - - modules/server/target/server-2.11.0-release.zip + - modules/server/target/server-2.11.1-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.11.0-release.zip + - modules/agent/target/agent-2.11.1-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.11.0 + artifactName: jpom-2.11.1 strategy: retry: '0' strategy: diff --git a/env-release.env b/env-release.env index 97e9b6787a..d6b795212f 100644 --- a/env-release.env +++ b/env-release.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.11.0 +JPOM_VERSION=2.11.1 # 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 116e765fd7..6f6b7b1cac 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.11.1.5 + 2.11.1 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 9f7ace06d8..b0036cfe5e 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.11.1.5 + 2.11.1 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index fb95d4420b..5b934f85c6 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.11.1.5 + 2.11.1 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 3d9c37346b..ca4b878696 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml 4.0.0 agent - 2.11.1.5 + 2.11.1 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 88ac6d7f7f..44dde14266 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml 4.0.0 Jpom Common common - 2.11.1.5 + 2.11.1 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index ea2819365a..d4d2943b55 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,5 +7,5 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.11.1.5) + ➜ Jpom \ (•◡•) / (v2.11.1) diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index 55a6aa360f..cc5c36f09e 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.11.0 +ENV JPOM_PKG_VERSION 2.11.1 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 5596987d6d..4287e51e12 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.11.0 +ENV JPOM_PKG_VERSION 2.11.1 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 ea64bfb82d..136881722d 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml 4.0.0 Jpom Server server - 2.11.1.5 + 2.11.1 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index d74ae12d5b..1cd7d2eefb 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.11.1.5 + 2.11.1 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 f0762cecd5..69f2b99a2d 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.11.1.5 + 2.11.1 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 43a2a4586d..1b9ab06300 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.11.1.5 + 2.11.1 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index 57ebdaf16e..79a01e1e11 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.11.1.5 + 2.11.1 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 03781d61a7..46f4ad605c 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index bdae7c53ae..b92fe224a1 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index e831215b40..a592b28c8d 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 91d32df1a7..02028b534a 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 5dbfe5aa8a..b0b9aebc24 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.11.1.5 + 2.11.1 ../../pom.xml pom @@ -43,7 +43,7 @@ ssh-jsch 4.0.0 - 2.11.1.5 + 2.11.1 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 22056d64dd..3184467da1 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.11.1.5 + 2.11.1 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index 866d8ea6f2..08532a332f 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index b94c464203..256a954c42 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.11.1.5 + 2.11.1 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 97a17bc1aa..914b6cf4fc 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.11.1.5 + 2.11.1 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 59e4b960be..ae5f6fe483 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.11.0.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.1.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.11.0.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.11.1.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 46b81d815a..6ceb272eec 100644 --- a/script/tag.release.txt +++ b/script/tag.release.txt @@ -1 +1 @@ -2.11.0 +2.11.1 diff --git a/web-vue/package.json b/web-vue/package.json index be18478e02..db7801d0b9 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,7 +1,7 @@ { "name": "jpom-vue3", "private": true, - "version": "2.11.0", + "version": "2.11.1", "type": "module", "scripts": { "dev": "vite --mode dev",