瀏覽代碼

jna版本冲突

yingp 6 年之前
父節點
當前提交
66814c08cf
共有 3 個文件被更改,包括 10 次插入1 次删除
  1. 0 1
      applications/device/device-sdk-dahua/pom.xml
  2. 4 0
      applications/device/device-server/pom.xml
  3. 6 0
      pom.xml

+ 0 - 1
applications/device/device-sdk-dahua/pom.xml

@@ -16,7 +16,6 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.usoftchina.smartschool</groupId>

+ 4 - 0
applications/device/device-server/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>device-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.usoftchina.smartschool</groupId>
             <artifactId>device-sdk-dahua</artifactId>

+ 6 - 0
pom.xml

@@ -56,6 +56,7 @@
         <http.request.version>6.0</http.request.version>
         <commons.lang3.version>3.6</commons.lang3.version>
         <json.lib.version>2.4</json.lib.version>
+        <jna.version>5.2.0</jna.version>
     </properties>
 
     <repositories>
@@ -352,6 +353,11 @@
                 <version>${json.lib.version}</version>
                 <classifier>jdk15</classifier>
             </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>