commit release 2.11.2

dromara · Mar 1, 2024 · e5ee6b8 · e5ee6b8
1 parent b4cdfe4
commit e5ee6b8
Show file tree

Hide file tree

Showing 28 changed files with 41 additions and 40 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.11.1
+JPOM_VERSION=2.11.2
 # 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.11.1-release.zip
- - modules/agent/target/agent-2.11.1-release.zip
+ - modules/server/target/server-2.11.2-release.zip
+ - modules/agent/target/agent-2.11.2-release.zip
  - name: server_zip
  path:
- - modules/server/target/server-2.11.1-release.zip
+ - modules/server/target/server-2.11.2-release.zip
  - name: agent_zip
  path:
- - modules/agent/target/agent-2.11.1-release.zip
+ - modules/agent/target/agent-2.11.2-release.zip
  settings: []
  strategy:
  retry: '0'
@@ -50,7 +50,7 @@ stages:
  name: publish_general_artifacts
  displayName: 合并打包
  dependArtifact: all_zip
- artifactName: jpom-2.11.1
+ artifactName: jpom-2.11.2
  strategy:
  retry: '0'
 strategy:

diff --git a/env-release.env b/env-release.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.11.1
+JPOM_VERSION=2.11.2
 # 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
@@ -17,7 +17,7 @@
  <parent>
  <groupId>org.dromara.jpom.agent-transport</groupId>
  <artifactId>jpom-agent-transport-parent</artifactId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git 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.2.3</version>
+ <version>2.11.2</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.2.3</version>
+ <version>2.11.2</version>
  <groupId>org.dromara.jpom.agent-transport</groupId>
  <artifactId>jpom-agent-transport-parent</artifactId>
  <name>Jpom Agent Transport</name>

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>agent</artifactId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <name>Jpom Agent</name>
  <properties>
  <start-class>org.dromara.jpom.JpomAgentApplication</start-class>

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <name>Jpom Common</name>
  <artifactId>common</artifactId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
 
  <dependencies>
 

diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt
@@ -6,5 +6,6 @@
  \____/| .__/ \___/|_| |_| |_|
  | |
  |_|
- ➜ Jpom is licensed under Mulan PSL v2.
- ➜ \ (•◡•) / current version v2.11.2.3
+
+ ➜ Jpom \ (•◡•) / (v2.11.2)
+
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
@@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <[email protected]>"
 LABEL documentation="https://jpom.top"
 
 ENV JPOM_HOME /usr/local/jpom-server
-ENV JPOM_PKG_VERSION 2.11.1
+ENV JPOM_PKG_VERSION 2.11.2
 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
@@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <[email protected]>"
 LABEL documentation="https://jpom.top"
 
 ENV JPOM_HOME /usr/local/jpom-server
-ENV JPOM_PKG_VERSION 2.11.1
+ENV JPOM_PKG_VERSION 2.11.2
 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
@@ -16,13 +16,13 @@
  <parent>
  <artifactId>jpom-parent</artifactId>
  <groupId>org.dromara.jpom</groupId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <name>Jpom Server</name>
  <artifactId>server</artifactId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <properties>
  <start-class>org.dromara.jpom.JpomServerApplication</start-class>
  </properties>

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>
  <packaging>pom</packaging>
@@ -26,7 +26,7 @@
  <module>storage-module-mysql</module>
  </modules>
  <modelVersion>4.0.0</modelVersion>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <groupId>org.dromara.jpom.storage-module</groupId>
  <artifactId>jpom-storage-module-parent</artifactId>
  <name>Jpom storage module</name>

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git 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.2.3</version>
+ <version>2.11.2</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
@@ -16,7 +16,7 @@
  <parent>
  <artifactId>jpom-plugins-parent</artifactId>
  <groupId>org.dromara.jpom.plugins</groupId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git 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.2.3</version>
+ <version>2.11.2</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
@@ -16,7 +16,7 @@
  <parent>
  <artifactId>jpom-plugins-parent</artifactId>
  <groupId>org.dromara.jpom.plugins</groupId>
- <version>2.11.2.3</version>
+ <version>2.11.2</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
@@ -16,7 +16,7 @@
  <parent>
  <artifactId>jpom-parent</artifactId>
  <groupId>org.dromara.jpom</groupId>
- <version>2.11.2.3</version>
+ <version>2.11.2</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.2.3</version>
+ <version>2.11.2</version>
  <groupId>org.dromara.jpom.plugins</groupId>
  <artifactId>jpom-plugins-parent</artifactId>
  <name>Jpom Plugins</name>

diff --git 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.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <name>plugin-ssh-jsch</name>

diff --git 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.2.3</version>
+ <version>2.11.2</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
@@ -16,7 +16,7 @@
  <parent>
  <artifactId>jpom-plugins-parent</artifactId>
  <groupId>org.dromara.jpom.plugins</groupId>
- <version>2.11.2.3</version>
+ <version>2.11.2</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
  简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
  </description>
  <inceptionYear>2017</inceptionYear>
- <version>2.11.2.3</version>
+ <version>2.11.2</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
@@ -18,12 +18,12 @@
 # docker buildx create --use
 
 # 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.1.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.2.1 -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.11.1.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.2.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
@@ -1 +1 @@
-2.11.1
+2.11.2
diff --git a/web-vue/package.json b/web-vue/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jpom-vue3",
  "private": true,
- "version": "2.11.1",
+ "version": "2.11.2",
  "type": "module",
  "scripts": {
  "dev": "vite --mode dev",