Bump odlparent/yangtools/mdsal to 5.0.6/3.0.10/4.0.13

This picks up latest upgrades, which necessitate a few fixes for
checkstyle violations as well as adjustment to comply with Akka API
changes.

Change-Id: I6648acf9262bd2852f5578b2c9589e3a7e5508c9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 53d8584c46a8cf8fa13d97f6ea8fade9d25b0ce5..c7c517547b69eded304fdbd439b30207b38e284e 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 7616aea0cd8feef0f2b91c9f8c82c937b1baa5f4..2c3bb1a2ffbdaf29be4a40772ae3bf2f5eb58fe9 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.11</version>
+                <version>4.0.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/production/pom.xml b/features/production/pom.xml
index 662559da33eb432866b475ec4e2494f6f6c317d0..4e7c36be2c03959026d4b9b77aa3d0bc1212c1a5 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.5</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
index 1c66c13442c48da598b728bf999282821a26d551..0b754c4ce7a7d824eb8a5ecec830bedee039bbfe 100644 (file)
--- a/features/test/features-neutron-test/pom.xml
+++ b/features/test/features-neutron-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 

diff --git a/features/test/pom.xml b/features/test/pom.xml
index bd07998f847b8b1cb37c8f87b2c6bcdea383c5f1..df93d615f4f94d0aac372abb81192dcdb97a1593 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.5</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index 90d7af4cdf8f962342e5739417cffc5e24bbab20..ce89ad3bd3aeae3841435adec063675a82baa290 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>5.0.5</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 4dbe05650b113a8014c975c1f33f0362b430c8fe..c5f8fd40d9e7a61b3fdecebee402ccc98b31d29b 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java b/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
index cf3a81c6ba749abaf6cf26225559dead41ca6fec..e87ec09d8b932a8963404218debfd5c871697c6f 100644 (file)
--- a/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
+++ b/neutron-hostconfig/ovs/src/main/java/org/opendaylight/neutron/hostconfig/ovs/NeutronHostconfigOvsListener.java
@@ -5,7 +5,6 @@
  * 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.neutron.hostconfig.ovs;
 
 import com.google.common.base.Preconditions;
@@ -17,7 +16,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/neutron-hostconfig/pom.xml b/neutron-hostconfig/pom.xml
index f577d5695939cd60714948de74fbfe04835e4a62..8fb88b07a98680c9252a6742274f69a682d2a035 100644 (file)
--- a/neutron-hostconfig/pom.xml
+++ b/neutron-hostconfig/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>5.0.5</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigUtil.java b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigUtil.java
index c643d9ca36570902999f0705b09097ea54767b48..973b0322ad1d1455556e76ce4ce553be1cc7cbc8 100644 (file)
--- a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigUtil.java
+++ b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigUtil.java
@@ -5,18 +5,15 @@
  * 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.neutron.hostconfig.vpp;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 
 public final class HostconfigUtil {

diff --git a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
index 727245490f55a7cbb3b657ee7138434b07a85ac8..7cb96e491510be624e8302be2a8ad19c4a3b2f6b 100644 (file)
--- a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
+++ b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
@@ -5,7 +5,6 @@
  * 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.neutron.hostconfig.vpp;
 
 import com.google.common.base.Preconditions;
@@ -18,7 +17,6 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
index b8a2639789121aa4a746e97c96d606fafc8ca02e..679717ba2ab1870deed34c759e49de0c3a6f074e 100644 (file)
--- a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
+++ b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListenerTest.java
@@ -5,17 +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.neutron.hostconfig.vpp;
 
 import com.google.common.util.concurrent.SettableFuture;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.junit.After;
 import org.junit.Assert;

diff --git a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
index a7b23f942d912ec9a7338ae77eccd7b95599a757..90492a488de305bccb7f5c689f04d0e6329180fc 100644 (file)
--- a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
+++ b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
@@ -5,7 +5,6 @@
  * 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.neutron.logger;
 
 import com.google.common.base.Preconditions;
@@ -14,7 +13,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
index df941619e1a27b5c0ab2193a4d040758773ca347..2176b8ada4f06c66d2b5e4de638d9b7bcb7983de 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
@@ -8,7 +8,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.util.List;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 
 /**

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
index 597f1bae152545ee81b0172bb17f5cff761b7bbf..324abf62d8f97eb9b412ad82c65424108de95001 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
@@ -11,7 +11,6 @@ import com.google.common.base.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.ws.rs.core.MultivaluedHashMap;
-
 import org.opendaylight.netconf.sal.restconf.api.JSONRestconfService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.northbound.api.config.rev181024.NeutronNorthboundApiConfig;
 import org.opendaylight.yangtools.yang.common.OperationFailedException;

diff --git a/parent/pom.xml b/parent/pom.xml
index 3563e10bae666e04870b9e006034ad91c677c398..f5119376ffe52b4f45a33c3406adf43b718c8abe 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>4.0.11</version>
+    <version>4.0.13</version>
     <relativePath/>
   </parent>