Add POM and feature dependencies for commons-net (#9940)

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.dscalarm/pom.xml b/bundles/org.openhab.binding.dscalarm/pom.xml
index adac6395fca0e4a87bea7061ab348529ab88cb37..f6ec0db7984049895bd77f15de1a09265d947e2f 100644 (file)
--- 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 a74ec240468554552a52ac29bc150429b411f773..d5094908344ce6a7ceb218bb1e52e1ac37e007b1 100644 (file)
--- 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 067b74ceafda3c4555b2c3e34c0a1f8a8634a5dc..6dbe2ac4f2cd091ef341f238d60da44965b416c9 100644 (file)
--- 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 590e55ec49264677ae3dd1c45653852ca28004a2..4ba3b2f0de5d713cfa2e5f049ae2ab84b536dac2 100644 (file)
--- 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 ccb0442d7e708acb565172c558c46aa4f9772d50..2475eada5bf2df6f629089ba155d2ee53fee6e30 100644 (file)
--- 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 90136688c33b02ddf9a85414be73ecb0a7f5e709..9823a825b8d71b2896a591ab3bc94f3def1bd0f7 100644 (file)
--- 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 edf8f601b6aec66e216f4d7d4e70c2c9b55efe8a..a3213baf96df5e487e49456eed5ec84bd1a49f4a 100644 (file)
--- 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 62e9bfbe231c00a8dd811df33014e471c0a17899..980f9fb2b3fa9ade25ecdf6b22550eeea4b2a01f 100644 (file)
--- 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 cfe8e3ce4c98ee3c81b93a66c2ddf4b50a3d2ca3..10c32b0b9739514028ec94bd8d03745a98272a5d 100644 (file)
--- 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 6a890ed68d3d0678525275b90dff2c4c35a0b361..82dfebb723055cc31e500ff087fe4c3c455a28ff 100644 (file)
--- 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 88ec1b45d7b2305b5f8c99621f47adcf83b556bb..3f924449301a32eb9d1a51cabd5903d3b1cf5300 100644 (file)
--- 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 a136346df02f9736c088b8f29d14fc50a8d4526e..103986503a8292ed0e19116222bde2f30381503f 100644 (file)
--- 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 01b0205a35303187bcda02d8b23ae28567ef48b8..4a62ecf8542f9ad9c1d5abdd5d7638dec1addf22 100644 (file)
--- 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 ce87a8ae545650c0583fe75a7dcfcc9a3bda2550..8a95db1e09a13690eaeede0d8474463ccfa5d13a 100644 (file)
--- 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 2aaac93398328ea7df104b041ce826a9fdf75110..0f0b5f7db555df2b855f88035f3961d72081ca2b 100644 (file)
--- 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 69fd73abb07d3faa163e056e5f27f1f73cd94845..6554fd4b0599a19db4d7c3ec0ddcfeb7ab8a0173 100644 (file)
--- 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 15145b5edaa3a8139afd34915f45cf6dd7d7cd43..cd92e97b40e897c919b03f8112b407b0d5e3508b 100644 (file)
--- 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 50b5cb3274d2d3462774cb1e837c15b9d11c1a01..19480a8eea26c9ce7994c52c97ec2b83c126e6d0 100644 (file)
--- 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 395aa637f29cdcedd0682a1019fb1675a9555aeb..e4756aefb3e57a4cbcb70c2a56327a9391ece9f9 100644 (file)
--- 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 f32286f8cdfccd46ccaffe544703afff46d5ef05..5b0f7c1cb6d41575db1d71fe8117f244607edc14 100644 (file)
--- 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 31162401c07d9cfa2e2514efcb77aea488a928f5..45978b8d474ae98df283fdfbbcfdf16031bfea79 100644 (file)
--- 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 5aac7b0963bd2f9efc06accfb508214b1ce2ca98..79efb9c54e682364dbcc3a79b062ea856deef8a8 100644 (file)
--- 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 8fc62c1e3936940bf3c87bdc4aef6fb99ae8bab2..318f5dae10d3c646f81957173549adf65f338592 100644 (file)
--- 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>