From: Kai Kreuzer <kai@openhab.org>
Date: Fri, 2 Oct 2020 22:16:10 +0000 (+0200)
Subject: exclude netatmo binding from aggregated feature (#8638)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=d1de8a2ed637b012701dcc7486a697012c3ab549;p=openhab-addons.git

exclude netatmo binding from aggregated feature (#8638)

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

diff --git a/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml b/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml
deleted file mode 100644
index fb52bfe4e9..0000000000
--- a/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<features name="org.openhab.binding.netatmo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
-	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
-
-	<feature name="openhab-binding-netatmo" description="Netatmo Binding" version="${project.version}">
-		<feature>openhab-runtime-base</feature>
-		<bundle dependency="true">mvn:org.openhab.osgiify/org.json.json/20131018</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.okhttp.okhttp/2.3.0</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.okio.okio-1.3.0/1.3.0</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.retrofit.retrofit/1.9.0</bundle>
-		<bundle dependency="true">mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.client/1.0.0</bundle>
-		<bundle dependency="true">mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.common/1.0.0</bundle>
-		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.netatmo/${project.version}</bundle>
-	</feature>
-</features>
diff --git a/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml.bak.xml b/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml.bak.xml
new file mode 100644
index 0000000000..fb52bfe4e9
--- /dev/null
+++ b/bundles/org.openhab.binding.netatmo/src/main/feature/feature.xml.bak.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="org.openhab.binding.netatmo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
+
+	<feature name="openhab-binding-netatmo" description="Netatmo Binding" version="${project.version}">
+		<feature>openhab-runtime-base</feature>
+		<bundle dependency="true">mvn:org.openhab.osgiify/org.json.json/20131018</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.okhttp.okhttp/2.3.0</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.okio.okio-1.3.0/1.3.0</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/com.squareup.retrofit.retrofit/1.9.0</bundle>
+		<bundle dependency="true">mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.client/1.0.0</bundle>
+		<bundle dependency="true">mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.common/1.0.0</bundle>
+		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.netatmo/${project.version}</bundle>
+	</feature>
+</features>
diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml
index 4f5e096bf3..563af490bc 100644
--- a/features/openhab-addons/pom.xml
+++ b/features/openhab-addons/pom.xml
@@ -49,9 +49,6 @@
                     <exclude name="**/org.openhab.binding.bluetooth*/**/feature.xml"/>
                     <exclude name="**/org.openhab.binding.modbus*/**/feature.xml"/>
                     <exclude name="**/org.openhab.binding.mqtt*/**/feature.xml"/>
-
-                    <!-- temporarily exclude add-ons, which are still excluded from the build -->
-                    <exclude name="**/org.openhab.binding.netatmo/**/feature.xml"/>
                   </fileset>
                   <filterchain>
                     <linecontainsRegExp>