diff --git a/.env b/.env index 6171c7cc7..17de5e8e6 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.11.9 +JPOM_VERSION=2.11.10 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml index 597a7dda9..75463e2d0 100644 --- a/.workflow/MasterPipeline.yml +++ b/.workflow/MasterPipeline.yml @@ -39,14 +39,14 @@ stages: artifacts: - name: all_zip path: - - modules/server/target/server-2.11.9-release.zip - - modules/agent/target/agent-2.11.9-release.zip + - modules/server/target/server-2.11.10-release.zip + - modules/agent/target/agent-2.11.10-release.zip - name: server_zip path: - - modules/server/target/server-2.11.9-release.zip + - modules/server/target/server-2.11.10-release.zip - name: agent_zip path: - - modules/agent/target/agent-2.11.9-release.zip + - modules/agent/target/agent-2.11.10-release.zip settings: [] strategy: retry: '0' @@ -60,7 +60,7 @@ stages: name: publish_general_artifacts displayName: 合并打包 dependArtifact: all_zip - artifactName: jpom-2.11.9 + artifactName: jpom-2.11.10 strategy: retry: '0' strategy: diff --git a/env-release.env b/env-release.env index 6171c7cc7..17de5e8e6 100644 --- a/env-release.env +++ b/env-release.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.11.9 +JPOM_VERSION=2.11.10 # 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 916ae668e..2ca526ab4 100644 --- a/modules/agent-transport/agent-transport-common/pom.xml +++ b/modules/agent-transport/agent-transport-common/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 8355e90f6..77244b31c 100644 --- a/modules/agent-transport/agent-transport-http/pom.xml +++ b/modules/agent-transport/agent-transport-http/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index dd700997f..8220030c9 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -16,7 +16,7 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml pom @@ -25,7 +25,7 @@ agent-transport-http 4.0.0 - 2.11.9.3 + 2.11.10 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 212500023..ed0310f7e 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -16,12 +16,12 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml 4.0.0 agent - 2.11.9.3 + 2.11.10 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index cb0342f6f..de332ded8 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -16,13 +16,13 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml 4.0.0 Jpom Common common - 2.11.9.3 + 2.11.10 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index ce0263229..4002e689b 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,4 +7,4 @@ | | |_| ➜ Jpom is licensed under Mulan PSL v2. - ➜ \ (•◡•) / (v2.11.9.3) + ➜ \ (•◡•) / (v2.11.10) diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index f64ed1ecd..2363d1b96 100644 --- a/modules/server/DockerfileRelease +++ b/modules/server/DockerfileRelease @@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.11.9 +ENV JPOM_PKG_VERSION 2.11.10 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 df161d1d1..45fc980fe 100644 --- a/modules/server/DockerfileReleaseJdk17 +++ b/modules/server/DockerfileReleaseJdk17 @@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.11.9 +ENV JPOM_PKG_VERSION 2.11.10 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 ed96f49ea..50b699ddf 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -16,13 +16,13 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml 4.0.0 Jpom Server server - 2.11.9.3 + 2.11.10 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 80f441992..be644dc07 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -16,7 +16,7 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml pom @@ -28,7 +28,7 @@ storage-module-mariadb 4.0.0 - 2.11.9.3 + 2.11.10 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 bd6996d94..6c1b9d983 100644 --- a/modules/storage-module/storage-module-common/pom.xml +++ b/modules/storage-module/storage-module-common/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 0996ef991..860f94d3d 100644 --- a/modules/storage-module/storage-module-h2/pom.xml +++ b/modules/storage-module/storage-module-h2/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/storage-module/storage-module-mariadb/pom.xml b/modules/storage-module/storage-module-mariadb/pom.xml index 9ce3b4bc9..fd2fa28de 100644 --- a/modules/storage-module/storage-module-mariadb/pom.xml +++ b/modules/storage-module/storage-module-mariadb/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index efac7090a..170b515c5 100644 --- a/modules/storage-module/storage-module-mysql/pom.xml +++ b/modules/storage-module/storage-module-mysql/pom.xml @@ -17,7 +17,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.11.9.3 + 2.11.10 ../pom.xml diff --git a/modules/storage-module/storage-module-postgresql/pom.xml b/modules/storage-module/storage-module-postgresql/pom.xml index e386e9bae..1a73aec7b 100644 --- a/modules/storage-module/storage-module-postgresql/pom.xml +++ b/modules/storage-module/storage-module-postgresql/pom.xml @@ -16,7 +16,7 @@ jpom-storage-module-parent org.dromara.jpom.storage-module - 2.11.9.3 + 2.11.10 4.0.0 diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 7ccb9f5c0..a35584f39 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index c884aad59..c9a1a9960 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 0f6709bbb..0dd3ca8f5 100644 --- a/modules/sub-plugin/encrypt/pom.xml +++ b/modules/sub-plugin/encrypt/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 7ff77bf96..821e7a9cd 100644 --- a/modules/sub-plugin/git-clone/pom.xml +++ b/modules/sub-plugin/git-clone/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 641801db6..9b340ce38 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -16,7 +16,7 @@ jpom-parent org.dromara.jpom - 2.11.9.3 + 2.11.10 ../../pom.xml pom @@ -30,7 +30,7 @@ ssh-jsch 4.0.0 - 2.11.9.3 + 2.11.10 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 dc7020a5d..4b6b07267 100644 --- a/modules/sub-plugin/ssh-jsch/pom.xml +++ b/modules/sub-plugin/ssh-jsch/pom.xml @@ -17,7 +17,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index cc891ae5c..1ce8d6544 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index 23e76d833..605e446d8 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -16,7 +16,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.11.9.3 + 2.11.10 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index fe31b47ab..7fa3493b9 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.11.9.3 + 2.11.10 https://gitee.com/dromara/Jpom 5.3.39 diff --git a/script/docker.sh b/script/docker.sh index 54fc7594f..c4de45dc3 100644 --- a/script/docker.sh +++ b/script/docker.sh @@ -18,7 +18,7 @@ # docker buildx create --use # 服务端 -docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le,linux/arm64/v8 -t jpomdocker/jpom:2.11.9.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le,linux/arm64/v8 -t jpomdocker/jpom:2.11.10.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . @@ -27,7 +27,7 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le,linux/arm64 #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.9.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.10.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 22ac5d0ce..bea85d222 100644 --- a/script/tag.release.txt +++ b/script/tag.release.txt @@ -1 +1 @@ -2.11.9 +2.11.10 diff --git a/web-vue/package.json b/web-vue/package.json index 8e9f3546f..662cb68f4 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,7 +1,7 @@ { "name": "jpom-vue3", "private": true, - "version": "2.11.9", + "version": "2.11.10", "type": "module", "scripts": { "dev": "vite --mode dev",