From 6d7c69770ae77fcc4ab3c0ecc05d178174fef470 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 16 Feb 2022 13:13:07 +0800 Subject: [PATCH] pre 2.8.10 --- .env | 2 +- .github/workflows/docker-image.yml | 2 +- CHANGELOG.md | 2 +- docs/js/version.js | 2 +- docs/version.txt | 2 +- docs/versions.json | 6 +++--- modules/agent/pom.xml | 4 ++-- modules/common/pom.xml | 4 ++-- modules/server/DockerfileRelease | 2 +- modules/server/pom.xml | 4 ++-- modules/sub-plugin/auto-charset-jchardet/pom.xml | 2 +- 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/maven-plugin/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 ++-- web-vue/package.json | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.env b/.env index 8ac115147..562e0cfed 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.8.9 +JPOM_VERSION=2.8.10 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0444b2605..b831ae941 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,5 +17,5 @@ jobs: - name: Build the Docker image run: | docker buildx create --use - docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.9 -f ./modules/server/DockerfileRelease --push . + docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.10 -f ./modules/server/DockerfileRelease --push . docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . diff --git a/CHANGELOG.md b/CHANGELOG.md index 621034131..59de7cc1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 🚀 版本日志 -# 2.8.10 +# 2.8.10 (2022-02-116) ### 🐣 新增功能 diff --git a/docs/js/version.js b/docs/js/version.js index ed3c1fba2..64efbf598 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '2.8.9'; +var version = '2.8.10'; diff --git a/docs/version.txt b/docs/version.txt index d578041c4..4067d1db7 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -2.8.9 +2.8.10 diff --git a/docs/versions.json b/docs/versions.json index dffa81bce..5bedcc80f 100644 --- a/docs/versions.json +++ b/docs/versions.json @@ -1,6 +1,6 @@ { - "tag_name": "v2.8.9", - "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.9-release.zip", - "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.9-release.zip", + "tag_name": "v2.8.10", + "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.10-release.zip", + "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.10-release.zip", "changelogUrl": "https://gitee.com/dromara/Jpom/raw/master/CHANGELOG.md" } diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index fd55afcbb..97e952492 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -5,12 +5,12 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../pom.xml 4.0.0 agent - 2.8.9 + 2.8.10 Jpom 插件端 io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4e75d333e..96709104e 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -5,13 +5,13 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../pom.xml 4.0.0 Jpom 公共模块 common - 2.8.9 + 2.8.10 diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index b95e500e9..6e83ef5fb 100644 --- a/modules/server/DockerfileRelease +++ b/modules/server/DockerfileRelease @@ -24,7 +24,7 @@ FROM maven:3.8.4-jdk-8 ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG server-2.8.9-release.tar.gz +ENV JPOM_PKG server-2.8.10-release.tar.gz ENV JPOM_DATA_PATH ${JPOM_HOME}/data ENV JPOM_LOG_PATH ${JPOM_HOME}/log diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 11e74613e..40c2acbdb 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -5,13 +5,13 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../pom.xml 4.0.0 Jpom 服务端 server - 2.8.9 + 2.8.10 io.jpom.JpomServerApplication diff --git a/modules/sub-plugin/auto-charset-jchardet/pom.xml b/modules/sub-plugin/auto-charset-jchardet/pom.xml index af484e129..468277671 100644 --- a/modules/sub-plugin/auto-charset-jchardet/pom.xml +++ b/modules/sub-plugin/auto-charset-jchardet/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml index fcf20b495..d6cc99532 100644 --- a/modules/sub-plugin/db-h2/pom.xml +++ b/modules/sub-plugin/db-h2/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 0cd616e07..edac3d7be 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index f06a1d2fe..b0f55df89 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml index b244cc133..d0558b627 100644 --- a/modules/sub-plugin/maven-plugin/pom.xml +++ b/modules/sub-plugin/maven-plugin/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index 9d795ff87..2b685d56f 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index 21d6d5829..ba191b550 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -5,7 +5,7 @@ jpom-parent io.jpom - 2.8.9 + 2.8.10 ../../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 85b9e1724..34ba794f1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.8.9 + 2.8.10 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 75b2c504b..df1ec4132 100644 --- a/script/docker.sh +++ b/script/docker.sh @@ -6,12 +6,12 @@ # https://hub.docker.com/r/jpomdocker/jpom # 服务端 -docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.9 -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.10 -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.8.9 +# 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.8.10 # docker stop jpom-server # docker rm jpom-server # docker exec -it jpom-server /bin/bash diff --git a/web-vue/package.json b/web-vue/package.json index 6804db69a..fe7589e1e 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.8.9", + "version": "2.8.10", "private": true, "scripts": { "serve": "vue-cli-service serve --mode dev",