commit:同步2.2版本

This commit is contained in:
Jerry
2022-01-23 21:00:54 +08:00
parent ff7e52eedb
commit 35ac62e4d2
1201 changed files with 16301 additions and 161770 deletions

View File

@@ -14,17 +14,18 @@
<spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
<spring-boot.version>2.3.10.RELEASE</spring-boot.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
<spring-platform.version>Cairo-SR8</spring-platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<!-- 工具库版本 -->
<joda-time.version>2.10.13</joda-time.version>
<guava.version>20.0</guava.version>
<commons-io.version>2.6</commons-io.version>
<commons-collections4.version>4.4</commons-collections4.version>
<common-csv.version>1.8</common-csv.version>
<poi-ooxml.version>4.1.2</poi-ooxml.version>
<hutool.version>5.6.4</hutool.version>
<poi-ooxml.version>5.0.0</poi-ooxml.version>
<hutool.version>5.7.18</hutool.version>
<jjwt.version>0.9.1</jjwt.version>
<fastjson.version>1.2.76</fastjson.version>
<bean.query.version>1.1.5</bean.query.version>
@@ -34,19 +35,20 @@
<curator.version>4.3.0</curator.version>
<kafka.version>2.4.0</kafka.version>
<scala-library.version>2.12.10</scala-library.version>
<log4j2.version>2.17.0</log4j2.version>
<disruptor.version>3.4.3</disruptor.version>
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<micrometer.version>0.2.0</micrometer.version>
<!-- 数据库工具版本 -->
<druid.version>1.2.6</druid.version>
<mybatisplus.version>3.4.2</mybatisplus.version>
<pagehelper.version>1.3.0</pagehelper.version>
<redisson.version>3.15.4</redisson.version>
<qdox.version>2.0.0</qdox.version>
<knife4j.version>2.0.8</knife4j.version>
<springfox.version>2.10.5</springfox.version>
<zz-swagger.version>1.5.22</zz-swagger.version>
<ajcaptcha.version>1.3.0</ajcaptcha.version>
<!-- 数据库工具版本 -->
<druid.version>1.2.6</druid.version>
<mybatisplus.version>3.4.2</mybatisplus.version>
<pagehelper.version>1.3.0</pagehelper.version>
</properties>
<modules>
@@ -96,7 +98,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j-api</artifactId>
@@ -107,7 +109,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j-api</artifactId>
@@ -118,7 +120,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j-core</artifactId>
@@ -133,7 +135,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>
<!-- aop模块 -->
<dependency>
@@ -282,13 +284,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.spring.platform</groupId>
<artifactId>platform-bom</artifactId>
<version>${spring-platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>