From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index b75161a..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -10,7 +10,6 @@
<groupId>com.ld.igds</groupId>
<artifactId>igds-parent-pom</artifactId>
<version>4.0.0-RELEASE</version>
- <relativePath>../igds-parent-pom/pom.xml</relativePath>
</parent>
<dependencies>
@@ -170,7 +169,7 @@
</exclusions>
</dependency>
- <!-- MODBUS-TCP -->
+ <!-- MODBUS-TCP
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-modbus</artifactId>
@@ -185,7 +184,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
@@ -205,7 +204,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -220,9 +219,26 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚-->
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-es</artifactId>
+ <version>${igds.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -237,7 +253,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
@@ -254,7 +270,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency> -->
+ </dependency>-->
<!-- 娴峰悍杞︾墝璇嗗埆-SDK
<dependency>
--
Gitblit v1.9.3