diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 449dfc8d..ffe6ecff 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2572,7 +2572,8 @@ public void execute() { ### 7.41 版本 v3.2.1 Release Notes[规划中] -- 1、【ING】底层组件移除单例写法,汇总factory统一管理; +- 1、【升级】升级多项maven依赖至较新版本,如 netty、groovy、spring、spring-ai、dify 等; +- 2、【ING】底层组件移除单例写法,汇总factory统一管理; ### TODO LIST diff --git a/pom.xml b/pom.xml index 30ecafc2..99041b98 100644 --- a/pom.xml +++ b/pom.xml @@ -25,42 +25,39 @@ 17 true + 3.14.1 3.3.1 - 3.11.3 + 3.12.0 3.2.8 - 0.8.0 + 0.9.0 2.0.17 5.13.4 3.0.0 + - 4.2.4.Final - 2.13.1 + 4.2.6.Final + 2.13.2 + - 3.5.4 - 6.2.10 - + 3.5.6 + 6.2.11 + 3.0.5 9.4.0 - - 4.0.28 + + + 5.0.1 - 2.0.0 + 2.1.0 - - - - - - GNU General Public License version 3 https://opensource.org/licenses/GPL-3.0 - master https://github.com/xuxueli/xxl-job.git @@ -76,6 +73,11 @@ + + + + + @@ -88,6 +90,17 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + + org.apache.maven.plugins diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index bdcf01e1..8674c658 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -89,7 +89,7 @@ org.springframework.boot spring-boot-maven-plugin - + ${spring-boot.version} @@ -99,25 +99,6 @@ - - - diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java index 1859fbe1..434a79fa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java @@ -26,7 +26,7 @@ public class JobGroupPermissionUtil { return true; } else { List jobGroups = (loginInfo.getExtraInfo()!=null && loginInfo.getExtraInfo().containsKey("jobGroups")) - ? List.of(StringTool.tokenizeToArray(loginInfo.getExtraInfo().get("jobGroups"), ",")) :new ArrayList<>(); + ? StringTool.split(loginInfo.getExtraInfo().get("jobGroups"), ",") :new ArrayList<>(); return jobGroups.contains(String.valueOf(jobGroup)); } } @@ -52,7 +52,7 @@ public class JobGroupPermissionUtil { return jobGroupListTotal; } else { List jobGroups = (loginInfoResponse.getData().getExtraInfo()!=null && loginInfoResponse.getData().getExtraInfo().containsKey("jobGroups")) - ? List.of(StringTool.tokenizeToArray(loginInfoResponse.getData().getExtraInfo().get("jobGroups"), ",")) :new ArrayList<>(); + ? StringTool.split(loginInfoResponse.getData().getExtraInfo().get("jobGroups"), ",") :new ArrayList<>(); return jobGroupListTotal .stream() diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 78e978f1..b3ca9857 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -15,6 +15,22 @@ + + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api.version} + provided + + io.netty @@ -27,7 +43,7 @@ ${gson.version} - + org.apache.groovy @@ -43,21 +59,6 @@ provided - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation-api.version} - provided - \ No newline at end of file diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml index c4a6eb51..43cd00e2 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml @@ -16,8 +16,8 @@ https://www.xuxueli.com/ - 1.0.1 - 1.1.7 + 1.0.2 + 1.1.9 @@ -69,11 +69,10 @@ - org.springframework.boot spring-boot-maven-plugin - + ${spring-boot.version} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml index a318279e..5d5bcea6 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml @@ -54,11 +54,10 @@ - org.springframework.boot spring-boot-maven-plugin - + ${spring-boot.version} @@ -66,9 +65,6 @@ - - true -