From 05725de52e4f2ab93887baf5844f9a2fded9a78a Mon Sep 17 00:00:00 2001
From: Matthew Skinner <matt@pcmus.com>
Date: Sat, 2 Mar 2024 20:58:18 +1100
Subject: [PATCH] Bump net.java.dev.jna lib to version 5.14.0 (#16460)

* Update net.java.dev.jna lib version

Signed-off-by: Matthew Skinner <matt@pcmus.com>
---
 bundles/org.openhab.binding.amazondashbutton/pom.xml |  8 ++++++--
 bundles/org.openhab.binding.doorbird/pom.xml         |  2 +-
 .../src/main/feature/feature.xml                     |  2 +-
 bundles/org.openhab.binding.systeminfo/pom.xml       | 12 +++++++++++-
 bundles/org.openhab.binding.tellstick/pom.xml        |  2 +-
 .../src/main/feature/feature.xml                     |  4 ++--
 bundles/org.openhab.voice.voskstt/pom.xml            |  2 +-
 pom.xml                                              |  1 +
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.amazondashbutton/pom.xml b/bundles/org.openhab.binding.amazondashbutton/pom.xml
index 84264f8f5e..4e5d760472 100644
--- a/bundles/org.openhab.binding.amazondashbutton/pom.xml
+++ b/bundles/org.openhab.binding.amazondashbutton/pom.xml
@@ -16,16 +16,20 @@
 
   <properties>
     <bnd.importpackage>!org.slf4j.impl.*</bnd.importpackage>
-    <dep.noembedding>jna</dep.noembedding>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.4.0</version>
+      <version>${jna.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.pcap4j</groupId>
       <artifactId>pcap4j-core</artifactId>
diff --git a/bundles/org.openhab.binding.doorbird/pom.xml b/bundles/org.openhab.binding.doorbird/pom.xml
index 907eb09390..5c29f2bac9 100644
--- a/bundles/org.openhab.binding.doorbird/pom.xml
+++ b/bundles/org.openhab.binding.doorbird/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.5.0</version>
+      <version>${jna.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml b/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
index 29692187f3..1b6c01eb17 100644
--- a/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
 
 	<feature name="openhab-binding-doorbird" description="Doorbird Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
-		<bundle dependency="true">mvn:net.java.dev.jna/jna/5.5.0</bundle>
+		<bundle dependency="true">mvn:net.java.dev.jna/jna/${jna.version}</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.doorbird/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.systeminfo/pom.xml b/bundles/org.openhab.binding.systeminfo/pom.xml
index 6f5d911f14..7103d5163a 100644
--- a/bundles/org.openhab.binding.systeminfo/pom.xml
+++ b/bundles/org.openhab.binding.systeminfo/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>com.github.oshi</groupId>
       <artifactId>oshi-core</artifactId>
-      <version>6.4.8</version>
+      <version>6.4.12</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -27,6 +27,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/bundles/org.openhab.binding.tellstick/pom.xml b/bundles/org.openhab.binding.tellstick/pom.xml
index ede155c6fa..c0cc11816c 100644
--- a/bundles/org.openhab.binding.tellstick/pom.xml
+++ b/bundles/org.openhab.binding.tellstick/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>4.5.2</version>
+      <version>${jna.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
index ff22da8f15..f825a1c3bb 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
@@ -6,8 +6,8 @@
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-serial</feature>
 		<feature dependency="true">openhab.tp-netty</feature>
-		<bundle dependency="true">mvn:net.java.dev.jna/jna/4.5.2</bundle>
-		<bundle dependency="true">mvn:net.java.dev.jna/jna-platform/4.5.2</bundle>
+		<bundle dependency="true">mvn:net.java.dev.jna/jna/${jna.version}</bundle>
+		<bundle dependency="true">mvn:net.java.dev.jna/jna-platform/${jna.version}</bundle>
 		<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_3</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.tellstick/${project.version}</bundle>
 	</feature>
diff --git a/bundles/org.openhab.voice.voskstt/pom.xml b/bundles/org.openhab.voice.voskstt/pom.xml
index 607a437c25..79e8ee696d 100644
--- a/bundles/org.openhab.voice.voskstt/pom.xml
+++ b/bundles/org.openhab.voice.voskstt/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.13.0</version>
+      <version>${jna.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e127681679..975a28f4ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.16.0</jackson.version>
+    <jna.version>5.14.0</jna.version>
     <karaf.version>4.4.4</karaf.version>
     <netty.version>4.1.104.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
-- 
2.47.3