Commit ea88210243c3f4f3c8842ed5b5b81c6256b529df
1 parent
95857ace
处理 pom 文件依赖冲突
Showing
1 changed file
with
16 additions
and
0 deletions
pom.xml
| @@ -100,6 +100,10 @@ | @@ -100,6 +100,10 @@ | ||
| 100 | <artifactId>mapstruct</artifactId> | 100 | <artifactId>mapstruct</artifactId> |
| 101 | <groupId>org.mapstruct</groupId> <!-- 避免冲突 --> | 101 | <groupId>org.mapstruct</groupId> <!-- 避免冲突 --> |
| 102 | </exclusion> | 102 | </exclusion> |
| 103 | + <exclusion> | ||
| 104 | + <artifactId>guava</artifactId> | ||
| 105 | + <groupId>com.google.guava</groupId> | ||
| 106 | + </exclusion> | ||
| 103 | </exclusions> | 107 | </exclusions> |
| 104 | </dependency> | 108 | </dependency> |
| 105 | 109 | ||
| @@ -144,6 +148,12 @@ | @@ -144,6 +148,12 @@ | ||
| 144 | <groupId>com.baomidou</groupId> | 148 | <groupId>com.baomidou</groupId> |
| 145 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | 149 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> |
| 146 | <version>${lock4j.version}</version> | 150 | <version>${lock4j.version}</version> |
| 151 | + <exclusions> | ||
| 152 | + <exclusion> | ||
| 153 | + <artifactId>redisson-spring-boot-starter</artifactId> | ||
| 154 | + <groupId>org.redisson</groupId> | ||
| 155 | + </exclusion> | ||
| 156 | + </exclusions> | ||
| 147 | </dependency> | 157 | </dependency> |
| 148 | 158 | ||
| 149 | <dependency> | 159 | <dependency> |
| @@ -175,6 +185,12 @@ | @@ -175,6 +185,12 @@ | ||
| 175 | <groupId>org.springframework.boot</groupId> | 185 | <groupId>org.springframework.boot</groupId> |
| 176 | <artifactId>spring-boot-starter-test</artifactId> | 186 | <artifactId>spring-boot-starter-test</artifactId> |
| 177 | <scope>test</scope> | 187 | <scope>test</scope> |
| 188 | + <exclusions> | ||
| 189 | + <exclusion> | ||
| 190 | + <artifactId>asm</artifactId> | ||
| 191 | + <groupId>org.ow2.asm</groupId> | ||
| 192 | + </exclusion> | ||
| 193 | + </exclusions> | ||
| 178 | </dependency> | 194 | </dependency> |
| 179 | 195 | ||
| 180 | <dependency> | 196 | <dependency> |