OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify core features to prevent unnecessary bundle refreshes (#1709) 

It seems that when multiple features install the same bundle it may cause Karaf to refresh bundles when (un)installing features.
When the (redundant) openhab-core-automation feature is removed and the serial dependencies are merged into the openhab-transport-serial feature these restarts due these bundle refreshes no longer occur.

Fixes #1322, #1354

Signed-off-by: Wouter Born <github@maindrain.net>
pull/1711/head
Wouter Born 2020-10-10 18:24:13 +02:00 committed by GitHub
parent 159aefffa5
commit 76f51026aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,49 +74,28 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.auth.oauth2client/${project.version}</bundle>
</feature>
<feature name="openhab-core-automation" version="${project.version}">
<feature>openhab-core-base</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.automation/${project.version}</bundle>
</feature>
<feature name="openhab-core-automation-module-script" version="${project.version}">
<feature>openhab-core-base</feature>
<feature dependency="true">openhab-core-automation</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.automation.module.script/${project.version}</bundle>
</feature>
<feature name="openhab-core-automation-module-script-rulesupport" version="${project.version}">
<feature>openhab-core-base</feature>
<feature dependency="true">openhab-core-automation</feature>
<feature dependency="true">openhab-core-automation-module-script</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.automation.module.script.rulesupport/${project.version}</bundle>
</feature>
<feature name="openhab-core-automation-module-media" version="${project.version}">
<feature>openhab-core-base</feature>
<feature dependency="true">openhab-core-automation</feature>
<feature dependency="true">openhab-core-automation-module-script</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.automation.module.media/${project.version}</bundle>
</feature>
<feature name="openhab-core-automation-rest" version="${project.version}">
<feature>openhab-core-base</feature>
<feature dependency="true">openhab-core-automation</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.automation.rest/${project.version}</bundle>
</feature>
<feature name="openhab-core-config-serial" version="${project.version}">
<feature>openhab-core-base</feature>
<feature>openhab-core-io-transport-serial</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}</bundle>
</feature>
<feature name="openhab-core-config-discovery-usbserial" version="${project.version}">
<feature>openhab-core-base</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-bin2json" description="Binary to JSON converter" version="${project.version}">
<feature>openhab-core-base</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.bin2json/${project.version}</bundle>
@ -222,15 +201,6 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.mqtt/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-transport-serial" version="${project.version}">
<feature>openhab-core-base</feature>
<requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortManager)"</requirement>
<requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortProvider)"</requirement>
<feature dependency="true">openhab-core-io-transport-serial-rxtx</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-transport-serial-javacomm" version="${project.version}">
<feature>openhab-core-base</feature>
@ -241,29 +211,6 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.javacomm/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-transport-serial-rxtx" version="${project.version}">
<feature>openhab-core-base</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=serial)(impl=rxtx))"</requirement>
<feature dependency="true">openhab.tp-serial-rxtx</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-transport-serial-rfc2217" version="${project.version}">
<feature>openhab-core-base</feature>
<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>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}</bundle>
</feature>
<feature name="openhab-core-io-transport-upnp" version="${project.version}">
<feature>openhab-core-base</feature>
@ -422,7 +369,6 @@
<feature>openhab-core-automation-rest</feature>
<feature>openhab-core-automation-module-script</feature>
<feature>openhab-core-automation-module-media</feature>
<feature>openhab-core-automation</feature>
<feature>openhab-core-io-console-karaf</feature>
<feature>openhab-core-io-http-auth</feature>
<feature>openhab-core-io-rest-auth</feature>
@ -494,9 +440,23 @@
</feature>
<feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
<feature>openhab-core-io-transport-serial-rfc2217</feature>
<feature>openhab-core-config-serial</feature>
<feature>openhab-core-config-discovery-usbserial</feature>
<feature>openhab-core-base</feature>
<requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortManager)"</requirement>
<requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortProvider)"</requirement>
<requirement>openhab.tp;filter:="(feature=commons-net)"</requirement>
<feature dependency="true">openhab.tp-commons-net</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=serial)(impl=rxtx))"</requirement>
<feature dependency="true">openhab.tp-serial-rxtx</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}</bundle>
</feature>
<feature name="openhab-transport-upnp" description="UPnP Transport" version="${project.version}">