From 9e4fb13fec8bf2732f4567e7e72eeb9fd94c840c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 29 九月 2024 16:31:22 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
pom.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 37802ff..5598480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.hx.gitee</groupId>
<artifactId>hx-parent</artifactId>
- <version>stander</version>
+ <version>jiayan</version>
<packaging>pom</packaging>
<parent>
@@ -16,6 +16,11 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
+ <modules>
+ <module>hx_common</module>
+ <module>hx_auto</module>
+ <module>hx-redisson</module>
+ </modules>
<!-- 渚濊禆鐗堟湰缁熶竴绠＄悊 -->
<properties>
@@ -389,6 +394,12 @@
<groupId>com.fadada.api</groupId>
<artifactId>fasc-openapi-java-sdk</artifactId>
<version>${fadada.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -512,6 +523,41 @@
<version>1.3.0</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itext-asian</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ <version>2.6.2</version>
+ <!--鎺掗櫎浣跨敤logback鏃ュ織-->
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</dependencyManagement>
--
Gitblit v1.8.0