From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a20aef..5aa18da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,8 @@
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.23</fastjson.version>
+ <!-- Lombok 1.18.22 is incompatible with JDK 21+ (JCTree$JCImport.qualid removed) -->
+ <lombok.version>1.18.36</lombok.version>
<oshi.version>6.4.0</oshi.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
@@ -31,6 +33,10 @@
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
+ <jws.version>1.1</jws.version>
+ <jaxws.version>2.3.1</jaxws.version>
+ <jaxb.impl.version>2.3.0</jaxb.impl.version>
+ <javassist.version>3.28.0-GA</javassist.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -46,6 +52,44 @@
<scope>import</scope>
</dependency>
+ <!-- 瑕嗙洊 Spring Boot BOM 涓殑 Lombok 鐗堟湰锛屽吋瀹� JDK 21+ -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+
+ <!-- JDK 11+ 宸茬Щ闄� Java EE 妯″潡锛屾樉寮忕鐞� JAX-WS/JWS API 鐗堟湰 -->
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ <version>${jws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ </dependency>
+
+ <!-- 缁熶竴 JAXB 鐗堟湰锛岄伩鍏� CXF 3.1.6 寮曞叆鍦� JDK 9+ 涓� POM 闈炴硶鐨� 2.2.11 -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+
+ <!-- 缁熶竴 Javassist 鐗堟湰锛�3.20.0-GA 鐨� tools.jar systemPath 鍦� JDK 9+ 涓嬩細瀵艰嚧 POM 鏃犳晥 -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
<!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
--
Gitblit v1.9.3