build: bump mapstruct version to 1.5.5.Final

arextest · Nov 24, 2023 · d673480 · d673480
1 parent d46b457
commit d673480
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 28 deletions.
diff --git a/arex-web-model/pom.xml b/arex-web-model/pom.xml
@@ -4,6 +4,10 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>arex-web-model</artifactId>
   <dependencies>
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct</artifactId>
+    </dependency>
     <dependency>
       <artifactId>arex-web-common</artifactId>
       <groupId>com.arextest</groupId>
@@ -22,14 +26,6 @@
       </exclusions>
       <groupId>com.arextest</groupId>
     </dependency>
-    <dependency>
-      <artifactId>mapstruct-jdk8</artifactId>
-      <groupId>org.mapstruct</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>mapstruct-processor</artifactId>
-      <groupId>org.mapstruct</groupId>
-    </dependency>
     <dependency>
       <artifactId>spring-boot-starter-data-mongodb</artifactId>
       <groupId>org.springframework.boot</groupId>
@@ -48,4 +44,4 @@
     <groupId>com.arextest</groupId>
     <version>0.6.0.9</version>
   </parent>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -17,10 +17,28 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
         <configuration>
-          <compilerArgument>-Xlint:deprecation</compilerArgument>
           <source>8</source>
           <target>8</target>
+          <compilerArgument>-Xlint:deprecation</compilerArgument>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.mapstruct</groupId>
+              <artifactId>mapstruct-processor</artifactId>
+              <version>${org.mapstruct.version}</version>
+            </path>
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok-mapstruct-binding</artifactId>
+              <version>${lombok-mapstruct-binding.version}</version>
+            </path>
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+              <version>${lombok.version}</version>
+            </path>
+            </annotationProcessorPaths>
         </configuration>
         <groupId>org.apache.maven.plugins</groupId>
       </plugin>
@@ -47,6 +65,24 @@
   </dependencies>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <artifactId>lombok</artifactId>
+        <groupId>org.projectlombok</groupId>
+        <version>${lombok.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <!--If you are using Lombok 1.18.16 or newer
+ you also need to add lombok-mapstruct-binding in order to make Lombok and MapStruct work together.-->
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok-mapstruct-binding</artifactId>
+        <version>${lombok-mapstruct-binding.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct</artifactId>
+        <version>${org.mapstruct.version}</version>
+      </dependency>
       <!--project file-->
       <dependency>
         <artifactId>arex-web-model</artifactId>
@@ -98,28 +134,13 @@
         <type>pom</type>
         <version>${spring.boot.version}</version>
       </dependency>
-      <dependency>
-        <artifactId>lombok</artifactId>
-        <groupId>org.projectlombok</groupId>
-        <version>${lombok.version}</version>
-      </dependency>
       <!-- mock -->
       <dependency>
         <artifactId>jmockit</artifactId>
         <groupId>org.jmockit</groupId>
         <scope>test</scope>
         <version>${jmockit.version}</version>
       </dependency>
-      <dependency>
-        <artifactId>mapstruct-jdk8</artifactId>
-        <groupId>org.mapstruct</groupId>
-        <version>${mapstruct.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>mapstruct-processor</artifactId>
-        <groupId>org.mapstruct</groupId>
-        <version>${mapstruct.version}</version>
-      </dependency>
       <dependency>
         <artifactId>gson</artifactId>
         <groupId>com.google.code.gson</groupId>
@@ -360,14 +381,16 @@
     <javax.mail-api.version>1.6.2</javax.mail-api.version>
     <jmockit.version>1.37</jmockit.version>
     <junit.version>4.12</junit.version>
-    <lombok.version>1.18.6</lombok.version>
-    <mapstruct.version>1.2.0.Final</mapstruct.version>
+    <lombok.version>1.18.22</lombok.version>
+    <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
+    <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <shedlock-spring.version>4.34.0</shedlock-spring.version>
     <shema.inferer.version>0.1.4</shema.inferer.version>
     <snakeyaml.version>1.29</snakeyaml.version>
     <spring.boot.version>2.6.3</spring.boot.version>
     <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
   </properties>
 
   <repositories>
@@ -387,4 +410,4 @@
   <url>https://github.com/arextest/arex-report</url>
 
   <version>0.6.0.9</version>
-</project>
+</project>