From f95d05316d49bcdd31d022a11d0fc4fbafb040da Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期一, 08 九月 2025 11:40:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pom.xml | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 060cc41..5715852 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ <log4j2.version>2.17.0</log4j2.version> <logback.version>1.2.9</logback.version> <!-- webservice --> - <cxf.version>3.2.4</cxf.version> + <cxf.version>3.5.2</cxf.version> </properties> <repositories> @@ -227,21 +227,11 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web-services</artifactId> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-spring-boot-starter-jaxws</artifactId> - <version>${cxf.version}</version> - </dependency> <!-- CXF webservice --> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-spring-boot-starter-jaxws</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> </dependency> @@ -268,6 +258,10 @@ <exclusion> <artifactId>commons-beanutils</artifactId> <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <groupId>net.sf.saxon</groupId> + <artifactId>Saxon-HE</artifactId> </exclusion> </exclusions> </dependency> @@ -527,11 +521,11 @@ <version>0.8</version> </dependency> <!--xml瑙f瀽鍖咃細濡傛灉椤圭洰涓凡鏈夛紝寮曡捣鍐茬獊锛屽彲娉ㄩ噴--> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.12.0</version> - </dependency> +<!-- <dependency>--> +<!-- <groupId>xerces</groupId>--> +<!-- <artifactId>xercesImpl</artifactId>--> +<!-- <version>2.12.0</version>--> +<!-- </dependency>--> <!--寮曞叆sap渚濊禆--> <dependency> -- Gitblit v1.9.3