Merge "use (infrautils') Executors in SwitchConnectionProviderImpl"

diff --git a/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPUtil.java b/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPUtil.java
index 869e92618c531589603f4a504781403369a6fd55..28b4268c1e16e5f087eb813c4bfe447a048c2777 100644 (file)
--- a/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPUtil.java
+++ b/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPUtil.java
@@ -5,15 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.applications.lldpspeaker;
 
 import static org.opendaylight.openflowplugin.applications.topology.lldp.utils.LLDPDiscoveryUtils.getValueForLLDPPacketIntegrityEnsuring;
 
+import com.google.common.base.Strings;
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
 import javax.annotation.Nonnull;
-import org.apache.commons.lang3.StringUtils;
 import org.opendaylight.openflowplugin.libraries.liblldp.EtherTypes;
 import org.opendaylight.openflowplugin.libraries.liblldp.Ethernet;
 import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
@@ -119,6 +118,6 @@ public final class LLDPUtil {
     }
 
     private static String bigIntegerToPaddedHex(final BigInteger dataPathId) {
-        return StringUtils.leftPad(dataPathId.toString(16), 16, "0");
+        return Strings.padStart(dataPathId.toString(16), 16, '0');
     }
 }

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 78eac87b65e72e54e513e28a20d697de44c88cb1..4ea5f564802eea9a7392db544a752037b161293b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.2</version>
+    <version>4.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index af4367830d77e25f9cfc73fa19ed4be17ce9a4a3..c8f477fa8bca74d27cfee0a85cbb296d6bee7323 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>4.0.2</version>
+    <version>4.0.5</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index b0067fd36d49658be64a064dd08dee763e10931d..388725f411211eb572ad3dc49ff730b8b8e7f9ac 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index 42fd7a0325bdcd3b38ba2a7becc7dd5a5659b826..4939c98b7312fdc28f1747c92bff11004f89bb17 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index 8ded3667084a3a4ff7a18d570461ffa85f60449c..dac669b0d617279b96c50e1912150691447ae31c 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index 7957825f3445ef3326bce03eee173832537fc975..1cbb4be061dea837b89ab06f1135298625814c30 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index b8c9dde45085ec9ffd71171fbe37ab9b803b3e35..06f8849c9b5797c7d08c5481025c434d1da8172b 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
index d553ee062fcfff7a5c2428fa297779c23158ce1c..01edd97ecdf7e1e3b65c5e5e41f719a0c6439b69 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index 0bd6bdd357a92755b0cd8751e5e4932205bb5a86..037f53de1a26e16d77971f2adcd4e0c18ee95353 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index 9a6369e92a753429bbca396f3e585963d42077c3..5e3f1bf1b5f089c31d1526e3257a4bdcd68752a6 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index 92d14fcc717d264c8eb5491b9997bb57a9f5d187..d0987e2c39e0169c021cebddfabe94b7ac00e8ec 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index 97d6fd45b3ea1259604be8d02f8a3b578ee1b343..e723c3b76843a7f15aae8c04406f4ca89fb7a43f 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
index 782440e2ba824293027e7c139a1605806a418dee..027d5d00659150065666a54e938c7e6fab103d4d 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
index ae79eca340890acdc53a8de6dfba2f0948af6bde..4dc38efa2cfd3a0697b90998e5444d9771793437 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
index ec65f66ce7dfce8bd0d51b5d65ca20ea7e354187..7395775d1b2712a763dfc5583e75653eae9f0821 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.2</version>
+    <version>4.0.5</version>
     <relativePath/>
 </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
index ddd56e564cbc890cf4958f908252cae7eb26763e..e740de5f191fa17f91fb367524017865c2d17fa5 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index fb0d043ad1344fde40b8bd09849ee4ca82d3cda3..d06d874bf0bc88b84c6ad4a143c27af048b1620a 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
index 551bff49a79fee317ff89c081a6f8bc02a61b215..5d0e7cb674c18dbfc5f051654978410274df43e9 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
index 962d494cadbd77892ee724b72a7aa43881721ba0..f294ddae1ad3aea5cc0e9c47703ebeb80b03ba18 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index e5262b148c0e35a7753156af5265598d148f47ac..3e2787d97e1295be805c97545e4e106c82c2b00a 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 422b223ac0f82a13fc46b27ae97f3cec53dfbb44..91f1370ef97265c656d6b3c1b88b4a3d011f17a0 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index 731f4ae9b0be2613e20df9dc4cf08dc0ac4b6283..628c5fc465218e4f6ef2de66af17cab9d1b8d3a6 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index 2cd84f0c5a3fdfffe93475397df95973cd0f86d2..ae6ce47696f5bd94bc48862995a95d884189fe0e 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml
index 0a42c4c2816ec64a2aae8440443b4fc48802865f..32c5bcc4b81f3c648e67bef30b9145a006a54acf 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/pom.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 42111ac741ef10aa8750651f0c94f9c822d042e3..cfc2c20c8224b3544411c72f81fc082126c903b0 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.2</version>
+                <version>3.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 38e01972178148042d66e68187c8f8ba32990f87..a725f494425f5ba8892d6b9427f2539d70cd46fb 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index 0cddbc15c60c3c4cd94d5da626d354905a437ed5..d5856182829ce673a52d9b15c1f0f3e875f6641d 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index ea452269d0637d1973132d49785c2b95a2ee36f8..cbd1c7bcfb3d49d880d8cd1b325da24d48f20313 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>4.0.2</version>
+    <version>4.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 5d0da1d20487375de4794dd8af1ea7b18c74900e..6455b49cd1158d0f18a6c529d51ede98e453364a 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.2</version>
+                <version>3.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index da054ad272efb562c9b5e985dfc2f3cc93158e0c..b8049a0e17065f564ed9d495b56d791945b98270 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.2</version>
+    <version>4.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
index ea32b251635a572cf358941ae38a99e263fd9771..f6e789065cd9fa9bef652764739887728d8b27a6 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
@@ -76,8 +76,6 @@ public class TcpChannelInitializer extends ProtocolChannelInitializer<SocketChan
             LOG.debug("Calling OF plugin: {}", getSwitchConnectionHandler());
             getSwitchConnectionHandler().onSwitchConnected(connectionFacade);
             connectionFacade.checkListeners();
-            ch.pipeline().addLast(PipelineHandlers.IDLE_HANDLER.name(),
-                    new IdleHandler(getSwitchIdleTimeout(), TimeUnit.MILLISECONDS));
             boolean tlsPresent = false;
 
             // If this channel is configured to support SSL it will only support SSL
@@ -112,6 +110,8 @@ public class TcpChannelInitializer extends ProtocolChannelInitializer<SocketChan
             ch.pipeline().addLast(PipelineHandlers.OF_ENCODER.name(), ofEncoder);
             ch.pipeline().addLast(PipelineHandlers.DELEGATING_INBOUND_HANDLER.name(),
                     new DelegatingInboundHandler(connectionFacade));
+            ch.pipeline().addLast(PipelineHandlers.IDLE_HANDLER.name(),
+                    new IdleHandler(getSwitchIdleTimeout(), TimeUnit.MILLISECONDS));
             if (!tlsPresent) {
                 connectionFacade.fireConnectionReadyNotification();
             }

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 73c535fc8dd7a22c5bed825bd9631323360aeab6..d6fd335615f031a66f9866597077708d12598a13 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -133,6 +133,11 @@
             <plugin>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>blueprint-maven-plugin</artifactId>
+                <configuration>
+                    <scanPaths>
+                        <scanPath>org.opendaylight.openflowplugin.impl</scanPath>
+                    </scanPaths>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 8f78142c2def5e2b1cc9bbeb6d4c804e6f0156f5..4c2b9e860b17900432b3d37c830693ec9837daef 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -66,10 +66,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
index 4b834db095ef83e54c2d6f3c5f1607f8a7ee5dd7..6bd8eae90bca17d7dcdec401e4caba1c180a24a3 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -8,11 +8,11 @@
 package org.opendaylight.openflowplugin.openflow.md.util;
 
 import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
 import java.math.BigInteger;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
@@ -157,7 +157,7 @@ public abstract class InventoryDataServiceUtil {
      * @return string of size 16, padded with '0'
      */
     public static String bigIntegerToPaddedHex(final BigInteger dataPathId) {
-        return StringUtils.leftPad(dataPathId.toString(16), 16, "0");
+        return Strings.padStart(dataPathId.toString(16), 16, '0');
     }
 
     public static BigInteger extractDatapathId(final NodeRef ref) {

diff --git a/parent/pom.xml b/parent/pom.xml
index 5ef64be5d6756e1f01093a856e1fafeb7ea6b688..43f688faf0f354a20a75a45915ee14f10cc77cb1 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
         <relativePath/>
     </parent>
 
@@ -231,7 +231,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
-                        <version>3.0.2</version>
+                        <version>3.0.3</version>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>