diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index e22cefc46e1..c8217e265f5 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -74,49 +74,28 @@
mvn:org.openhab.core.bundles/org.openhab.core.auth.oauth2client/${project.version}
-
- openhab-core-base
- mvn:org.openhab.core.bundles/org.openhab.core.automation/${project.version}
-
-
openhab-core-base
- openhab-core-automation
mvn:org.openhab.core.bundles/org.openhab.core.automation.module.script/${project.version}
openhab-core-base
- openhab-core-automation
openhab-core-automation-module-script
mvn:org.openhab.core.bundles/org.openhab.core.automation.module.script.rulesupport/${project.version}
openhab-core-base
- openhab-core-automation
openhab-core-automation-module-script
mvn:org.openhab.core.bundles/org.openhab.core.automation.module.media/${project.version}
openhab-core-base
- openhab-core-automation
mvn:org.openhab.core.bundles/org.openhab.core.automation.rest/${project.version}
-
- openhab-core-base
- openhab-core-io-transport-serial
- mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}
-
-
-
- openhab-core-base
- mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}
- mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}
-
-
openhab-core-base
mvn:org.openhab.core.bundles/org.openhab.core.io.bin2json/${project.version}
@@ -222,15 +201,6 @@
mvn:org.openhab.core.bundles/org.openhab.core.io.transport.mqtt/${project.version}
-
- openhab-core-base
- osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortManager)"
- osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortProvider)"
- openhab-core-io-transport-serial-rxtx
-
- mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}
-
-
openhab-core-base
@@ -241,29 +211,6 @@
mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.javacomm/${project.version}
-
- openhab-core-base
-
- openhab.tp;filter:="(&(feature=serial)(impl=rxtx))"
- openhab.tp-serial-rxtx
-
- mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}
- mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}
-
-
-
- openhab-core-base
-
- openhab.tp;filter:="(&(feature=serial)(impl=rxtx))"
- openhab-core-io-transport-serial-rxtx
-
- openhab.tp;filter:="(feature=commons-net)"
- openhab.tp-commons-net
-
- mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}
- mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}
-
-
openhab-core-base
@@ -422,7 +369,6 @@
openhab-core-automation-rest
openhab-core-automation-module-script
openhab-core-automation-module-media
- openhab-core-automation
openhab-core-io-console-karaf
openhab-core-io-http-auth
openhab-core-io-rest-auth
@@ -494,9 +440,23 @@
- openhab-core-io-transport-serial-rfc2217
- openhab-core-config-serial
- openhab-core-config-discovery-usbserial
+ openhab-core-base
+
+ osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortManager)"
+ osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortProvider)"
+
+ openhab.tp;filter:="(feature=commons-net)"
+ openhab.tp-commons-net
+
+ openhab.tp;filter:="(&(feature=serial)(impl=rxtx))"
+ openhab.tp-serial-rxtx
+
+ mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}
+ mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}
+ mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}
+ mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}
+ mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}
+ mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}