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

reintroduced aggregated features and restored the standard feature name (#8532) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/8539/head
Kai Kreuzer 2020-09-21 23:32:41 +02:00 committed by GitHub
parent 0c11a21d90
commit 2e4b1beb7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/openhab-addons-external/pom.xml
View File

@ -10,7 +10,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.addons.features.karaf.openhab-addons-external3</artifactId> <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>openHAB Add-ons :: Features :: Karaf :: Add-ons External</name> <name>openHAB Add-ons :: Features :: Karaf :: Add-ons External</name>

10
features/openhab-addons/pom.xml
View File

@ -10,7 +10,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.addons.features.karaf.openhab-addons3</artifactId> <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId>
<packaging>feature</packaging> <packaging>feature</packaging>
<name>openHAB Add-ons :: Features :: Karaf :: Add-ons</name> <name>openHAB Add-ons :: Features :: Karaf :: Add-ons</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>org.openhab.addons.features.karaf.openhab-addons-external3</artifactId> <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
<scope>provided</scope> <scope>provided</scope>
@ -46,6 +46,9 @@
<header file="src/main/resources/header.xml" filtering="no"/> <header file="src/main/resources/header.xml" filtering="no"/>
<fileset dir="${basedirRoot}/bundles"> <fileset dir="${basedirRoot}/bundles">
<include name="*/src/main/feature/feature.xml"/> <include name="*/src/main/feature/feature.xml"/>
<exclude name="**/org.openhab.binding.bluetooth*/**/feature.xml"/>
<exclude name="**/org.openhab.binding.modbus*/**/feature.xml"/>
<exclude name="**/org.openhab.binding.mqtt*/**/feature.xml"/>
</fileset> </fileset>
<filterchain> <filterchain>
<linecontainsRegExp> <linecontainsRegExp>
@ -67,6 +70,9 @@
<id>karaf-feature-verification</id> <id>karaf-feature-verification</id>
<configuration> <configuration>
<features> <features>
<feature>openhab-binding-bluetooth</feature>
<feature>openhab-binding-modbus</feature>
<feature>openhab-binding-mqtt</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

28
features/openhab-addons/src/main/resources/footer.xml
View File

@ -1,2 +1,30 @@
<!-- aggregated features -->
<feature name="openhab-binding-bluetooth" description="Bluetooth Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-serial</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.airthings/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.am43/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.blukii/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.ruuvitag/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.bluez/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.bluegiga/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.daikinmadoka/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.bluetooth.roaming/${project.version}</bundle>
</feature>
<feature name="openhab-binding-mqtt" description="MQTT Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-mqtt</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version}</bundle>
<bundle start-level="81">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.generic/${project.version}</bundle>
<bundle start-level="82">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.homeassistant/${project.version}</bundle>
<bundle start-level="82">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.homie/${project.version}</bundle>
</feature>
<feature name="openhab-binding-modbus" description="Modbus Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-modbus</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.sunspec/${project.version}</bundle>
</feature>
</features> </features>