From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index b75161a..4c92a4d 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>
@@ -145,15 +144,15 @@
</dependency>
- <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
+ <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-inte</artifactId>
<version>${igds.version}</version>
- </dependency>
+ </dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-fzzy3</artifactId>
@@ -168,9 +167,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </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銆佸埗姘満
@@ -209,6 +208,23 @@
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</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>-->
+
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-es</artifactId>
<version>${igds.version}</version>
<exclusions>
<exclusion>
@@ -254,9 +270,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency> -->
+ </dependency>-->
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -271,7 +287,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
</dependencies>
<dependencyManagement>
--
Gitblit v1.9.3