Merge remote-tracking branch 'origin/beta' into beta

2024-11-29 18:38:32 +08:00 · 2024-08-02 15:49:24 +08:00 · 2024-08-02 15:49:24 +08:00 · c9fcfcb862
commit c9fcfcb862
parent 0c90225d75 6a3ac1bf5d
26 changed files with 32 additions and 32 deletions
--- a/env-beta.env
+++ b/env-beta.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.11.8.4
+JPOM_VERSION=2.11.8.5
 # Server Token 生产部署请更换
 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
--- a/modules/agent-transport/agent-transport-common/pom.xml
+++ b/modules/agent-transport/agent-transport-common/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/agent-transport-http/pom.xml
+++ b/modules/agent-transport/agent-transport-http/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/pom.xml
+++ b/modules/agent-transport/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -25,7 +25,7 @@
        <module>agent-transport-http</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <groupId>org.dromara.jpom.agent-transport</groupId>
    <artifactId>jpom-agent-transport-parent</artifactId>
    <name>Jpom Agent Transport</name>
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@ -16,12 +16,12 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <name>Jpom Agent</name>
    <properties>
        <start-class>org.dromara.jpom.JpomAgentApplication</start-class>
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@ -16,13 +16,13 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Common</name>
    <artifactId>common</artifactId>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>

    <dependencies>

--- 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.8.4)
+ ➜ \ (•◡•) / (v2.11.8.5)
--- a/modules/server/DockerfileBeta
+++ b/modules/server/DockerfileBeta
@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
 LABEL documentation="https://jpom.top"

 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG_VERSION	2.11.8.4
+ENV JPOM_PKG_VERSION	2.11.8.5
 ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz
 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

--- a/modules/server/DockerfileBetaJdk17
+++ b/modules/server/DockerfileBetaJdk17
@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
 LABEL documentation="https://jpom.top"

 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG_VERSION	2.11.8.4
+ENV JPOM_PKG_VERSION	2.11.8.5
 ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz
 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@ -16,13 +16,13 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <properties>
        <start-class>org.dromara.jpom.JpomServerApplication</start-class>
    </properties>
--- a/modules/storage-module/pom.xml
+++ b/modules/storage-module/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -28,7 +28,7 @@
        <module>storage-module-mariadb</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <groupId>org.dromara.jpom.storage-module</groupId>
    <artifactId>jpom-storage-module-parent</artifactId>
    <name>Jpom storage module</name>
--- a/modules/storage-module/storage-module-common/pom.xml
+++ b/modules/storage-module/storage-module-common/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-h2/pom.xml
+++ b/modules/storage-module/storage-module-h2/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-mariadb/pom.xml
+++ b/modules/storage-module/storage-module-mariadb/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-mysql/pom.xml
+++ b/modules/storage-module/storage-module-mysql/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>org.dromara.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-postgresql/pom.xml
+++ b/modules/storage-module/storage-module-postgresql/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-storage-module-parent</artifactId>
        <groupId>org.dromara.jpom.storage-module</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/modules/sub-plugin/docker-cli/pom.xml
+++ b/modules/sub-plugin/docker-cli/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/email/pom.xml
+++ b/modules/sub-plugin/email/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/encrypt/pom.xml
+++ b/modules/sub-plugin/encrypt/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/git-clone/pom.xml
+++ b/modules/sub-plugin/git-clone/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/pom.xml
+++ b/modules/sub-plugin/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>org.dromara.jpom</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -30,7 +30,7 @@
        <module>ssh-jsch</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <groupId>org.dromara.jpom.plugins</groupId>
    <artifactId>jpom-plugins-parent</artifactId>
    <name>Jpom Plugins</name>
--- a/modules/sub-plugin/ssh-jsch/pom.xml
+++ b/modules/sub-plugin/ssh-jsch/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>plugin-ssh-jsch</name>
--- a/modules/sub-plugin/svn-clone/pom.xml
+++ b/modules/sub-plugin/svn-clone/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/webhook/pom.xml
+++ b/modules/sub-plugin/webhook/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>org.dromara.jpom.plugins</groupId>
-        <version>2.11.8.4</version>
+        <version>2.11.8.5</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -36,7 +36,7 @@
        简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
    </description>
    <inceptionYear>2017</inceptionYear>
-    <version>2.11.8.4</version>
+    <version>2.11.8.5</version>
    <url>https://gitee.com/dromara/Jpom</url>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--- a/script/tag.beta.txt
+++ b/script/tag.beta.txt
@ -1 +1 @@
-2.11.8.4
+2.11.8.5
 @ -1 +1 @@
 .11.8.4
 .11.8.5