纸管库和套管工位驱动编写

acs/nladmin-system/pom.xml

@@ -40,11 +40,11 @@
             <artifactId>jansi</artifactId>
             <version>1.9</version>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.50</version>
-        </dependency>-->
+        </dependency>
         <!--导出CSV相关-->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -90,6 +90,12 @@
             <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>com.squareup.okhttp3</groupId>