commit beta 2.10.38.3

2024-11-29 18:38:32 +08:00 · 2023-03-27 20:32:49 +08:00 · 2023-03-27 20:32:49 +08:00 · ca69e40853
commit ca69e40853
parent c9b90c86e0
25 changed files with 37 additions and 36 deletions
--- a/.workflow/MasterPipeline.yml
+++ b/.workflow/MasterPipeline.yml
@ -29,14 +29,14 @@ stages:
        artifacts:
          - name: all_zip
            path:
-              - modules/server/target/server-2.10.38.2-release.zip
-              - modules/agent/target/agent-2.10.38.2-release.zip
+              - modules/server/target/server-2.10.38.3-release.zip
+              - modules/agent/target/agent-2.10.38.3-release.zip
          - name: server_zip
            path:
-              - modules/server/target/server-2.10.38.2-release.zip
+              - modules/server/target/server-2.10.38.3-release.zip
          - name: agent_zip
            path:
-              - modules/agent/target/agent-2.10.38.2-release.zip
+              - modules/agent/target/agent-2.10.38.3-release.zip
        settings: []
        strategy:
          retry: '0'
@ -50,7 +50,7 @@ stages:
        name: publish_general_artifacts
        displayName: 合并打包
        dependArtifact: all_zip
-        artifactName: jpom-2.10.38.2
+        artifactName: jpom-2.10.38.3
        strategy:
          retry: '0'
 strategy:
--- a/env-beta.env
+++ b/env-beta.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.10.38.2
+JPOM_VERSION=2.10.38.3
 # 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
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/agent-transport-http/pom.xml
+++ b/modules/agent-transport/agent-transport-http/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/pom.xml
+++ b/modules/agent-transport/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -38,7 +38,7 @@
        <module>agent-transport-http</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>
    <groupId>io.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
@ -29,12 +29,12 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>
    <name>Jpom Agent</name>
    <properties>
        <start-class>io.jpom.JpomAgentApplication</start-class>
--- 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.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Common</name>
    <artifactId>common</artifactId>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>

    <dependencies>

--- a/modules/common/src/main/resources/banner.txt
+++ b/modules/common/src/main/resources/banner.txt
@ -1,10 +1,11 @@
       _
      | |
      | |_ __   ___  _ __ ___
-  _   | | '_ \ / _ \| '_ ` _  | |__| | |_) | (_) | | | | | |
+  _   | | '_ \ / _ \| '_ ` _ \
+ | |__| | |_) | (_) | | | | | |
  \____/| .__/ \___/|_| |_| |_|
        | |
        |_|

- ➜ Jpom \ (•◡•) / (v2.10.38.2)
+ ➜ Jpom \ (•◡•) / (v2.10.38.3)

--- a/modules/server/DockerfileBeta
+++ b/modules/server/DockerfileBeta
@ -29,7 +29,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.10.38.2
+ENV JPOM_PKG_VERSION	2.10.38.3
 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
@ -29,13 +29,13 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>
    <properties>
        <start-class>io.jpom.JpomServerApplication</start-class>
    </properties>
--- a/modules/storage-module/pom.xml
+++ b/modules/storage-module/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -39,7 +39,7 @@
        <module>storage-module-mysql</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>
    <groupId>io.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
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-h2/pom.xml
+++ b/modules/storage-module/storage-module-h2/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-mysql/pom.xml
+++ b/modules/storage-module/storage-module-mysql/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- 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.10.38.2</version>
+        <version>2.10.38.3</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
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</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
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</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
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- 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.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -42,7 +42,7 @@
        <module>encrypt</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</version>
    <groupId>io.jpom.plugins</groupId>
    <artifactId>jpom-plugins-parent</artifactId>
    <name>Jpom Plugins</name>
--- 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.10.38.2</version>
+        <version>2.10.38.3</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
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/updater/pom.xml
+++ b/modules/updater/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.38.2</version>
+        <version>2.10.38.3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -50,7 +50,7 @@
        简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
    </description>
    <inceptionYear>2017</inceptionYear>
-    <version>2.10.38.2</version>
+    <version>2.10.38.3</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.10.38.2
+2.10.38.3
--- a/web-vue/package.json
+++ b/web-vue/package.json
@ -1,6 +1,6 @@
 {
  "name": "jpom-vue",
-  "version": "2.10.38.2",
+  "version": "2.10.38.3",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",