test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 03:48:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bwcx_jzy 2023-04-04 16:29:00 +08:00
commit ecc0b78797
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
23 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env-beta.env
View File

@ -1,3 +1,3 @@
JPOM_VERSION=2.10.39.4 JPOM_VERSION=2.10.40.1
# Server Token 生产部署请更换 # Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

2
modules/agent-transport/agent-transport-common/pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/agent-transport/agent-transport-http/pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

4
modules/agent-transport/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -38,7 +38,7 @@
<module>agent-transport-http</module> <module>agent-transport-http</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.10.39</version> <version>2.10.40.1</version>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<name>Jpom Agent Transport</name> <name>Jpom Agent Transport</name>

4
modules/agent/pom.xml
View File

@ -29,12 +29,12 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>agent</artifactId> <artifactId>agent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<name>Jpom Agent</name> <name>Jpom Agent</name>
<properties> <properties>
<start-class>org.dromara.jpom.JpomAgentApplication</start-class> <start-class>org.dromara.jpom.JpomAgentApplication</start-class>

4
modules/common/pom.xml
View File

@ -29,13 +29,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Jpom Common</name> <name>Jpom Common</name>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<dependencies> <dependencies>

2
modules/common/src/main/resources/banner.txt
View File

@ -7,5 +7,5 @@
| | | |
|_| |_|
➜ Jpom \ (•◡•) / (v2.10.39) ➜ Jpom \ (•◡•) / (v2.10.40.1)

2
modules/server/DockerfileBeta
View File

@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
LABEL documentation="https://jpom.top" LABEL documentation="https://jpom.top"
ENV JPOM_HOME /usr/local/jpom-server ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.10.39.4 ENV JPOM_PKG_VERSION 2.10.40.1
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

4
modules/server/pom.xml
View File

@ -29,13 +29,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Jpom Server</name> <name>Jpom Server</name>
<artifactId>server</artifactId> <artifactId>server</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<properties> <properties>
<start-class>org.dromara.jpom.JpomServerApplication</start-class> <start-class>org.dromara.jpom.JpomServerApplication</start-class>
</properties> </properties>

4
modules/storage-module/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -39,7 +39,7 @@
<module>storage-module-mysql</module> <module>storage-module-mysql</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.10.39</version> <version>2.10.40.1</version>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<name>Jpom storage module</name> <name>Jpom storage module</name>

2
modules/storage-module/storage-module-common/pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-h2/pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-mysql/pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/sub-plugin/docker-cli/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/email/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/encrypt/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/git-clone/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
modules/sub-plugin/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -42,7 +42,7 @@
<module>encrypt</module> <module>encrypt</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.10.39</version> <version>2.10.40.1</version>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<name>Jpom Plugins</name> <name>Jpom Plugins</name>

2
modules/sub-plugin/svn-clone/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/webhook/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/updater/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.10.39</version> <version>2.10.40.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

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

2
script/tag.beta.txt
View File

@ -1 +1 @@
2.10.39.4 2.10.40.1