Skip to content

Commit

Permalink
pre commit 2.8.20
Browse files Browse the repository at this point in the history
  • Loading branch information
bwcx-jzy committed May 13, 2022
1 parent e093357 commit a29930c
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 25 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.8.19
JPOM_VERSION=2.8.20
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
2 changes: 1 addition & 1 deletion docs/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.19
2.8.20
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>io.jpom</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>agent</artifactId>
<version>2.8.19</version>
<version>2.8.20</version>
<name>Jpom Agent</name>
<properties>
<start-class>io.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>io.jpom</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Jpom Common</name>
<artifactId>common</artifactId>
<version>2.8.19</version>
<version>2.8.20</version>

<dependencies>

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

➜ Jpom \ (•◡•) / (v2.8.19)
➜ Jpom \ (•◡•) / (v2.8.20)
2 changes: 1 addition & 1 deletion modules/server/DockerfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
FROM maven:3.8.5-jdk-8

ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG server-2.8.19-release.tar.gz
ENV JPOM_PKG server-2.8.20-release.tar.gz

ENV JPOM_DATA_PATH ${JPOM_HOME}/data
ENV JPOM_LOG_PATH ${JPOM_HOME}/log
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>io.jpom</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Jpom Server</name>
<artifactId>server</artifactId>
<version>2.8.19</version>
<version>2.8.20</version>
<properties>
<start-class>io.jpom.JpomServerApplication</start-class>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/auto-charset-jchardet/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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/db-h2/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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/sub-plugin/maven-plugin/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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</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>io.jpom</groupId>
<version>2.8.19</version>
<version>2.8.20</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Expand All @@ -44,7 +44,7 @@
<module>git-clone</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<version>2.8.19</version>
<version>2.8.20</version>
<groupId>io.jpom.plugins</groupId>
<artifactId>jpom-plugins-parent</artifactId>
<name>Jpom Plugins</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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</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>io.jpom.plugins</groupId>
<version>2.8.19</version>
<version>2.8.20</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 @@ -46,7 +46,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
</description>
<inceptionYear>2017</inceptionYear>
<version>2.8.19</version>
<version>2.8.20</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 @@ -29,12 +29,12 @@
# https://hub.docker.com/r/jpomdocker/jpom

# 服务端
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.19 -f ./modules/server/DockerfileRelease --push .
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.20 -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.8.19
# 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.8.20
# docker stop jpom-server
# docker rm jpom-server
# docker exec -it jpom-server /bin/bash
Expand Down
2 changes: 1 addition & 1 deletion script/release-sha1sum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


# 版本
jpom_version=2.8.19
jpom_version=2.8.20

function checkItem()
{
Expand Down
2 changes: 1 addition & 1 deletion web-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jpom-vue",
"version": "2.8.19",
"version": "2.8.20",
"private": true,
"scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",
Expand Down

0 comments on commit a29930c

Please sign in to comment.