Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Jpom
Commits
d4c434bf
Unverified
Commit
d4c434bf
authored
2 years ago
by
bwcx_jzy
Browse files
Options
Download
Email Patches
Plain Diff
commit 2.9.13
parent
6953a388
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.env
+1
-1
.env
.workflow/MasterPipeline.yml
+5
-5
.workflow/MasterPipeline.yml
CHANGELOG.md
+1
-1
CHANGELOG.md
docs/version.txt
+1
-1
docs/version.txt
modules/agent/pom.xml
+2
-2
modules/agent/pom.xml
modules/common/pom.xml
+2
-2
modules/common/pom.xml
modules/common/src/main/resources/jpom-logo.txt
+1
-1
modules/common/src/main/resources/jpom-logo.txt
modules/server/DockerfileRelease
+1
-1
modules/server/DockerfileRelease
modules/server/pom.xml
+2
-2
modules/server/pom.xml
modules/sub-plugin/auto-charset-jchardet/pom.xml
+1
-1
modules/sub-plugin/auto-charset-jchardet/pom.xml
modules/sub-plugin/db-h2/pom.xml
+1
-1
modules/sub-plugin/db-h2/pom.xml
modules/sub-plugin/docker-cli/pom.xml
+1
-1
modules/sub-plugin/docker-cli/pom.xml
modules/sub-plugin/email/pom.xml
+1
-1
modules/sub-plugin/email/pom.xml
modules/sub-plugin/git-clone/pom.xml
+1
-1
modules/sub-plugin/git-clone/pom.xml
modules/sub-plugin/maven-plugin/pom.xml
+1
-1
modules/sub-plugin/maven-plugin/pom.xml
modules/sub-plugin/pom.xml
+2
-2
modules/sub-plugin/pom.xml
modules/sub-plugin/svn-clone/pom.xml
+1
-1
modules/sub-plugin/svn-clone/pom.xml
modules/sub-plugin/webhook/pom.xml
+1
-1
modules/sub-plugin/webhook/pom.xml
pom.xml
+1
-1
pom.xml
script/docker.sh
+2
-2
script/docker.sh
with
29 additions
and
29 deletions
+29
-29
.env
+
1
-
1
View file @
d4c434bf
JPOM_VERSION=2.9.1
2
JPOM_VERSION=2.9.1
3
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
This diff is collapsed.
Click to expand it.
.workflow/MasterPipeline.yml
+
5
-
5
View file @
d4c434bf
...
...
@@ -29,14 +29,14 @@ stages:
artifacts
:
-
name
:
all_zip
path
:
-
modules/server/target/server-2.9.1
2
-release.zip
-
modules/agent/target/agent-2.9.1
2
-release.zip
-
modules/server/target/server-2.9.1
3
-release.zip
-
modules/agent/target/agent-2.9.1
3
-release.zip
-
name
:
server_zip
path
:
-
modules/server/target/server-2.9.1
2
-release.zip
-
modules/server/target/server-2.9.1
3
-release.zip
-
name
:
agent_zip
path
:
-
modules/agent/target/agent-2.9.1
2
-release.zip
-
modules/agent/target/agent-2.9.1
3
-release.zip
settings
:
[]
strategy
:
retry
:
'
0'
...
...
@@ -50,7 +50,7 @@ stages:
name
:
publish_general_artifacts
displayName
:
合并打包
dependArtifact
:
all_zip
artifactName
:
jpom-2.9.1
2
artifactName
:
jpom-2.9.1
3
strategy
:
retry
:
'
0'
strategy
:
...
...
This diff is collapsed.
Click to expand it.
CHANGELOG.md
+
1
-
1
View file @
d4c434bf
# 🚀 版本日志
## 2.9.13
## 2.9.13
(2022-10-20)
### 🐣 新增功能
...
...
This diff is collapsed.
Click to expand it.
docs/version.txt
+
1
-
1
View file @
d4c434bf
2.9.1
2
2.9.1
3
This diff is collapsed.
Click to expand it.
modules/agent/pom.xml
+
2
-
2
View file @
d4c434bf
...
...
@@ -29,12 +29,12 @@
<parent>
<artifactId>
jpom-parent
</artifactId>
<groupId>
io.jpom
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
agent
</artifactId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<name>
Jpom Agent
</name>
<properties>
<start-class>
io.jpom.JpomAgentApplication
</start-class>
...
...
This diff is collapsed.
Click to expand it.
modules/common/pom.xml
+
2
-
2
View file @
d4c434bf
...
...
@@ -29,13 +29,13 @@
<parent>
<artifactId>
jpom-parent
</artifactId>
<groupId>
io.jpom
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<name>
Jpom Common
</name>
<artifactId>
common
</artifactId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<dependencies>
...
...
This diff is collapsed.
Click to expand it.
modules/common/src/main/resources/jpom-logo.txt
+
1
-
1
View file @
d4c434bf
...
...
@@ -7,4 +7,4 @@
| |
|_|
➜ Jpom \ (•◡•) / (v2.9.12)
\ No newline at end of file
➜ Jpom \ (•◡•) / (v2.9.13)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/server/DockerfileRelease
+
1
-
1
View file @
d4c434bf
...
...
@@ -24,7 +24,7 @@
FROM maven:3.8.5-jdk-8
ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.9.1
2
ENV JPOM_PKG_VERSION 2.9.1
3
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
...
...
This diff is collapsed.
Click to expand it.
modules/server/pom.xml
+
2
-
2
View file @
d4c434bf
...
...
@@ -29,13 +29,13 @@
<parent>
<artifactId>
jpom-parent
</artifactId>
<groupId>
io.jpom
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<name>
Jpom Server
</name>
<artifactId>
server
</artifactId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<properties>
<start-class>
io.jpom.JpomServerApplication
</start-class>
</properties>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/auto-charset-jchardet/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/db-h2/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/docker-cli/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/email/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/git-clone/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/maven-plugin/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/pom.xml
+
2
-
2
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-parent
</artifactId>
<groupId>
io.jpom
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../../pom.xml
</relativePath>
</parent>
<packaging>
pom
</packaging>
...
...
@@ -44,7 +44,7 @@
<module>
git-clone
</module>
</modules>
<modelVersion>
4.0.0
</modelVersion>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<groupId>
io.jpom.plugins
</groupId>
<artifactId>
jpom-plugins-parent
</artifactId>
<name>
Jpom Plugins
</name>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/svn-clone/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
modules/sub-plugin/webhook/pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -29,7 +29,7 @@
<parent>
<artifactId>
jpom-plugins-parent
</artifactId>
<groupId>
io.jpom.plugins
</groupId>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
-
1
View file @
d4c434bf
...
...
@@ -47,7 +47,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
</description>
<inceptionYear>
2017
</inceptionYear>
<version>
2.9.1
2
</version>
<version>
2.9.1
3
</version>
<url>
https://gitee.com/dromara/Jpom
</url>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
...
...
This diff is collapsed.
Click to expand it.
script/docker.sh
+
2
-
2
View file @
d4c434bf
...
...
@@ -31,12 +31,12 @@
# docker buildx create --use
# 服务端
docker buildx build
--platform
linux/amd64,linux/arm64
-t
jpomdocker/jpom:2.9.1
2
-t
jpomdocker/jpom:latest
-f
./modules/server/DockerfileRelease
--push
.
docker buildx build
--platform
linux/amd64,linux/arm64
-t
jpomdocker/jpom:2.9.1
3
-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.9.1
2
# 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.9.1
3
# docker stop jpom-server
# docker rm jpom-server
# docker exec -it jpom-server /bin/bash
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help