|
@@ -108,31 +108,21 @@
|
|
|
</exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
-<!-- <dependency>-->
|
|
|
-<!-- <groupId>org.openscada.jinterop</groupId>-->
|
|
|
-<!-- <artifactId>org.openscada.jinterop.core</artifactId>-->
|
|
|
-<!-- <version>2.1.8</version>-->
|
|
|
-<!-- </dependency>-->
|
|
|
<dependency>
|
|
|
- <groupId>org.jinterop</groupId>
|
|
|
- <artifactId>j-interop</artifactId>
|
|
|
- <version>3.0.0</version>
|
|
|
+ <groupId>org.openscada.jinterop</groupId>
|
|
|
+ <artifactId>org.openscada.jinterop.core</artifactId>
|
|
|
+ <version>2.1.8</version>
|
|
|
</dependency>
|
|
|
-<!-- <dependency>-->
|
|
|
-<!-- <groupId>org.openscada.jinterop</groupId>-->
|
|
|
-<!-- <artifactId>org.openscada.jinterop.deps</artifactId>-->
|
|
|
-<!-- <version>1.5.0</version>-->
|
|
|
-<!-- <exclusions>-->
|
|
|
-<!-- <exclusion>-->
|
|
|
-<!-- <groupId>org.bouncycastle</groupId>-->
|
|
|
-<!-- <artifactId>bcprov-jdk15on</artifactId>-->
|
|
|
-<!-- </exclusion>-->
|
|
|
-<!-- </exclusions>-->
|
|
|
-<!-- </dependency>-->
|
|
|
<dependency>
|
|
|
- <groupId>org.jinterop</groupId>
|
|
|
- <artifactId>j-interopdeps</artifactId>
|
|
|
- <version>3.0.0</version>
|
|
|
+ <groupId>org.openscada.jinterop</groupId>
|
|
|
+ <artifactId>org.openscada.jinterop.deps</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>
|
|
@@ -166,11 +156,11 @@
|
|
|
<artifactId>sdk-client</artifactId>
|
|
|
<version>0.6.3</version>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>org.bouncycastle</groupId>
|
|
|
- <artifactId>bcpkix-jdk15on</artifactId>
|
|
|
- <version>1.57</version>
|
|
|
- </dependency>
|
|
|
+<!-- <dependency>-->
|
|
|
+<!-- <groupId>org.bouncycastle</groupId>-->
|
|
|
+<!-- <artifactId>bcpkix-jdk15on</artifactId>-->
|
|
|
+<!-- <version>1.57</version>-->
|
|
|
+<!-- </dependency>-->
|
|
|
<!--Milo服务端的依赖-->
|
|
|
<dependency>
|
|
|
<groupId>org.eclipse.milo</groupId>
|