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

commit release 2.10.42

Browse Source
This commit is contained in:
bwcx_jzy 2023-08-24 15:20:55 +08:00
parent e90bdb0739
commit b8dc0e2d9b
29 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

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

10
.workflow/MasterPipeline.yml
View File

@ -29,14 +29,14 @@ stages:
artifacts:
- name: all_zip
path:
- modules/server/target/server-2.10.41-release.zip
- modules/agent/target/agent-2.10.41-release.zip
- modules/server/target/server-2.10.42-release.zip
- modules/agent/target/agent-2.10.42-release.zip
- name: server_zip
path:
- modules/server/target/server-2.10.41-release.zip
- modules/server/target/server-2.10.42-release.zip
- name: agent_zip
path:
- modules/agent/target/agent-2.10.41-release.zip
- modules/agent/target/agent-2.10.42-release.zip
settings: []
strategy:
retry: '0'
@ -50,7 +50,7 @@ stages:
name: publish_general_artifacts
displayName: 合并打包
dependArtifact: all_zip
artifactName: jpom-2.10.41
artifactName: jpom-2.10.42
strategy:
retry: '0'
strategy:

2
env-release.env
View File

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

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

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

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

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

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

@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.10.42.4</version>
<version>2.10.42</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.42.4</version>
<version>2.10.42</version>
<groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId>
<name>Jpom Agent Transport</name>

4
modules/agent/pom.xml
View File

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

4
modules/common/pom.xml
View File

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

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

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

2
modules/server/DockerfileRelease
View File

@ -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.41
ENV JPOM_PKG_VERSION 2.10.42
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

2
modules/server/DockerfileReleaseJdk17
View File

@ -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.41
ENV JPOM_PKG_VERSION 2.10.42
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

4
modules/server/pom.xml
View File

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

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

@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.10.42.4</version>
<version>2.10.42</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.42.4</version>
<version>2.10.42</version>
<groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId>
<name>Jpom storage module</name>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.10.42.4</version>
<version>2.10.42</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
@ -43,7 +43,7 @@
<module>ssh-jsch</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<version>2.10.42.4</version>
<version>2.10.42</version>
<groupId>org.dromara.jpom.plugins</groupId>
<artifactId>jpom-plugins-parent</artifactId>
<name>Jpom Plugins</name>

2
modules/sub-plugin/ssh-jsch/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.10.42.4</version>
<version>2.10.42</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>plugin-ssh-jsch</name>

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

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

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

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

2
modules/updater/pom.xml
View File

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

2
pom.xml
View File

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

4
script/docker.sh
View File

@ -31,12 +31,12 @@
# docker buildx create --use
# 服务端
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.41.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.42.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.10.41.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.10.42.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

2
script/tag.release.txt
View File

@ -1 +1 @@
2.10.41
2.10.42

2
web-vue/package.json
View File

@ -1,6 +1,6 @@
{
"name": "jpom-vue",
"version": "2.10.41",
"version": "2.10.42",
"private": true,
"scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",