From a4fd30a85dd26b45dc55dd32f05a3c89173a3acb Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Wed, 8 Nov 2023 18:45:41 +0100
Subject: [PATCH 1/4] Addon discovery

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 distributions/openhab/pom.xml                | 1 +
 features/addons/src/main/feature/feature.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
index 9d8ad16063..55aacff368 100644
--- a/distributions/openhab/pom.xml
+++ b/distributions/openhab/pom.xml
@@ -170,6 +170,7 @@
                         <feature>system</feature>
                         <feature>openhab-runtime-base</feature>
                         <feature>openhab-runtime-ui</feature>
+                        <feature>openhab-addons-discovery</feature>
                     </bootFeatures>
                     <archiveZip>false</archiveZip>
                     <archiveTarGz>false</archiveTarGz>
diff --git a/features/addons/src/main/feature/feature.xml b/features/addons/src/main/feature/feature.xml
index 77a48aefe6..e2dee15bfc 100644
--- a/features/addons/src/main/feature/feature.xml
+++ b/features/addons/src/main/feature/feature.xml
@@ -9,4 +9,8 @@
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zwave/${project.version}</bundle>
     </feature>
 
+    <feature name="openhab-addons-discovery" description="Addons Discovery Information" version="${project.version}" install="true">
+        <configfile finalname="${openhab.userdata}/addons/openhab-addons.xml" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/4.1.0-SNAPSHOT/xml/addons</configfile>
+    </feature>
+
 </features>

From decd3a5d592cd756c04a2b915cf9257b9765375b Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Wed, 8 Nov 2023 21:08:39 +0100
Subject: [PATCH 2/4] fix

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../userdata/etc/org.apache.karaf.features.cfg                | 1 +
 features/addons/src/main/feature/feature.xml                  | 4 ----
 features/distro/src/main/feature/feature.xml                  | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

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 37e952d36f..eeb84e9a96 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,6 +44,7 @@ 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/addons/src/main/feature/feature.xml b/features/addons/src/main/feature/feature.xml
index e2dee15bfc..77a48aefe6 100644
--- a/features/addons/src/main/feature/feature.xml
+++ b/features/addons/src/main/feature/feature.xml
@@ -9,8 +9,4 @@
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zwave/${project.version}</bundle>
     </feature>
 
-    <feature name="openhab-addons-discovery" description="Addons Discovery Information" version="${project.version}" install="true">
-        <configfile finalname="${openhab.userdata}/addons/openhab-addons.xml" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/4.1.0-SNAPSHOT/xml/addons</configfile>
-    </feature>
-
 </features>
diff --git a/features/distro/src/main/feature/feature.xml b/features/distro/src/main/feature/feature.xml
index 6a45248623..5836219710 100644
--- a/features/distro/src/main/feature/feature.xml
+++ b/features/distro/src/main/feature/feature.xml
@@ -9,4 +9,8 @@
         <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="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/4.1.0-SNAPSHOT/xml/addons</configfile>
+    </feature>
+
 </features>

From 25efb362167337ed942b6474c2031b7b8387c347 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Thu, 9 Nov 2023 10:22:22 +0100
Subject: [PATCH 3/4] address review comments

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 features/distro/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/distro/src/main/feature/feature.xml b/features/distro/src/main/feature/feature.xml
index 5836219710..07c90584da 100644
--- a/features/distro/src/main/feature/feature.xml
+++ b/features/distro/src/main/feature/feature.xml
@@ -10,7 +10,7 @@
     </feature>
 
     <feature name="openhab-addon-discovery" description="Discovery Information" version="${project.version}">
-        <configfile finalname="${openhab.userdata}/addons/openhab-addons.xml" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/4.1.0-SNAPSHOT/xml/addons</configfile>
+        <configfile finalname="${openhab.userdata}/addons/openhab-addons.xml" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/xml/addons</configfile>
     </feature>
 
 </features>

From bf272a68a0f52a3474a069f4ed1e517b1b338ea6 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Thu, 9 Nov 2023 19:43:17 +0100
Subject: [PATCH 4/4] address review comment

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 distributions/openhab/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
index 55aacff368..a1357f6454 100644
--- a/distributions/openhab/pom.xml
+++ b/distributions/openhab/pom.xml
@@ -170,7 +170,7 @@
                         <feature>system</feature>
                         <feature>openhab-runtime-base</feature>
                         <feature>openhab-runtime-ui</feature>
-                        <feature>openhab-addons-discovery</feature>
+                        <feature>openhab-addon-discovery</feature>
                     </bootFeatures>
                     <archiveZip>false</archiveZip>
                     <archiveTarGz>false</archiveTarGz>