From 150f843a38604ba9db622dff6a3104cea3d11e57 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Wed, 20 Dec 2023 21:59:26 +0100
Subject: [PATCH 1/3] Package addons.xml with the distro instead of as an
 external feature

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 distributions/openhab/pom.xml                         | 11 ++++++++++-
 .../userdata/etc/org.apache.karaf.features.cfg        |  1 -
 features/distro/src/main/feature/feature.xml          |  4 ----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
index a1357f6454..9f2105e4cf 100644
--- a/distributions/openhab/pom.xml
+++ b/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/userdata/addons</outputDirectory>
+                            <destFileName>openhab-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>
diff --git a/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg b/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg
index eeb84e9a96..37e952d36f 100644
--- a/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg
+++ b/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}, \
diff --git a/features/distro/src/main/feature/feature.xml b/features/distro/src/main/feature/feature.xml
index ac78d6568e..6a45248623 100644
--- a/features/distro/src/main/feature/feature.xml
+++ b/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>

From 10cfbd1c6ea33daffaeab3c9293f7538b0d4b199 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Wed, 20 Dec 2023 23:10:31 +0100
Subject: [PATCH 2/3] Move file to runtime/etc folder

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 distributions/openhab/pom.xml | 4 ++--
 launch/app/app.bndrun         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
index 9f2105e4cf..9711dba1cb 100644
--- a/distributions/openhab/pom.xml
+++ b/distributions/openhab/pom.xml
@@ -130,8 +130,8 @@
                             <type>xml</type>
                             <classifier>addons</classifier>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${project.build.directory}/assembly/userdata/addons</outputDirectory>
-                            <destFileName>openhab-addons.xml</destFileName>
+                            <outputDirectory>${project.build.directory}/assembly/runtime/etc</outputDirectory>
+                            <destFileName>addons.xml</destFileName>
                         </artifactItem>
                     </artifactItems>
                 </configuration>
diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
index 27a1414179..ffa7883e6d 100644
--- a/launch/app/app.bndrun
+++ b/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

From 77f972efb39fd62d036fc06d72f9c7f54c0ee170 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Wed, 20 Dec 2023 23:55:25 +0100
Subject: [PATCH 3/3] Update app.bndrun

---
 launch/app/app.bndrun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
index ffa7883e6d..1d68dbc0a1 100644
--- a/launch/app/app.bndrun
+++ b/launch/app/app.bndrun
@@ -86,7 +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.runtime=${.}/runtime/runtime,\
 	openhab.conf=${.}/runtime/conf,\
 	openhab.userdata=${.}/runtime/userdata,\
 	openhab.logdir=${.}/runtime/userdata/logs