From a28ca3f36d0ace05966a8c0fac1e4b5fe921f882 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 30 十月 2024 16:25:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/pom.xml | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/pom.xml b/iailab-module-data/iailab-module-data-biz/pom.xml
index 9f95a2d..d44daff 100644
--- a/iailab-module-data/iailab-module-data-biz/pom.xml
+++ b/iailab-module-data/iailab-module-data-biz/pom.xml
@@ -81,10 +81,6 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-monitor</artifactId>
</dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-biz-data-permission</artifactId>
- </dependency>
<dependency>
<groupId>com.auth0</groupId>
@@ -139,6 +135,12 @@
<groupId>org.openscada.jinterop</groupId>
<artifactId>org.openscada.jinterop.core</artifactId>
<version>2.1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.jinterop</groupId>
@@ -155,16 +157,28 @@
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.dcom</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.lib</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.61</version>
+ <version>1.70</version>
</dependency>
<!-- ModBus TCP -->
@@ -198,6 +212,23 @@
<version>6.8.0</version>
</dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.hikvision</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.hikvision</groupId>
+ <artifactId>jna</artifactId>
+ <version>1.0</version>
+ </dependency>
+
</dependencies>
<build>
--
Gitblit v1.9.3