From f6c906f7c9f758dc7ab2be4bac4ff2917246bdaf Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Tue, 20 Dec 2022 19:49:55 +0800 Subject: [PATCH] commit 2.10.1 --- .env | 2 +- .workflow/MasterPipeline.yml | 10 +++++----- CHANGELOG.md | 2 +- docs/version.txt | 2 +- modules/agent-transport/agent-transport-common/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/sub-plugin/db-h2/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/maven-plugin/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 +- 24 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.env b/.env index 88ea158a1..b09382e55 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.0 +JPOM_VERSION=2.10.1 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index a43ab415b..823ef7398 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.0-release.zip - - modules/agent/target/agent-2.10.0-release.zip + - modules/server/target/server-2.10.1-release.zip + - modules/agent/target/agent-2.10.1-release.zip - name: server_zip path: - - modules/server/target/server-2.10.0-release.zip + - modules/server/target/server-2.10.1-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.10.0-release.zip + - modules/agent/target/agent-2.10.1-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.10.0 + artifactName: jpom-2.10.1 strategy: retry: '0' strategy: diff --git a/CHANGELOG.md b/CHANGELOG.md index 20b780757..5ca0d4f22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 🚀 版本日志 -## 2.10.1 +## 2.10.1 (2022-12-20) ### 🐣 新增功能 diff --git a/docs/version.txt b/docs/version.txt index 10c2c0c3d..8bbb6e406 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -2.10.0 +2.10.1 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index 159e6fd9e..182537108 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.0 + 2.10.1 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index 732182098..74b64d22e 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml pom @@ -37,7 +37,7 @@ agent-transport-common 4.0.0 - 2.10.0 + 2.10.1 io.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index 6c10ab2fa..be506d6a4 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml 4.0.0 agent - 2.10.0 + 2.10.1 Jpom Agent io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index e532c60c2..15a83d56a 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml 4.0.0 Jpom Common common - 2.10.0 + 2.10.1 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index 0c0bb9b91..38fef4f98 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,4 +7,4 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.0) \ No newline at end of file + ➜ Jpom \ (•◡•) / (v2.10.1) \ No newline at end of file diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index 8e66b11fd..5d07d0235 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.0 +ENV JPOM_PKG_VERSION 2.10.1 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 9112cab08..4d945356e 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml 4.0.0 Jpom Server server - 2.10.0 + 2.10.1 io.jpom.JpomServerApplication diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml index f406bec91..38200eacf 100644 --- a/modules/sub-plugin/db-h2/pom.xml +++ b/modules/sub-plugin/db-h2/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.10.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 67f6b77d3..35f255853 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.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 2e23d1051..f205f656e 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.0 + 2.10.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 000daeeb5..3e6db2047 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.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml index 93acf0151..d8e2c8be2 100644 --- a/modules/sub-plugin/maven-plugin/pom.xml +++ b/modules/sub-plugin/maven-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.10.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 6fd7f258b..82135dcbd 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml pom @@ -43,7 +43,7 @@ git-clone 4.0.0 - 2.10.0 + 2.10.1 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 db2e57dca..d1585710e 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.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index 96c7a4d21..b1c14ac53 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.0 + 2.10.1 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index f1c50d05d..3850d6499 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.0 + 2.10.1 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f50c345d4..a5b5d7f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.0 + 2.10.1 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 3e34757b9..fb008bf52 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.0 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.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.0 +# 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.1 # docker stop jpom-server # docker rm jpom-server # docker exec -it jpom-server /bin/bash diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh index 964206194..7bcbb400a 100644 --- a/script/release-sha1sum.sh +++ b/script/release-sha1sum.sh @@ -24,7 +24,7 @@ # 版本 -jpom_version=2.10.0 +jpom_version=2.10.1 #Mirror_Host=download.fastgit.org #Mirror_Host=hub.fastgit.xyz diff --git a/web-vue/package.json b/web-vue/package.json index cd5550a12..fcbe83b4b 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.10.0", + "version": "2.10.1", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",