From d2c7db63db7e655a4141cec09d3aa6343beea00f Mon Sep 17 00:00:00 2001
From: Markus Rathgeb <maggu2810@gmail.com>
Date: Mon, 29 Apr 2019 19:11:32 +0200
Subject: [PATCH] use upstream nrjavaserial 3.15.0 on runtime (#761)

* add nrjavaserial without liblockdev
* use only one feature for a nrjavaserial implementation

Fixes: https://github.com/openhab/openhab-core/issues/750

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
---
 bom/runtime/pom.xml                                      | 2 +-
 features/karaf/openhab-core/pom.xml                      | 1 -
 features/karaf/openhab-core/src/main/feature/feature.xml | 2 --
 features/karaf/openhab-tp/src/main/feature/feature.xml   | 7 ++++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 3631b1fa673..5073c629966 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -446,7 +446,7 @@
     <dependency>
       <groupId>com.neuronrobotics</groupId>
       <artifactId>nrjavaserial</artifactId>
-      <version>3.14.0</version>
+      <version>3.15.0</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml
index 9bf05a741a3..49ebf26d8fb 100644
--- a/features/karaf/openhab-core/pom.xml
+++ b/features/karaf/openhab-core/pom.xml
@@ -17,7 +17,6 @@
   <properties>
     <jetty.version>9.4.12.v20180830</jetty.version>
     <jna.version>4.5.2</jna.version>
-    <nrjavaserial.version>3.15.0.OH2</nrjavaserial.version>
   </properties>
 
   <build>
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index 65213a1e9f2..a9fa374c12b 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -345,7 +345,6 @@
     <requirement>openhab.tp;filter:="(&amp;(feature=serial)(impl=rxtx))"</requirement>
     <feature dependency="true">openhab-core-io-transport-serial-rxtx</feature>
 
-
     <requirement>openhab.tp;filter:="(feature=commons-net)"</requirement>
     <feature dependency="true">openhab.tp-commons-net</feature>
 
@@ -609,7 +608,6 @@
   </feature>
 
   <feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
-    <bundle>mvn:org.openhab/nrjavaserial/${nrjavaserial.version}</bundle>
     <feature>openhab-core-io-transport-serial-rfc2217</feature>
     <feature>openhab-core-config-serial</feature>
     <feature>openhab-core-config-discovery-usbserial</feature>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 8f44eb58de9..97135a421cc 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -154,7 +154,12 @@
 
   <feature name="openhab.tp-serial-rxtx" version="${project.version}">
     <capability>openhab.tp;feature=serial;impl=rxtx</capability>
-    <bundle>mvn:com.neuronrobotics/nrjavaserial/3.14.0</bundle>
+    
+    <!-- Use "no liblockdev" version -->
+    <!-- See: https://github.com/openhab/openhab-core/pull/761 -->
+    <!-- See: https://github.com/openhab/openhab-core/issues/750 -->
+    <!-- <bundle>mvn:com.neuronrobotics/nrjavaserial/3.15.0</bundle> -->
+    <bundle>mvn:org.openhab/nrjavaserial/3.15.0.OH2</bundle>
   </feature>
 
   <feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">