use upstream nrjavaserial 3.15.0 on runtime (#761)

* add nrjavaserial without liblockdev * use only one feature for a nrjavaserial implementation Fixes: #750 Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
openhab · Apr 29, 2019 · d2c7db6 · d2c7db6
1 parent 76387f2
commit d2c7db6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}">