From 01681454d6675f0ea3fc1c1c095e65821d2481da Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Fri, 3 May 2019 09:09:28 +0200 Subject: [PATCH] remove manual set capabilities in Karaf features (#788) As we moved away from the manifest first approach the manifests are generated by Bnd and contain the capabilities already. So, there is no need anymore to maintain it in the Karaf features manually. Signed-off-by: Markus Rathgeb --- .../openhab-core/src/main/feature/feature.xml | 115 ------------------ 1 file changed, 115 deletions(-) diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index a9fa374c1..7a17fba10 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -35,129 +35,29 @@ openhab.tp-httpclient mvn:org.openhab.core.bundles/org.openhab.core.config.core/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.config.core.ConfigDescriptionRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService - - - osgi.service;objectClass=org.eclipse.smarthome.config.core.status.ConfigStatusService - - mvn:org.openhab.core.bundles/org.openhab.core.config.discovery/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.config.discovery.inbox.Inbox - - mvn:org.openhab.core.bundles/org.openhab.core.config.dispatch/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.config.xml/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.core.binding.BindingInfoRegistry - - - osgi.service;objectClass:List<String>=org.eclipse.smarthome.core.events.EventPublisher;event.topics:String=smarthome - - - - osgi.service;objectClass:List<String>="org.eclipse.smarthome.core.i18n.LocaleProvider,org.eclipse.smarthome.core.i18n.LocationProvider,org.eclipse.smarthome.core.i18n.TimeZoneProvider,org.eclipse.smarthome.core.i18n.TranslationProvider" - - - osgi.service;objectClass=org.eclipse.smarthome.core.items.ItemFactory - - - osgi.service;objectClass=org.eclipse.smarthome.core.items.ItemRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.core.items.ManagedItemProvider - - openhab-core-storage-mapdb - mvn:org.openhab.core.bundles/org.openhab.core.binding.xml/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.id/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.persistence/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry - - mvn:org.openhab.core.bundles/org.openhab.core.semantics/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.core.semantics.TagService - - mvn:org.openhab.core.bundles/org.openhab.core.scheduler/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.thing/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.ManagedThingProvider - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.ThingRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.i18n.ThingTypeI18nLocalizationService - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.link.ThingLinkManager - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry - - - osgi.service;objectClass=org.eclipse.smarthome.core.thing.type.ThingTypeRegistry - - mvn:org.openhab.core.bundles/org.openhab.core.thing.xml/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.transform/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.audio/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.core.audio.AudioHTTPServer - - mvn:org.openhab.core.bundles/org.openhab.core.voice/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.console/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.monitor/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.io.net/${project.version} - pax-http-whiteboard - mvn:org.openhab.core.bundles/org.openhab.core.io.http/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.rest/${project.version} - - osgi.service;objectClass:List<String>=org.eclipse.smarthome.io.rest.LocaleService - - mvn:org.openhab.core.bundles/org.openhab.core.io.rest.optimize/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.io.rest.core/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.io.rest.core.config.ConfigurationService - - mvn:org.openhab.core.bundles/org.openhab.core.io.rest.sse/${project.version} @@ -174,9 +74,6 @@ openhab-core-base mvn:org.openhab.core.bundles/org.openhab.core.automation/${project.version} - - osgi.service;objectClass=org.openhab.core.automation.RuleRegistry - @@ -293,9 +190,6 @@ mvn:org.openhab.core.bundles/org.openhab.core.io.transport.mdns/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.mdns/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.io.transport.mdns.MDNSService - @@ -305,9 +199,6 @@ openhab.tp-paho mvn:org.openhab.core.bundles/org.openhab.core.io.transport.mqtt/${project.version} - - osgi.service;objectClass=org.eclipse.smarthome.io.transport.mqtt.MqttService - @@ -486,9 +377,6 @@ openhab-core-base mvn:org.openhab.core.bundles/org.openhab.core.storage.mapdb/${project.version} - - osgi.service;objectClass:List<String>="org.eclipse.smarthome.core.storage.StorageService,org.eclipse.smarthome.core.storage.DeletableStorageService";storage.format:String="mapdb" - openhab.tp;filter:="(feature=mapdb)" openhab.tp-mapdb @@ -498,9 +386,6 @@ openhab-core-base mvn:org.openhab.core.bundles/org.openhab.core.storage.json/${project.version} - - osgi.service;objectClass:List<String>="org.eclipse.smarthome.core.storage.StorageService";storage.format:String="json" -