From f926cd8080157976e843c129f8990e51a1cd71c9 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Mon, 25 Jan 2021 13:45:12 +0100
Subject: [PATCH] Add POM and feature dependencies for commons-net (#9940)

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bundles/org.openhab.binding.dscalarm/pom.xml       | 13 +++++++++++++
 bundles/org.openhab.binding.heos/pom.xml           | 13 +++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.kaleidescape/pom.xml   | 13 +++++++++++++
 bundles/org.openhab.binding.lutron/pom.xml         | 13 +++++++++++++
 bundles/org.openhab.binding.magentatv/pom.xml      | 13 +++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.network/pom.xml        |  2 +-
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.ntp/pom.xml            | 13 +++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.opensprinkler/pom.xml  | 14 ++++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.pjlinkdevice/pom.xml   | 14 ++++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.plclogo/pom.xml        | 10 ++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.russound/pom.xml       | 13 +++++++++++++
 .../src/main/feature/feature.xml                   |  1 +
 bundles/org.openhab.binding.zway/pom.xml           |  8 +++++++-
 .../src/main/feature/feature.xml                   |  1 +
 bundles/pom.xml                                    |  6 ++++++
 pom.xml                                            |  5 +++--
 23 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.dscalarm/pom.xml b/bundles/org.openhab.binding.dscalarm/pom.xml
index adac6395fca..f6ec0db7984 100644
--- a/bundles/org.openhab.binding.dscalarm/pom.xml
+++ b/bundles/org.openhab.binding.dscalarm/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: DSCAlarm Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.heos/pom.xml b/bundles/org.openhab.binding.heos/pom.xml
index a74ec240468..d5094908344 100644
--- a/bundles/org.openhab.binding.heos/pom.xml
+++ b/bundles/org.openhab.binding.heos/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: HEOS Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.heos/src/main/feature/feature.xml b/bundles/org.openhab.binding.heos/src/main/feature/feature.xml
index 067b74ceafd..6dbe2ac4f2c 100644
--- a/bundles/org.openhab.binding.heos/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.heos/src/main/feature/feature.xml
@@ -5,6 +5,7 @@
 	<feature name="openhab-binding-heos" description="HEOS Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-upnp</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.heos/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.kaleidescape/pom.xml b/bundles/org.openhab.binding.kaleidescape/pom.xml
index 590e55ec492..4ba3b2f0de5 100644
--- a/bundles/org.openhab.binding.kaleidescape/pom.xml
+++ b/bundles/org.openhab.binding.kaleidescape/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: Kaleidescape Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.lutron/pom.xml b/bundles/org.openhab.binding.lutron/pom.xml
index ccb0442d7e7..2475eada5bf 100644
--- a/bundles/org.openhab.binding.lutron/pom.xml
+++ b/bundles/org.openhab.binding.lutron/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: Lutron Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.magentatv/pom.xml b/bundles/org.openhab.binding.magentatv/pom.xml
index 90136688c33..9823a825b8d 100644
--- a/bundles/org.openhab.binding.magentatv/pom.xml
+++ b/bundles/org.openhab.binding.magentatv/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: MagentaTV Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.magentatv/src/main/feature/feature.xml b/bundles/org.openhab.binding.magentatv/src/main/feature/feature.xml
index edf8f601b6a..a3213baf96d 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.magentatv/src/main/feature/feature.xml
@@ -6,6 +6,7 @@
 	<feature name="openhab-binding-magentatv" description="MagentaTV Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-upnp</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.magentatv/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.network/pom.xml b/bundles/org.openhab.binding.network/pom.xml
index 62e9bfbe231..980f9fb2b3f 100644
--- a/bundles/org.openhab.binding.network/pom.xml
+++ b/bundles/org.openhab.binding.network/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.7.2</version>
+      <version>${commons.net.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.binding.network/src/main/feature/feature.xml b/bundles/org.openhab.binding.network/src/main/feature/feature.xml
index cfe8e3ce4c9..10c32b0b973 100644
--- a/bundles/org.openhab.binding.network/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.network/src/main/feature/feature.xml
@@ -5,6 +5,7 @@
 	<feature name="openhab-binding-network" description="Network Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-core-model-script</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.network/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.ntp/pom.xml b/bundles/org.openhab.binding.ntp/pom.xml
index 6a890ed68d3..82dfebb7230 100644
--- a/bundles/org.openhab.binding.ntp/pom.xml
+++ b/bundles/org.openhab.binding.ntp/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: NTP Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.ntp/src/main/feature/feature.xml b/bundles/org.openhab.binding.ntp/src/main/feature/feature.xml
index 88ec1b45d7b..3f924449301 100644
--- a/bundles/org.openhab.binding.ntp/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.ntp/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-ntp" description="NTP Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.ntp/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.opensprinkler/pom.xml b/bundles/org.openhab.binding.opensprinkler/pom.xml
index a136346df02..103986503a8 100644
--- a/bundles/org.openhab.binding.opensprinkler/pom.xml
+++ b/bundles/org.openhab.binding.opensprinkler/pom.xml
@@ -13,4 +13,18 @@
   <artifactId>org.openhab.binding.opensprinkler</artifactId>
 
   <name>openHAB Add-ons :: Bundles :: OpenSprinkler Binding</name>
+
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/feature/feature.xml b/bundles/org.openhab.binding.opensprinkler/src/main/feature/feature.xml
index 01b0205a353..4a62ecf8542 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-opensprinkler" description="OpenSprinkler Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.opensprinkler/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.pjlinkdevice/pom.xml b/bundles/org.openhab.binding.pjlinkdevice/pom.xml
index ce87a8ae545..8a95db1e09a 100644
--- a/bundles/org.openhab.binding.pjlinkdevice/pom.xml
+++ b/bundles/org.openhab.binding.pjlinkdevice/pom.xml
@@ -13,4 +13,18 @@
   <artifactId>org.openhab.binding.pjlinkdevice</artifactId>
 
   <name>openHAB Add-ons :: Bundles :: PJLink Binding</name>
+
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.pjlinkdevice/src/main/feature/feature.xml b/bundles/org.openhab.binding.pjlinkdevice/src/main/feature/feature.xml
index 2aaac933983..0f0b5f7db55 100644
--- a/bundles/org.openhab.binding.pjlinkdevice/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.pjlinkdevice/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-pjlinkdevice" description="PJLinkDevice Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.pjlinkdevice/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.plclogo/pom.xml b/bundles/org.openhab.binding.plclogo/pom.xml
index 69fd73abb07..6554fd4b059 100644
--- a/bundles/org.openhab.binding.plclogo/pom.xml
+++ b/bundles/org.openhab.binding.plclogo/pom.xml
@@ -14,7 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: PLCLogo Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.openhab.binding.plclogo</groupId>
       <artifactId>Moka7</artifactId>
diff --git a/bundles/org.openhab.binding.plclogo/src/main/feature/feature.xml b/bundles/org.openhab.binding.plclogo/src/main/feature/feature.xml
index 15145b5edaa..cd92e97b40e 100644
--- a/bundles/org.openhab.binding.plclogo/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.plclogo/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-plclogo" description="PLCLogo Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.plclogo/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.russound/pom.xml b/bundles/org.openhab.binding.russound/pom.xml
index 50b5cb3274d..19480a8eea2 100644
--- a/bundles/org.openhab.binding.russound/pom.xml
+++ b/bundles/org.openhab.binding.russound/pom.xml
@@ -14,4 +14,17 @@
 
   <name>openHAB Add-ons :: Bundles :: Russound Binding</name>
 
+  <properties>
+    <dep.noembedding>commons-net</dep.noembedding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundles/org.openhab.binding.russound/src/main/feature/feature.xml b/bundles/org.openhab.binding.russound/src/main/feature/feature.xml
index 395aa637f29..e4756aefb3e 100644
--- a/bundles/org.openhab.binding.russound/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.russound/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-russound" description="Russound Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.russound/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/bundles/org.openhab.binding.zway/pom.xml b/bundles/org.openhab.binding.zway/pom.xml
index f32286f8cdf..5b0f7c1cb6d 100644
--- a/bundles/org.openhab.binding.zway/pom.xml
+++ b/bundles/org.openhab.binding.zway/pom.xml
@@ -15,10 +15,16 @@
   <name>openHAB Add-ons :: Bundles :: ZWay Binding</name>
 
   <properties>
-    <dep.noembedding>commons-lang3</dep.noembedding>
+    <dep.noembedding>commons-lang3,commons-net</dep.noembedding>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/bundles/org.openhab.binding.zway/src/main/feature/feature.xml b/bundles/org.openhab.binding.zway/src/main/feature/feature.xml
index 31162401c07..45978b8d474 100644
--- a/bundles/org.openhab.binding.zway/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.zway/src/main/feature/feature.xml
@@ -4,6 +4,7 @@
 
 	<feature name="openhab-binding-zway" description="Z-Way Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
+		<feature dependency="true">openhab.tp-commons-net</feature>
 		<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zway/${project.version}</bundle>
 	</feature>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 5aac7b0963b..79efb9c54e6 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -366,6 +366,12 @@
       <artifactId>org.openhab.core.bom.openhab-core</artifactId>
       <type>pom</type>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-net</groupId>
+          <artifactId>commons-net</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bom</groupId>
diff --git a/pom.xml b/pom.xml
index 8fc62c1e393..318f5dae10d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,9 +70,12 @@
 
     <ohc.version>3.1.0-SNAPSHOT</ohc.version>
     <bnd.version>5.2.0</bnd.version>
+    <commons.net.version>3.7.2</commons.net.version>
+    <eea.version>2.2.1</eea.version>
     <karaf.version>4.2.7</karaf.version>
     <sat.version>0.10.0</sat.version>
     <slf4j.version>1.7.21</slf4j.version>
+    <spotless.version>2.0.3</spotless.version>
 
     <bnd.importpackage/>
     <bnd.exportpackage/>
@@ -80,8 +83,6 @@
     <bnd.includeresource>-${.}/NOTICE, -${.}/*.xsd</bnd.includeresource>
 
     <feature.directory>src/main/feature/feature.xml</feature.directory>
-    <spotless.version>2.0.3</spotless.version>
-    <eea.version>2.2.1</eea.version>
   </properties>
 
   <dependencyManagement>