From 223ba74c65121d8faa8f4d2db2547ddcd7083cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E5=81=A5?= Date: Sat, 25 Apr 2026 12:14:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-web-5.3.39=20CVE-2?= =?UTF-8?q?024-38809?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7805cb52..43728062 100644 --- a/pom.xml +++ b/pom.xml @@ -147,5 +147,14 @@ - + + + + + org.springframework + spring-web + ${spring.version} + + + \ No newline at end of file From 930e75a388a05d6869b6dc7e1a9d89785fe352fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E5=81=A5?= Date: Tue, 28 Apr 2026 11:50:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-5.3.39=20CVE-2024-?= =?UTF-8?q?38809?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 307 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 182 insertions(+), 125 deletions(-) diff --git a/pom.xml b/pom.xml index 43728062..2d4e7073 100644 --- a/pom.xml +++ b/pom.xml @@ -1,129 +1,129 @@ - 4.0.0 - com.xuxueli - xxl-job - 2.5.0 - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.xuxueli + xxl-job + 2.5.0 + pom - ${project.artifactId} - A distributed task scheduling framework. - https://www.xuxueli.com/ + ${project.artifactId} + A distributed task scheduling framework. + https://www.xuxueli.com/ - - xxl-job-core - xxl-job-admin - xxl-job-executor-samples + + xxl-job-core + xxl-job-admin + xxl-job-executor-samples - - - UTF-8 - UTF-8 - UTF-8 - 1.8 - 1.8 - true - - 3.3.1 - 3.11.2 - 3.2.7 - - 2.0.16 - 5.11.4 - 1.3.2 - - 4.1.116.Final - 2.11.0 - - 5.3.39 - 2.7.18 - - 2.3.2 - 9.1.0 - - 4.0.24 - + + + UTF-8 + UTF-8 + UTF-8 + 1.8 + 1.8 + true + + 3.3.1 + 3.11.2 + 3.2.7 + + 2.0.16 + 5.11.4 + 1.3.2 + + 4.1.116.Final + 2.11.0 + + 5.3.39 + 2.7.18 + + 2.3.2 + 9.1.0 + + 4.0.24 + - - - - + + + + - - - GNU General Public License version 3 - https://opensource.org/licenses/GPL-3.0 - - + + + GNU General Public License version 3 + https://opensource.org/licenses/GPL-3.0 + + - - master - https://github.com/xuxueli/xxl-job.git - scm:git:https://github.com/xuxueli/xxl-job.git - scm:git:git@github.com:xuxueli/xxl-job.git - - - - XXL - xuxueli - 931591021@qq.com - https://github.com/xuxueli - - + + master + https://github.com/xuxueli/xxl-job.git + scm:git:https://github.com/xuxueli/xxl-job.git + scm:git:git@github.com:xuxueli/xxl-job.git + + + + XXL + xuxueli + 931591021@qq.com + https://github.com/xuxueli + + - + - - release - - true - - - xxl-job-core - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - package - - jar - - - none - - - - - + + release + + true + + + xxl-job-core + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + package + + jar + + + none + + + + + org.apache.maven.plugins maven-gpg-plugin ${maven-gpg-plugin.version} - - false - + + false + verify @@ -133,28 +133,85 @@ - - - - - oss - https://oss.sonatype.org/content/repositories/snapshots/ - - - oss - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - + + + + + oss + https://oss.sonatype.org/content/repositories/snapshots/ + + + oss + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + org.springframework spring-web ${spring.version} + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + org.springframework + spring-jcl + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + \ No newline at end of file From 6050fd39b117fcacc2a2cbfc6029d95281e68928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E5=81=A5?= Date: Tue, 28 Apr 2026 11:55:13 +0800 Subject: [PATCH 3/4] build --- xxl-job-admin/buildDocker.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 xxl-job-admin/buildDocker.sh diff --git a/xxl-job-admin/buildDocker.sh b/xxl-job-admin/buildDocker.sh new file mode 100644 index 00000000..93e5e54d --- /dev/null +++ b/xxl-job-admin/buildDocker.sh @@ -0,0 +1 @@ +docker build -t yfp-acr-registry.cn-beijing.cr.aliyuncs.com/cssyq/qyd/xxl-job:2.5.1 . \ No newline at end of file From 2dbfdfeb73e5c5fd3f5bc0bfeff1796311584c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E5=81=A5?= Date: Tue, 28 Apr 2026 13:21:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-5.3.39=20CVE-2024-?= =?UTF-8?q?38809?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 67 ------------- xxl-job-admin/pom.xml | 213 ++++++++++++++++++++++-------------------- 2 files changed, 110 insertions(+), 170 deletions(-) diff --git a/pom.xml b/pom.xml index 2d4e7073..88808c95 100644 --- a/pom.xml +++ b/pom.xml @@ -147,71 +147,4 @@ - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-jcl - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - - \ No newline at end of file diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 16b36523..6faaa053 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -1,119 +1,126 @@ - 4.0.0 - - com.xuxueli - xxl-job - 2.5.0 - - xxl-job-admin - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.xuxueli + xxl-job + 2.5.0 + + xxl-job-admin + jar - - true - + + true + - - - - org.springframework.boot - spring-boot-starter-parent - ${spring-boot.version} - pom - import - - - + + + + org.springframework + spring-framework-bom + ${spring.version} + pom + import + + + org.springframework.boot + spring-boot-starter-parent + ${spring-boot.version} + pom + import + + + - + - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + - - - org.springframework.boot - spring-boot-starter-freemarker - + + + org.springframework.boot + spring-boot-starter-freemarker + - - - org.springframework.boot - spring-boot-starter-mail - + + + org.springframework.boot + spring-boot-starter-mail + - - - org.springframework.boot - spring-boot-starter-actuator - + + + org.springframework.boot + spring-boot-starter-actuator + - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot-starter.version} - - - - com.mysql - mysql-connector-j - ${mysql-connector-j.version} - + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring-boot-starter.version} + + + + com.mysql + mysql-connector-j + ${mysql-connector-j.version} + - - - com.xuxueli - xxl-job-core - ${project.parent.version} - + + + com.xuxueli + xxl-job-core + ${project.parent.version} + - + - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + - - + + - - + +