Skip to content

Commit

Permalink
commit release 2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bwcx-jzy committed Jan 18, 2024
1 parent 5302198 commit 7af8a40
Show file tree
Hide file tree
Showing 28 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
JPOM_VERSION=2.11.0
JPOM_VERSION=2.11.1
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
10 changes: 5 additions & 5 deletions .workflow/MasterPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ stages:
artifacts:
- name: all_zip
path:
- modules/server/target/server-2.11.0-release.zip
- modules/agent/target/agent-2.11.0-release.zip
- modules/server/target/server-2.11.1-release.zip
- modules/agent/target/agent-2.11.1-release.zip
- name: server_zip
path:
- modules/server/target/server-2.11.0-release.zip
- modules/server/target/server-2.11.1-release.zip
- name: agent_zip
path:
- modules/agent/target/agent-2.11.0-release.zip
- modules/agent/target/agent-2.11.1-release.zip
settings: []
strategy:
retry: '0'
Expand All @@ -50,7 +50,7 @@ stages:
name: publish_general_artifacts
displayName: 合并打包
dependArtifact: all_zip
artifactName: jpom-2.11.0
artifactName: jpom-2.11.1
strategy:
retry: '0'
strategy:
Expand Down
2 changes: 1 addition & 1 deletion env-release.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
JPOM_VERSION=2.11.0
JPOM_VERSION=2.11.1
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
2 changes: 1 addition & 1 deletion modules/agent-transport/agent-transport-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/agent-transport/agent-transport-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions modules/agent-transport/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Expand All @@ -38,7 +38,7 @@
<module>agent-transport-http</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<version>2.11.1.5</version>
<version>2.11.1</version>
<groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId>
<name>Jpom Agent Transport</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>agent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<name>Jpom Agent</name>
<properties>
<start-class>org.dromara.jpom.JpomAgentApplication</start-class>
Expand Down
4 changes: 2 additions & 2 deletions modules/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Jpom Common</name>
<artifactId>common</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>

<dependencies>

Expand Down
2 changes: 1 addition & 1 deletion modules/common/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
| |
|_|

➜ Jpom \ (•◡•) / (v2.11.1.5)
➜ Jpom \ (•◡•) / (v2.11.1)

2 changes: 1 addition & 1 deletion modules/server/DockerfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.0
ENV JPOM_PKG_VERSION 2.11.1
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

Expand Down
2 changes: 1 addition & 1 deletion modules/server/DockerfileReleaseJdk17
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.0
ENV JPOM_PKG_VERSION 2.11.1
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

Expand Down
4 changes: 2 additions & 2 deletions modules/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Jpom Server</name>
<artifactId>server</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<properties>
<start-class>org.dromara.jpom.JpomServerApplication</start-class>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions modules/storage-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Expand All @@ -39,7 +39,7 @@
<module>storage-module-mysql</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<version>2.11.1.5</version>
<version>2.11.1</version>
<groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId>
<name>Jpom storage module</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/storage-module/storage-module-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/storage-module/storage-module-h2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/storage-module/storage-module-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/docker-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/email/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/encrypt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/git-clone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions modules/sub-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Expand All @@ -43,7 +43,7 @@
<module>ssh-jsch</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<version>2.11.1.5</version>
<version>2.11.1</version>
<groupId>org.dromara.jpom.plugins</groupId>
<artifactId>jpom-plugins-parent</artifactId>
<name>Jpom Plugins</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/ssh-jsch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>plugin-ssh-jsch</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/svn-clone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/webhook/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.1.5</version>
<version>2.11.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
</description>
<inceptionYear>2017</inceptionYear>
<version>2.11.1.5</version>
<version>2.11.1</version>
<url>https://gitee.com/dromara/Jpom</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions script/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
# docker buildx create --use

# 服务端
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.0.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
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: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.0.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.1.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
Expand Down
2 changes: 1 addition & 1 deletion script/tag.release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.11.0
2.11.1
2 changes: 1 addition & 1 deletion web-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jpom-vue3",
"private": true,
"version": "2.11.0",
"version": "2.11.1",
"type": "module",
"scripts": {
"dev": "vite --mode dev",
Expand Down

0 comments on commit 7af8a40

Please sign in to comment.