msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

【升级】升级多项maven依赖至较新版本，如 netty、groovy、spring、spring-ai、dify 等；

Browse Source
pull/72/head
xuxueli 12 months ago
parent 011567da3b
commit 8b8ff690c1
7 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File

3
doc/XXL-JOB官方文档.md
Unescape View File

@ -2572,7 +2572,8 @@ public void execute() {
### 7.41 版本 v3.2.1 Release Notes[规划中] ### 7.41 版本 v3.2.1 Release Notes[规划中]
- 1、【ING】底层组件移除单例写法，汇总factory统一管理； - 1、【升级】升级多项maven依赖至较新版本，如 netty、groovy、spring、spring-ai、dify 等；
- 2、【ING】底层组件移除单例写法，汇总factory统一管理；
### TODO LIST ### TODO LIST

47
pom.xml
Unescape View File

@ -25,42 +25,39 @@
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<!-- plugin --> <!-- plugin -->
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version> <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version> <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version> <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version> <central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
<!-- base --> <!-- base -->
<slf4j-api.version>2.0.17</slf4j-api.version> <slf4j-api.version>2.0.17</slf4j-api.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version> <junit-jupiter.version>5.13.4</junit-jupiter.version>
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version> <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
<!-- net --> <!-- net -->
<netty.version>4.2.4.Final</netty.version> <netty.version>4.2.6.Final</netty.version>
<gson.version>2.13.1</gson.version> <gson.version>2.13.2</gson.version>
<!-- spring --> <!-- spring -->
<spring-boot.version>3.5.4</spring-boot.version> <spring-boot.version>3.5.6</spring-boot.version>
<spring.version>6.2.10</spring.version> <spring.version>6.2.11</spring.version>
<!-- db --> <!-- mybatis & db -->
<mybatis-spring-boot-starter.version>3.0.5</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>3.0.5</mybatis-spring-boot-starter.version>
<mysql-connector-j.version>9.4.0</mysql-connector-j.version> <mysql-connector-j.version>9.4.0</mysql-connector-j.version>
<!-- dynamic language -->
<groovy.version>4.0.28</groovy.version> <!-- groovy -->
<groovy.version>5.0.1</groovy.version>
<!-- xxl-sso (+xxl-tool、gson) --> <!-- xxl-sso (+xxl-tool、gson) -->
<xxl-sso.version>2.0.0</xxl-sso.version> <xxl-sso.version>2.1.0</xxl-sso.version>
</properties> </properties>
<build>
<plugins>
</plugins>
</build>
<licenses> <licenses>
<license> <license>
<name>GNU General Public License version 3</name> <name>GNU General Public License version 3</name>
<url>https://opensource.org/licenses/GPL-3.0</url> <url>https://opensource.org/licenses/GPL-3.0</url>
</license> </license>
</licenses> </licenses>
<scm> <scm>
<tag>master</tag> <tag>master</tag>
<url>https://github.com/xuxueli/xxl-job.git</url> <url>https://github.com/xuxueli/xxl-job.git</url>
@ -76,6 +73,11 @@
</developer> </developer>
</developers> </developers>
<build>
<plugins>
</plugins>
</build>
<profiles> <profiles>
<profile> <profile>
@ -88,6 +90,17 @@
</modules> </modules>
<build> <build>
<plugins> <plugins>
<!-- Compiler -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<parameters>true</parameters>
</configuration>
</plugin>
<!-- Source --> <!-- Source -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

21
xxl-job-admin/pom.xml
Unescape View File

@ -89,7 +89,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<!--<version>${spring-boot.version}</version>--> <version>${spring-boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -99,25 +99,6 @@
</executions> </executions>
</plugin> </plugin>
<!-- docker -->
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
&lt;!&ndash; made of '[a-z0-9-_.]' &ndash;&gt;
<imageName>${project.artifactId}:${project.version}</imageName>
<dockerDirectory>${project.basedir}</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
</plugin>-->
</plugins> </plugins>
</build> </build>

4
xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java
Unescape View File

@ -26,7 +26,7 @@ public class JobGroupPermissionUtil {
return true; return true;
} else { } else {
List<String> jobGroups = (loginInfo.getExtraInfo()!=null && loginInfo.getExtraInfo().containsKey("jobGroups")) List<String> 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)); return jobGroups.contains(String.valueOf(jobGroup));
} }
} }
@ -52,7 +52,7 @@ public class JobGroupPermissionUtil {
return jobGroupListTotal; return jobGroupListTotal;
} else { } else {
List<String> jobGroups = (loginInfoResponse.getData().getExtraInfo()!=null && loginInfoResponse.getData().getExtraInfo().containsKey("jobGroups")) List<String> 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 return jobGroupListTotal
.stream() .stream()

33
xxl-job-core/pom.xml
Unescape View File

@ -15,6 +15,22 @@
<dependencies> <dependencies>
<!-- ********************** base ********************** -->
<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<!-- jakarta.annotation-api -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- ********************** embed server: netty + gson ********************** --> <!-- ********************** embed server: netty + gson ********************** -->
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
@ -27,7 +43,7 @@
<version>${gson.version}</version> <version>${gson.version}</version>
</dependency> </dependency>
<!-- ********************** plugin ********************** --> <!-- ********************** plugin: groovy + spring ********************** -->
<!-- groovy-all --> <!-- groovy-all -->
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.apache.groovy</groupId>
@ -43,21 +59,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- ********************** base ********************** -->
<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<!-- jakarta.annotation-api -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml
Unescape View File

@ -16,8 +16,8 @@
<url>https://www.xuxueli.com/</url> <url>https://www.xuxueli.com/</url>
<properties> <properties>
<spring-ai.version>1.0.1</spring-ai.version> <spring-ai.version>1.0.2</spring-ai.version>
<dify-java-client.version>1.1.7</dify-java-client.version> <dify-java-client.version>1.1.9</dify-java-client.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -69,11 +69,10 @@
<build> <build>
<plugins> <plugins>
<!-- spring-boot-maven-plugin (提供了直接运行项目的插件：如果是通过parent方式继承spring-boot-starter-parent则不用此插件) -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<!--<version>${spring-boot.version}</version>--> <version>${spring-boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

6
xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
Unescape View File

@ -54,11 +54,10 @@
<build> <build>
<plugins> <plugins>
<!-- spring-boot-maven-plugin (提供了直接运行项目的插件：如果是通过parent方式继承spring-boot-starter-parent则不用此插件) -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<!--<version>${spring-boot.version}</version>--> <version>${spring-boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -66,9 +65,6 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration>
<fork>true</fork>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

Write Preview
Loading…
Cancel
Save