Package addons.xml with the distro instead of as an external feature (#1620)

* Package addons.xml with the distro instead of as an external feature

Signed-off-by: Kai Kreuzer <[email protected]>

Author: kaikreuzer

distributions/openhab/pom.xml

@@ -123,6 +123,16 @@
                             <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
                             <destFileName>upgradetool.jar</destFileName>
                         </artifactItem>
+                        <artifactItem>
+                            <groupId>org.openhab.addons.features.karaf</groupId>
+                            <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
+                            <version>${project.version}</version>
+                            <type>xml</type>
+                            <classifier>addons</classifier>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${project.build.directory}/assembly/runtime/etc</outputDirectory>
+                            <destFileName>addons.xml</destFileName>
+                        </artifactItem>
                     </artifactItems>
                 </configuration>
             </plugin>
@@ -170,7 +180,6 @@
                         <feature>system</feature>
                         <feature>openhab-runtime-base</feature>
                         <feature>openhab-runtime-ui</feature>
-                        <feature>openhab-addon-discovery</feature>
                     </bootFeatures>
                     <archiveZip>false</archiveZip>
                     <archiveTarGz>false</archiveTarGz>

distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg

@@ -44,7 +44,6 @@ featuresBoot = \
     jaas/${karaf.version}, \
     openhab-runtime-base, \
     openhab-runtime-ui, \
-    openhab-addon-discovery, \
     deployer/${karaf.version}, \
     diagnostic/${karaf.version}, \
     bundle/${karaf.version}, \

features/distro/src/main/feature/feature.xml

@@ -9,8 +9,4 @@
         <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.iconset.classic/${project.version}</bundle>
     </feature>
 
-    <feature name="openhab-addon-discovery" description="Discovery Information" version="${project.version}">
-        <configfile finalname="${openhab.userdata}/addons/openhab-addons.xml" override="true">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/xml/addons</configfile>
-    </feature>
-
 </features>

launch/app/app.bndrun

@@ -86,6 +86,7 @@ feature.openhab-model-runtime-all: \
 	org.apache.cxf.osgi.http.transport.disable=true,\
 	org.ops4j.pax.logging.DefaultServiceLog.level=ERROR,\
 	openhab.servicecfg=${.}/runtime/services.cfg,\
+	openhab.runtime=${.}/runtime/runtime,\
 	openhab.conf=${.}/runtime/conf,\
 	openhab.userdata=${.}/runtime/userdata,\
 	openhab.logdir=${.}/runtime/userdata/logs