demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

use upstream nrjavaserial 3.15.0 on runtime (#761)

Browse Source 
* 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>
This commit is contained in:
Markus Rathgeb 2019-04-29 19:11:32 +02:00 committed by Kai Kreuzer
parent 76387f2b79
commit d2c7db63db
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bom/runtime/pom.xml
View File

@ -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>

1
features/karaf/openhab-core/pom.xml
View File

@ -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>

2
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -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>

7
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -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}">