Commit efde1280e3b8ef0a9ebfa1d367ccc18baeb22bef
1 parent
4e5430b5
添加 lombok-mapstruct-bind,避免高版本的不兼容问题
Showing
1 changed file
with
11 additions
and
15 deletions
pom.xml
| ... | ... | @@ -40,8 +40,8 @@ |
| 40 | 40 | <skywalking.version>8.3.0</skywalking.version> |
| 41 | 41 | <spring-boot-admin.version>2.3.1</spring-boot-admin.version> |
| 42 | 42 | <!-- 工具类相关 --> |
| 43 | - <lombok.version>1.16.14</lombok.version> | |
| 44 | - <mapstruct.version>1.4.1.Final</mapstruct.version> | |
| 43 | + <mapstruct.version>1.4.2.Final</mapstruct.version> | |
| 44 | + <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> | |
| 45 | 45 | <hutool.version>5.5.6</hutool.version> |
| 46 | 46 | <easyexcel.verion>2.2.7</easyexcel.verion> |
| 47 | 47 | <velocity.version>2.2</velocity.version> |
| ... | ... | @@ -227,18 +227,26 @@ |
| 227 | 227 | <dependency> |
| 228 | 228 | <groupId>org.projectlombok</groupId> |
| 229 | 229 | <artifactId>lombok</artifactId> |
| 230 | - <version>${lombok.version}</version> | |
| 230 | + <optional>true</optional> | |
| 231 | 231 | </dependency> |
| 232 | 232 | |
| 233 | 233 | <dependency> |
| 234 | 234 | <groupId>org.mapstruct</groupId> |
| 235 | 235 | <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> |
| 236 | 236 | <version>${mapstruct.version}</version> |
| 237 | + <optional>true</optional> | |
| 237 | 238 | </dependency> |
| 238 | 239 | <dependency> |
| 239 | 240 | <groupId>org.mapstruct</groupId> |
| 240 | 241 | <artifactId>mapstruct-jdk8</artifactId> |
| 241 | 242 | <version>${mapstruct.version}</version> |
| 243 | + <optional>true</optional> | |
| 244 | + </dependency> | |
| 245 | + <dependency> | |
| 246 | + <groupId>org.projectlombok</groupId> | |
| 247 | + <artifactId>lombok-mapstruct-binding</artifactId> | |
| 248 | + <version>${lombok-mapstruct-binding.version}</version> | |
| 249 | + <optional>true</optional> | |
| 242 | 250 | </dependency> |
| 243 | 251 | |
| 244 | 252 | <dependency> |
| ... | ... | @@ -317,18 +325,6 @@ |
| 317 | 325 | <configuration> |
| 318 | 326 | <source>${java.version}</source> <!-- or higher, depending on your project --> |
| 319 | 327 | <target>${java.version}</target> <!-- or higher, depending on your project --> |
| 320 | - <annotationProcessorPaths> | |
| 321 | - <path> | |
| 322 | - <groupId>org.mapstruct</groupId> | |
| 323 | - <artifactId>mapstruct-processor</artifactId> | |
| 324 | - <version>${mapstruct.version}</version> | |
| 325 | - </path> | |
| 326 | - <path> | |
| 327 | - <groupId>org.projectlombok</groupId> | |
| 328 | - <artifactId>lombok</artifactId> | |
| 329 | - <version>${lombok.version}</version> | |
| 330 | - </path> | |
| 331 | - </annotationProcessorPaths> | |
| 332 | 328 | </configuration> |
| 333 | 329 | </plugin> |
| 334 | 330 | </plugins> | ... | ... |