From e7e9f6b33432d8a312a6b8cf0164fa095492d0fa Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 10 四月 2024 13:58:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pom.xml | 46 ++++++++++++---------------------------------- 1 files changed, 12 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 99a7e90..31104c8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ </modules> <properties> + <spring-boot.version>3.0.6</spring-boot.version> <commons.io.version>2.13.0</commons.io.version> <bitwalker.version>1.21</bitwalker.version> <mybatis.spring.version>3.0.0</mybatis.spring.version> @@ -125,12 +126,6 @@ </dependencyManagement> <dependencies> - <!-- Activiti7 --> - <dependency> - <groupId>org.activiti</groupId> - <artifactId>activiti-spring-boot-starter</artifactId> - <version>7.0.0.GA</version> - </dependency> <!-- jpa --> <dependency> <groupId>org.springframework.boot</groupId> @@ -147,6 +142,10 @@ <version>${mybatis.spring.version}</version> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-mongodb</artifactId> + </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> @@ -249,50 +248,29 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.verison}</version> + <version>3.8.0</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> <encoding>${project.build.sourceEncoding}</encoding> <annotationProcessorPaths> + <!-- Lombok 娉ㄨВ澶勭悊鍣� --> <path> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>${lombok.version}</version> + <version>1.18.26</version> </path> - <path> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <version>${spring-boot.version}</version> - </path> - <path> - <groupId>io.github.linpeilie</groupId> - <artifactId>mapstruct-plus-processor</artifactId> - <version>${mapstruct-plus.version}</version> - </path> + <!-- MapStruct 鍜� Lombok 娉ㄨВ缁戝畾澶勭悊鍣� --> <path> <groupId>org.projectlombok</groupId> <artifactId>lombok-mapstruct-binding</artifactId> - <version>${mapstruct-plus.lombok.version}</version> + <version>0.2.0</version> </path> </annotationProcessorPaths> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> </configuration> - </plugin> - <!-- 鍗曞厓娴嬭瘯浣跨敤 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - <configuration> - <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 --> - <groups>${profiles.active}</groups> - <!-- 鎺掗櫎鏍囩 --> - <excludedGroups>exclude</excludedGroups> - </configuration> + </plugin> </plugins> + <finalName>${project.artifactId}</finalName> </build> </project> -- Gitblit v1.8.0