diff --git a/.env b/.env
index 769fb9b73..08478ef3a 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.8.25
+JPOM_VERSION=2.9.0
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml
index c84442eb3..e6b5b93ba 100644
--- a/.workflow/MasterPipeline.yml
+++ b/.workflow/MasterPipeline.yml
@@ -29,14 +29,14 @@ stages:
artifacts:
- name: all_zip
path:
- - modules/server/target/server-2.8.25-release.zip
- - modules/agent/target/agent-2.8.25-release.zip
+ - modules/server/target/server-2.9.0-release.zip
+ - modules/agent/target/agent-2.9.0-release.zip
- name: server_zip
path:
- - modules/server/target/server-2.8.25-release.zip
+ - modules/server/target/server-2.9.0-release.zip
- name: agent_zip
path:
- - modules/agent/target/agent-2.8.25-release.zip
+ - modules/agent/target/agent-2.9.0-release.zip
settings: []
strategy:
retry: '0'
@@ -50,7 +50,7 @@ stages:
name: publish_general_artifacts
displayName: 合并打包
dependArtifact: all_zip
- artifactName: jpom-2.8.25
+ artifactName: jpom-2.9.0
strategy:
retry: '0'
strategy:
diff --git a/docs/version.txt b/docs/version.txt
index 7ee492487..c8e38b614 100644
--- a/docs/version.txt
+++ b/docs/version.txt
@@ -1 +1 @@
-2.8.25
+2.9.0
diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
index 33a368a63..83f4edda3 100644
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@@ -29,15 +29,17 @@
jpom-parent
io.jpom
- 2.8.25
+ 2.9.0
../../pom.xml
4.0.0
agent
- 2.8.25
+ 2.9.0
Jpom Agent
io.jpom.JpomAgentApplication
+
+ 1.0.0
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 27fa388c1..a763bd996 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.8.25
+ 2.9.0
../../pom.xml
4.0.0
Jpom Common
common
- 2.8.25
+ 2.9.0
diff --git a/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java b/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java
index 3fa2f30b0..6746cacfe 100644
--- a/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java
+++ b/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java
@@ -60,6 +60,9 @@ public class ExtConfigEnvironmentPostProcessor implements EnvironmentPostProcess
{
// 兼容一些全局默认配置属性
List resources = ClassUtil.getResources("bin/extConfigDefault.yml");
+ if (resources.isEmpty()) {
+ resources.add(ClassUtil.getResourceURL("bin/extConfigDefault.yml"));
+ }
for (int i = 0; i < resources.size(); i++) {
URL resource = resources.get(i);
Resource extConfigDefault = new UrlResource(resource);
diff --git a/modules/common/src/main/resources/jpom-logo.txt b/modules/common/src/main/resources/jpom-logo.txt
index 586fe0cce..f1f078fee 100644
--- a/modules/common/src/main/resources/jpom-logo.txt
+++ b/modules/common/src/main/resources/jpom-logo.txt
@@ -7,4 +7,4 @@
| |
|_|
- ➜ Jpom \ (•◡•) / (v2.8.25)
\ No newline at end of file
+ ➜ Jpom \ (•◡•) / (v2.9.0)
\ No newline at end of file
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
index 91eccb8a1..8b51ffbf6 100644
--- a/modules/server/DockerfileRelease
+++ b/modules/server/DockerfileRelease
@@ -24,7 +24,7 @@
FROM maven:3.8.5-jdk-8
ENV JPOM_HOME /usr/local/jpom-server
-ENV JPOM_PKG server-2.8.25-release.tar.gz
+ENV JPOM_PKG server-2.9.0-release.tar.gz
ENV JPOM_DATA_PATH ${JPOM_HOME}/data
ENV JPOM_LOG_PATH ${JPOM_HOME}/log
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index d65ead332..1e5d6bd07 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.8.25
+ 2.9.0
../../pom.xml
4.0.0
Jpom Server
server
- 2.8.25
+ 2.9.0
io.jpom.JpomServerApplication
diff --git a/modules/sub-plugin/auto-charset-jchardet/pom.xml b/modules/sub-plugin/auto-charset-jchardet/pom.xml
index d44abc1fb..8a3e50f5b 100644
--- a/modules/sub-plugin/auto-charset-jchardet/pom.xml
+++ b/modules/sub-plugin/auto-charset-jchardet/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml
index 7d484ae47..060048ad3 100644
--- a/modules/sub-plugin/db-h2/pom.xml
+++ b/modules/sub-plugin/db-h2/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml
index 1906d7b21..d565d6000 100644
--- a/modules/sub-plugin/docker-cli/pom.xml
+++ b/modules/sub-plugin/docker-cli/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml
index 334b85497..cfdbb08d6 100644
--- a/modules/sub-plugin/email/pom.xml
+++ b/modules/sub-plugin/email/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml
index 6d41a4d98..c2aa92288 100644
--- a/modules/sub-plugin/git-clone/pom.xml
+++ b/modules/sub-plugin/git-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml
index ab919ff5d..375a0feae 100644
--- a/modules/sub-plugin/maven-plugin/pom.xml
+++ b/modules/sub-plugin/maven-plugin/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml
index e4c5bf8bc..12e5f4e8b 100644
--- a/modules/sub-plugin/pom.xml
+++ b/modules/sub-plugin/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.8.25
+ 2.9.0
../../pom.xml
pom
@@ -44,7 +44,7 @@
git-clone
4.0.0
- 2.8.25
+ 2.9.0
io.jpom.plugins
jpom-plugins-parent
Jpom Plugins
diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml
index 56c3b4e9a..ddac88855 100644
--- a/modules/sub-plugin/svn-clone/pom.xml
+++ b/modules/sub-plugin/svn-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml
index 6bc8ea1a9..6cc82cba4 100644
--- a/modules/sub-plugin/webhook/pom.xml
+++ b/modules/sub-plugin/webhook/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.8.25
+ 2.9.0
../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 2a75a2bb8..7ef1858da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
2017
- 2.8.25
+ 2.9.0
https://gitee.com/dromara/Jpom
UTF-8
diff --git a/script/docker.sh b/script/docker.sh
index 109274518..f7fbcabf9 100644
--- a/script/docker.sh
+++ b/script/docker.sh
@@ -29,12 +29,12 @@
# https://hub.docker.com/r/jpomdocker/jpom
# 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.25 -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.9.0 -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.25
+# 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.0
# docker stop jpom-server
# docker rm jpom-server
# docker exec -it jpom-server /bin/bash
diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh
index 2012911ad..c54c620eb 100644
--- a/script/release-sha1sum.sh
+++ b/script/release-sha1sum.sh
@@ -24,7 +24,7 @@
# 版本
-jpom_version=2.8.25
+jpom_version=2.9.0
function checkItem()
{
diff --git a/web-vue/package.json b/web-vue/package.json
index 05f79bafa..ab7b5a06c 100644
--- a/web-vue/package.json
+++ b/web-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "jpom-vue",
- "version": "2.8.25",
+ "version": "2.9.0",
"private": true,
"scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",