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

Pre Merge pull request !74 from 商先森/2.5.0-release-fixCVE-2024-38809

Browse Source
pull/74/MERGE
商先森 5 months ago committed by Gitee
parent 43dcd655cd f7f16c98a6
commit 7247026caa
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 236 additions and 229 deletions
Show Stats Download Patch File Download Diff File

251
pom.xml
Unescape View File

@ -1,129 +1,129 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description>A distributed task scheduling framework.</description> <description>A distributed task scheduling framework.</description>
<url>https://www.xuxueli.com/</url> <url>https://www.xuxueli.com/</url>
<modules> <modules>
<module>xxl-job-core</module> <module>xxl-job-core</module>
<module>xxl-job-admin</module> <module>xxl-job-admin</module>
<module>xxl-job-executor-samples</module> <module>xxl-job-executor-samples</module>
</modules> </modules>
<properties> <properties>
<!-- env --> <!-- env -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<!-- plugin --> <!-- plugin -->
<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.2</maven-javadoc-plugin.version> <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version> <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<!-- base --> <!-- base -->
<slf4j-api.version>2.0.16</slf4j-api.version> <slf4j-api.version>2.0.16</slf4j-api.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version> <junit-jupiter.version>5.11.4</junit-jupiter.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<!-- net --> <!-- net -->
<netty.version>4.1.116.Final</netty.version> <netty.version>4.1.116.Final</netty.version>
<gson.version>2.11.0</gson.version> <gson.version>2.11.0</gson.version>
<!-- spring --> <!-- spring -->
<spring.version>5.3.39</spring.version> <spring.version>5.3.39</spring.version>
<spring-boot.version>2.7.18</spring-boot.version> <spring-boot.version>2.7.18</spring-boot.version>
<!-- db --> <!-- db -->
<mybatis-spring-boot-starter.version>2.3.2</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>2.3.2</mybatis-spring-boot-starter.version>
<mysql-connector-j.version>9.1.0</mysql-connector-j.version> <mysql-connector-j.version>9.1.0</mysql-connector-j.version>
<!-- dynamic language --> <!-- dynamic language -->
<groovy.version>4.0.24</groovy.version> <groovy.version>4.0.24</groovy.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>
</plugins> </plugins>
</build> </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>
<connection>scm:git:https://github.com/xuxueli/xxl-job.git</connection> <connection>scm:git:https://github.com/xuxueli/xxl-job.git</connection>
<developerConnection>scm:git:git@github.com:xuxueli/xxl-job.git</developerConnection> <developerConnection>scm:git:git@github.com:xuxueli/xxl-job.git</developerConnection>
</scm> </scm>
<developers> <developers>
<developer> <developer>
<id>XXL</id> <id>XXL</id>
<name>xuxueli</name> <name>xuxueli</name>
<email>931591021@qq.com</email> <email>931591021@qq.com</email>
<url>https://github.com/xuxueli</url> <url>https://github.com/xuxueli</url>
</developer> </developer>
</developers> </developers>
<profiles> <profiles>
<profile> <profile>
<id>release</id> <id>release</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<modules> <modules>
<module>xxl-job-core</module> <module>xxl-job-core</module>
</modules> </modules>
<build> <build>
<plugins> <plugins>
<!-- Source --> <!-- Source -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version> <version>${maven-source-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>jar-no-fork</goal> <goal>jar-no-fork</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Javadoc --> <!-- Javadoc -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version> <version>${maven-javadoc-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration> <configuration>
<doclint>none</doclint> <doclint>none</doclint>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- GPG --> <!-- GPG -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version> <version>${maven-gpg-plugin.version}</version>
<configuration> <configuration>
<useAgent>false</useAgent> <useAgent>false</useAgent>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>verify</phase> <phase>verify</phase>
@ -133,19 +133,18 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<distributionManagement> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>oss</id> <id>oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository> </snapshotRepository>
<repository> <repository>
<id>oss</id> <id>oss</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</profile> </profile>
</profiles> </profiles>
</project> </project>

1
xxl-job-admin/buildDocker.sh
Unescape View File

@ -0,0 +1 @@
docker build -t yfp-acr-registry.cn-beijing.cr.aliyuncs.com/cssyq/qyd/xxl-job:2.5.1 .

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

@ -1,119 +1,126 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
</parent> </parent>
<artifactId>xxl-job-admin</artifactId> <artifactId>xxl-job-admin</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-framework-bom</artifactId>
<version>${spring-boot.version}</version> <version>${spring.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
</dependencies> <dependency>
</dependencyManagement> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat --> <!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- starter-test：junit + spring-test + mockito --> <!-- starter-test：junit + spring-test + mockito -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- freemarker-starter --> <!-- freemarker-starter -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId> <artifactId>spring-boot-starter-freemarker</artifactId>
</dependency> </dependency>
<!-- mail-starter --> <!-- mail-starter -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
</dependency> </dependency>
<!-- starter-actuator --> <!-- starter-actuator -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<!-- mybatis-starter：mybatis + mybatis-spring + hikari（default） --> <!-- mybatis-starter：mybatis + mybatis-spring + hikari（default） -->
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot-starter.version}</version> <version>${mybatis-spring-boot-starter.version}</version>
</dependency> </dependency>
<!-- mysql --> <!-- mysql -->
<dependency> <dependency>
<groupId>com.mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>${mysql-connector-j.version}</version> <version>${mysql-connector-j.version}</version>
</dependency> </dependency>
<!-- xxl-job-core --> <!-- xxl-job-core -->
<dependency> <dependency>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId> <artifactId>xxl-job-core</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<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>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- docker --> <!-- docker -->
<!--<plugin> <!--<plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version> <version>0.4.13</version>
<configuration> <configuration>
&lt;!&ndash; made of '[a-z0-9-_.]' &ndash;&gt; &lt;!&ndash; made of '[a-z0-9-_.]' &ndash;&gt;
<imageName>${project.artifactId}:${project.version}</imageName> <imageName>${project.artifactId}:${project.version}</imageName>
<dockerDirectory>${project.basedir}</dockerDirectory> <dockerDirectory>${project.basedir}</dockerDirectory>
<resources> <resources>
<resource> <resource>
<targetPath>/</targetPath> <targetPath>/</targetPath>
<directory>${project.build.directory}</directory> <directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include> <include>${project.build.finalName}.jar</include>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
</plugin>--> </plugin>-->
</plugins> </plugins>
</build> </build>
</project> </project>

Write Preview
Loading…
Cancel
Save