正在显示
1 个修改的文件
包含
39 行增加
和
4 行删除
| @@ -18,8 +18,6 @@ | @@ -18,8 +18,6 @@ | ||
| 18 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | 18 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
| 19 | <java.version>1.8</java.version> | 19 | <java.version>1.8</java.version> |
| 20 | <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> | 20 | <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> |
| 21 | - <spring-framework.version>5.3.39</spring-framework.version> | ||
| 22 | - <spring-security.version>5.7.12</spring-security.version> | ||
| 23 | <druid.version>1.2.23</druid.version> | 21 | <druid.version>1.2.23</druid.version> |
| 24 | <bitwalker.version>1.21</bitwalker.version> | 22 | <bitwalker.version>1.21</bitwalker.version> |
| 25 | <swagger.version>3.0.0</swagger.version> | 23 | <swagger.version>3.0.0</swagger.version> |
| @@ -31,13 +29,18 @@ | @@ -31,13 +29,18 @@ | ||
| 31 | <poi.version>4.1.2</poi.version> | 29 | <poi.version>4.1.2</poi.version> |
| 32 | <velocity.version>2.3</velocity.version> | 30 | <velocity.version>2.3</velocity.version> |
| 33 | <jwt.version>0.9.1</jwt.version> | 31 | <jwt.version>0.9.1</jwt.version> |
| 32 | + <!-- override dependency version --> | ||
| 33 | + <tomcat.version>9.0.96</tomcat.version> | ||
| 34 | + <logback.version>1.2.13</logback.version> | ||
| 35 | + <spring-security.version>5.7.12</spring-security.version> | ||
| 36 | + <spring-framework.version>5.3.39</spring-framework.version> | ||
| 34 | </properties> | 37 | </properties> |
| 35 | 38 | ||
| 36 | <!-- 依赖声明 --> | 39 | <!-- 依赖声明 --> |
| 37 | <dependencyManagement> | 40 | <dependencyManagement> |
| 38 | <dependencies> | 41 | <dependencies> |
| 39 | 42 | ||
| 40 | - <!-- SpringFramework的依赖配置--> | 43 | + <!-- 覆盖SpringFramework的依赖配置--> |
| 41 | <dependency> | 44 | <dependency> |
| 42 | <groupId>org.springframework</groupId> | 45 | <groupId>org.springframework</groupId> |
| 43 | <artifactId>spring-framework-bom</artifactId> | 46 | <artifactId>spring-framework-bom</artifactId> |
| @@ -46,7 +49,7 @@ | @@ -46,7 +49,7 @@ | ||
| 46 | <scope>import</scope> | 49 | <scope>import</scope> |
| 47 | </dependency> | 50 | </dependency> |
| 48 | 51 | ||
| 49 | - <!-- SpringSecurity的依赖配置--> | 52 | + <!-- 覆盖SpringSecurity的依赖配置--> |
| 50 | <dependency> | 53 | <dependency> |
| 51 | <groupId>org.springframework.security</groupId> | 54 | <groupId>org.springframework.security</groupId> |
| 52 | <artifactId>spring-security-bom</artifactId> | 55 | <artifactId>spring-security-bom</artifactId> |
| @@ -64,6 +67,38 @@ | @@ -64,6 +67,38 @@ | ||
| 64 | <scope>import</scope> | 67 | <scope>import</scope> |
| 65 | </dependency> | 68 | </dependency> |
| 66 | 69 | ||
| 70 | + <!-- 覆盖logback的依赖配置--> | ||
| 71 | + <dependency> | ||
| 72 | + <groupId>ch.qos.logback</groupId> | ||
| 73 | + <artifactId>logback-core</artifactId> | ||
| 74 | + <version>${logback.version}</version> | ||
| 75 | + </dependency> | ||
| 76 | + | ||
| 77 | + <dependency> | ||
| 78 | + <groupId>ch.qos.logback</groupId> | ||
| 79 | + <artifactId>logback-classic</artifactId> | ||
| 80 | + <version>${logback.version}</version> | ||
| 81 | + </dependency> | ||
| 82 | + | ||
| 83 | + <!-- 覆盖tomcat的依赖配置--> | ||
| 84 | + <dependency> | ||
| 85 | + <groupId>org.apache.tomcat.embed</groupId> | ||
| 86 | + <artifactId>tomcat-embed-core</artifactId> | ||
| 87 | + <version>${tomcat.version}</version> | ||
| 88 | + </dependency> | ||
| 89 | + | ||
| 90 | + <dependency> | ||
| 91 | + <groupId>org.apache.tomcat.embed</groupId> | ||
| 92 | + <artifactId>tomcat-embed-el</artifactId> | ||
| 93 | + <version>${tomcat.version}</version> | ||
| 94 | + </dependency> | ||
| 95 | + | ||
| 96 | + <dependency> | ||
| 97 | + <groupId>org.apache.tomcat.embed</groupId> | ||
| 98 | + <artifactId>tomcat-embed-websocket</artifactId> | ||
| 99 | + <version>${tomcat.version}</version> | ||
| 100 | + </dependency> | ||
| 101 | + | ||
| 67 | <!-- 阿里数据库连接池 --> | 102 | <!-- 阿里数据库连接池 --> |
| 68 | <dependency> | 103 | <dependency> |
| 69 | <groupId>com.alibaba</groupId> | 104 | <groupId>com.alibaba</groupId> |
-
请 注册 或 登录 后发表评论