Commit 1d7bacb6c0dc72881752a78fe8ac0762efb627c6

Authored by hccake
Committed by Hccake
1 parent 4e5430b5

:zap: 添加 lombok-mapstruct-bind,避免高版本的不兼容问题

Showing 1 changed file with 17 additions and 15 deletions
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
40 <skywalking.version>8.3.0</skywalking.version> 40 <skywalking.version>8.3.0</skywalking.version>
41 <spring-boot-admin.version>2.3.1</spring-boot-admin.version> 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 <hutool.version>5.5.6</hutool.version> 45 <hutool.version>5.5.6</hutool.version>
46 <easyexcel.verion>2.2.7</easyexcel.verion> 46 <easyexcel.verion>2.2.7</easyexcel.verion>
47 <velocity.version>2.2</velocity.version> 47 <velocity.version>2.2</velocity.version>
@@ -227,18 +227,32 @@ @@ -227,18 +227,32 @@
227 <dependency> 227 <dependency>
228 <groupId>org.projectlombok</groupId> 228 <groupId>org.projectlombok</groupId>
229 <artifactId>lombok</artifactId> 229 <artifactId>lombok</artifactId>
230 - <version>${lombok.version}</version> 230 + <optional>true</optional>
231 </dependency> 231 </dependency>
232 232
233 <dependency> 233 <dependency>
234 <groupId>org.mapstruct</groupId> 234 <groupId>org.mapstruct</groupId>
235 <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> 235 <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
236 <version>${mapstruct.version}</version> 236 <version>${mapstruct.version}</version>
  237 + <optional>true</optional>
  238 + </dependency>
  239 + <dependency>
  240 + <groupId>org.mapstruct</groupId>
  241 + <artifactId>mapstruct-processor</artifactId>
  242 + <version>${mapstruct.version}</version>
  243 + <optional>true</optional>
237 </dependency> 244 </dependency>
238 <dependency> 245 <dependency>
239 <groupId>org.mapstruct</groupId> 246 <groupId>org.mapstruct</groupId>
240 <artifactId>mapstruct-jdk8</artifactId> 247 <artifactId>mapstruct-jdk8</artifactId>
241 <version>${mapstruct.version}</version> 248 <version>${mapstruct.version}</version>
  249 + <optional>true</optional>
  250 + </dependency>
  251 + <dependency>
  252 + <groupId>org.projectlombok</groupId>
  253 + <artifactId>lombok-mapstruct-binding</artifactId>
  254 + <version>${lombok-mapstruct-binding.version}</version>
  255 + <optional>true</optional>
242 </dependency> 256 </dependency>
243 257
244 <dependency> 258 <dependency>
@@ -317,18 +331,6 @@ @@ -317,18 +331,6 @@
317 <configuration> 331 <configuration>
318 <source>${java.version}</source> <!-- or higher, depending on your project --> 332 <source>${java.version}</source> <!-- or higher, depending on your project -->
319 <target>${java.version}</target> <!-- or higher, depending on your project --> 333 <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 </configuration> 334 </configuration>
333 </plugin> 335 </plugin>
334 </plugins> 336 </plugins>