diff --git a/.env b/.env index d02132ca6..75ae00167 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.6 +JPOM_VERSION=2.10.7 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index 04cfb2c4d..ae7fc0142 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.6-release.zip - - modules/agent/target/agent-2.10.6-release.zip + - modules/server/target/server-2.10.7-release.zip + - modules/agent/target/agent-2.10.7-release.zip - name: server_zip path: - - modules/server/target/server-2.10.6-release.zip + - modules/server/target/server-2.10.7-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.10.6-release.zip + - modules/agent/target/agent-2.10.7-release.zip settings: [] strategy: retry: '0' @@ -50,7 +50,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.10.6 + artifactName: jpom-2.10.7 strategy: retry: '0' strategy: diff --git a/docs/version.txt b/docs/version.txt index a158d0827..b63070188 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -2.10.6 +2.10.7 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index 013250e7f..86a155b25 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.6 + 2.10.7 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 4868fd7dd..8f57b300b 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.6 + 2.10.7 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index c758c7ce4..687d1402d 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.6 + 2.10.7 io.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index fa47734f3..94246a1a3 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml 4.0.0 agent - 2.10.6 + 2.10.7 Jpom Agent io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 9b4be71ed..4ce203bf4 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml 4.0.0 Jpom Common common - 2.10.6 + 2.10.7 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index 9a2d2d979..c445a1d99 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,4 +7,4 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.6) \ No newline at end of file + ➜ Jpom \ (•◡•) / (v2.10.7) \ No newline at end of file diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index 707a9f60f..a8b0b825b 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.6 +ENV JPOM_PKG_VERSION 2.10.7 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 291726f81..abd46b75e 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml 4.0.0 Jpom Server server - 2.10.6 + 2.10.7 io.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 93a614a20..37e66681f 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml pom @@ -37,7 +37,7 @@ storage-module-common 4.0.0 - 2.10.6 + 2.10.7 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 e0271d736..3c553a33c 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.6 + 2.10.7 ../pom.xml diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml index fddcfd5b3..336cb98a6 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 2d1cf57d0..59f091e43 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 46ec963c6..ccbbd6e82 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 044c86b72..2eb9844bc 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml index 6712c9112..2a7b50574 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 2cc644af8..3142c584e 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml pom @@ -43,7 +43,7 @@ git-clone 4.0.0 - 2.10.6 + 2.10.7 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 75b44c7ab..8c49c1b38 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index a576364de..f9786f83b 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.6 + 2.10.7 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index bd0a46258..a58834326 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.10.6 + 2.10.7 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ba9652839..750809860 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.6 + 2.10.7 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 77e83f291..932ee6ed9 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.6 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.7 -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.6 +# 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.7 # 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 749c8e0ec..3e4d1b6ef 100644 --- a/script/release-sha1sum.sh +++ b/script/release-sha1sum.sh @@ -24,7 +24,7 @@ # 版本 -jpom_version=2.10.6 +jpom_version=2.10.7 #Mirror_Host=download.fastgit.org #Mirror_Host=hub.fastgit.xyz diff --git a/web-vue/package.json b/web-vue/package.json index 41e2e88d2..9abbe62b2 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.10.6", + "version": "2.10.7", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",