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

Signed-off-by: Kai Kreuzer <kai@openhab.org>

diff --git a/features/openhab-addons-external/pom.xml b/features/openhab-addons-external/pom.xml
index 88a49a40f8ab368d7e40854a8e250d99c767c626..efc68cb9cd2a2b75ddc5aa75311009f1f591c146 100644 (file)
--- a/features/openhab-addons-external/pom.xml
+++ b/features/openhab-addons-external/pom.xml
@@ -10,7 +10,7 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.openhab.addons.features.karaf.openhab-addons-external3</artifactId>
+  <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
   <packaging>pom</packaging>
 
   <name>openHAB Add-ons :: Features :: Karaf :: Add-ons External</name>

diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml
index e15661905f1fea27de2950b20411b7db3bcec74b..563af490bc65b3f6da74058d25c9fac2b51d84b5 100644 (file)
--- a/features/openhab-addons/pom.xml
+++ b/features/openhab-addons/pom.xml
@@ -10,7 +10,7 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.openhab.addons.features.karaf.openhab-addons3</artifactId>
+  <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId>
   <packaging>feature</packaging>
 
   <name>openHAB Add-ons :: Features :: Karaf :: Add-ons</name>
@@ -19,7 +19,7 @@
   <dependencies>
     <dependency>
       <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>
       <type>pom</type>
       <scope>provided</scope>
@@ -46,6 +46,9 @@
                   <header file="src/main/resources/header.xml" filtering="no"/>
                   <fileset dir="${basedirRoot}/bundles">
                     <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>
                   <filterchain>
                     <linecontainsRegExp>
@@ -67,6 +70,9 @@
             <id>karaf-feature-verification</id>
             <configuration>
               <features>
+                <feature>openhab-binding-bluetooth</feature>
+                <feature>openhab-binding-modbus</feature>
+                <feature>openhab-binding-mqtt</feature>
               </features>
             </configuration>
           </execution>

diff --git a/features/openhab-addons/src/main/resources/footer.xml b/features/openhab-addons/src/main/resources/footer.xml
index a32328a54c40ab2fce9d71bcff744f0a0d5aef94..6144078874a993e3937014fdcc2f35da770ab805 100644 (file)
--- a/features/openhab-addons/src/main/resources/footer.xml
+++ b/features/openhab-addons/src/main/resources/footer.xml
@@ -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>