From 9ccd0bc5786cbb1bca2c9fda28f0cd730126656d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 13 三月 2024 09:21:38 +0800
Subject: [PATCH] 合并
---
pom.xml | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index ac7f7f8..c45efd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,11 @@
<module>ycl-common</module>
<module>ycl-server</module>
<module>ycl-pojo</module>
+ <module>ycl-generator</module>
</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>
@@ -38,12 +40,15 @@
<jaxb-api.version>2.3.1</jaxb-api.version>
<poi.version>4.1.2</poi.version>
<hutool.version>5.8.22</hutool.version>
+ <oshi.version>6.4.0</oshi.version>
<kaptcha.version>2.3.3</kaptcha.version>
<easyexcel.version>3.3.2</easyexcel.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<spring-boot.version>3.0.6</spring-boot.version>
<mapstruct-plus.version>1.3.5</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
+ <velocity.version>2.3</velocity.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
<!-- 鎻掍欢鐗堟湰 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
@@ -74,18 +79,35 @@
</profiles>
<dependencyManagement>
<dependencies>
+ <!-- 鑾峰彇绯荤粺淇℃伅 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>${oshi.version}</version>
+ </dependency>
<!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
-
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
<!-- io甯哥敤宸ュ叿绫� -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
+ </dependency>
+ <!-- collections宸ュ叿绫� -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
<dependency>
@@ -155,6 +177,12 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsqlparser</artifactId>
+ <groupId>com.github.jsqlparser</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -219,53 +247,33 @@
<build>
<plugins>
+
<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>
\ No newline at end of file
+</project>
--
Gitblit v1.8.0