commit 2.9.21

dromara · Dec 8, 2022 · e3579ad · e3579ad
1 parent 1fb6866
commit e3579ad
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 31 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.9.20
+JPOM_VERSION=2.9.21
 # Server Token 生产部署请更换
 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml
@@ -29,14 +29,14 @@ stages:
         artifacts:
           - name: all_zip
             path:
-              - modules/server/target/server-2.9.20-release.zip
-              - modules/agent/target/agent-2.9.20-release.zip
+              - modules/server/target/server-2.9.21-release.zip
+              - modules/agent/target/agent-2.9.21-release.zip
           - name: server_zip
             path:
-              - modules/server/target/server-2.9.20-release.zip
+              - modules/server/target/server-2.9.21-release.zip
           - name: agent_zip
             path:
-              - modules/agent/target/agent-2.9.20-release.zip
+              - modules/agent/target/agent-2.9.21-release.zip
         settings: []
         strategy:
           retry: '0'
@@ -50,7 +50,7 @@ stages:
         name: publish_general_artifacts
         displayName: 合并打包
         dependArtifact: all_zip
-        artifactName: jpom-2.9.20
+        artifactName: jpom-2.9.21
         strategy:
           retry: '0'
 strategy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 🚀 版本日志
 
-## 2.9.21 
+## 2.9.21 (2022-12-08)
 
 ### 🐞 解决BUG、优化功能
 

diff --git a/docs/version.txt b/docs/version.txt
@@ -1 +1 @@
-2.9.20
+2.9.21
diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <artifactId>jpom-parent</artifactId>
         <groupId>io.jpom</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>agent</artifactId>
-    <version>2.9.20</version>
+    <version>2.9.21</version>
     <name>Jpom Agent</name>
     <properties>
         <start-class>io.jpom.JpomAgentApplication</start-class>

diff --git a/modules/common/pom.xml b/modules/common/pom.xml
@@ -29,13 +29,13 @@
     <parent>
         <artifactId>jpom-parent</artifactId>
         <groupId>io.jpom</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>Jpom Common</name>
     <artifactId>common</artifactId>
-    <version>2.9.20</version>
+    <version>2.9.21</version>
 
     <dependencies>
 

diff --git a/modules/common/src/main/resources/jpom-logo.txt b/modules/common/src/main/resources/jpom-logo.txt
@@ -7,4 +7,4 @@
         | |
         |_|
 
- ➜ Jpom \ (•◡•) / (v2.9.20)
+ ➜ Jpom \ (•◡•) / (v2.9.21)
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
@@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <[email protected]>"
 LABEL documentation="https://jpom.top"
 
 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG_VERSION	2.9.20
+ENV JPOM_PKG_VERSION	2.9.21
 ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz
 
 

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
@@ -29,13 +29,13 @@
     <parent>
         <artifactId>jpom-parent</artifactId>
         <groupId>io.jpom</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>Jpom Server</name>
     <artifactId>server</artifactId>
-    <version>2.9.20</version>
+    <version>2.9.21</version>
     <properties>
         <start-class>io.jpom.JpomServerApplication</start-class>
     </properties>

diff --git a/modules/sub-plugin/auto-charset-jchardet/pom.xml b/modules/sub-plugin/auto-charset-jchardet/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-parent</artifactId>
         <groupId>io.jpom</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -44,7 +44,7 @@
         <module>git-clone</module>
     </modules>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.9.20</version>
+    <version>2.9.21</version>
     <groupId>io.jpom.plugins</groupId>
     <artifactId>jpom-plugins-parent</artifactId>
     <name>Jpom Plugins</name>

diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>jpom-plugins-parent</artifactId>
         <groupId>io.jpom.plugins</groupId>
-        <version>2.9.20</version>
+        <version>2.9.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
         简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
     </description>
     <inceptionYear>2017</inceptionYear>
-    <version>2.9.20</version>
+    <version>2.9.21</version>
     <url>https://gitee.com/dromara/Jpom</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git 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.9.20 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.9.21 -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.9.20
+# 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.9.21
 # 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
@@ -24,7 +24,7 @@
 
 
 # 版本
-jpom_version=2.9.20
+jpom_version=2.9.21
 
 #Mirror_Host=download.fastgit.org
 #Mirror_Host=hub.fastgit.xyz

diff --git a/web-vue/package.json b/web-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jpom-vue",
-  "version": "2.9.20",
+  "version": "2.9.21",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
             | |
             |_|
-     ➜ Jpom \ (•◡•) / (v2.9.20)
+     ➜ Jpom \ (•◡•) / (v2.9.21)