Bump odlparent to 6.0.0

This bumps odlparent to 6.0.0 as part of Magnesium MRI.

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

diff --git a/commons/pom.xml b/commons/pom.xml
index c4a048ebde9ee1a00dcef20b7b691c5d403dae50..fa0d3cc616815dc64570e2669be5a53fbac70108 100644 (file)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
index ce667492e1771636af8817c64b470ff4c1bcd1f1..94c01298a8bb8c81f30727f53093b92f5b38f32a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
index 2bba22bbdee34e229912bec228d100f2fddf9c9c..a235e87e67f5eaf8610996a42341dd7707ee8c6e 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
index 9a09f5db72e34d54e3f773b858b768381d25a3bd..1484918a442466acf7da6e128e1907bb9b60439d 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
index 6b263f62bc718fbe50cb285ad5b00066daa07db7..e904f72bcc9dab51329fb3c77a8d9c2af234b8fc 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
index 0a431e8d4c928b6a464399c8954f36a1917d2d3e..2400635994c7a268021de010445417b7150735e2 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
index 4f4418630e6e34bc58511e2a28af81f3a31901e0..468923fcdfc13aa43d4945ebb1406930f4147357 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index 1cb6e46e821bdc0084e5b85e20cbb9d536f6a1b3..a015b46969f1bb596ed880e7aa0b95a4d6d7ad1a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index fd4f4a59b234d327fbc4942c1e6b11afa3f78767..a99c9462976da7e0bcea06db4cdd79da53d81e86 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java
index 767fc6d0ce25b29abaa16c263881105ff5b2b623..5ff6d1db54ad879aae82df48c094b8cbf396a002 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java
@@ -11,6 +11,7 @@ package org.opendaylight.ovsdb.hwvtepsouthbound.transact;
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
 import com.google.common.base.Optional;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -73,6 +74,8 @@ public class LogicalRouterRemoveCommand extends AbstractTransactCommand<LogicalR
         }
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private void removeLogicalRouter(TransactionBuilder transaction,
             final InstanceIdentifier<Node> instanceIdentifier, final List<LogicalRouters> routerList) {
         for (LogicalRouters lrouter: routerList) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
index b78b3bfc6fef818092f2380d8b86a6a6b6669b3c..f09ca6a1a87d26e481fd223cda562a5a64a62489 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
@@ -10,6 +10,7 @@ package org.opendaylight.ovsdb.hwvtepsouthbound.transact;
 
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -77,6 +78,8 @@ public class LogicalSwitchRemoveCommand extends AbstractTransactCommand<LogicalS
         }
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private void removeLogicalSwitch(final TransactionBuilder transaction,
                                      final InstanceIdentifier<Node> nodeIid, final List<LogicalSwitches> lswitchList) {
         for (LogicalSwitches lswitch: lswitchList) {

diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
index d727d50f9ee571450f632f998d97d0895a928b41..ebfabc1c492610c8f40ca6234b771b7af04048e5 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-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.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index 88141e8ec8b2fd3d2db76d212436c015338ca188..9e509db01763b75c170ccd2d4c4739dc796e7fae 100644 (file)
--- a/hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml
index 5320e8fbf67cf1d90ce8ec9ec792718c098213bc..042a418d32ccda0bb57bd9dcc7f66d074461685d 100644 (file)
--- a/library/artifacts/pom.xml
+++ b/library/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml
index 15610d65af2568a0c7fff360c398fcbe922bd749..e46eab3a37b5ef832333dd0925c5ed4ca32e45a7 100644 (file)
--- a/library/features/features/pom.xml
+++ b/library/features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml
index dd531785f5523c53feb9e0b49d5e7dda21623c2a..d451f65b91efdb0e56d6caef6c3538c347cb5862 100644 (file)
--- a/library/features/odl-ovsdb-library/pom.xml
+++ b/library/features/odl-ovsdb-library/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-jackson-2.9</artifactId>
-            <version>5.0.2</version>
+            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/library/features/odl-ovsdb-library/src/main/feature/feature.xml b/library/features/odl-ovsdb-library/src/main/feature/feature.xml
index 6ef9d209f23e5dbe621110aa738170ca4ef85eeb..516f441c430046e74dec0a773a4b512bb7026644 100644 (file)
--- a/library/features/odl-ovsdb-library/src/main/feature/feature.xml
+++ b/library/features/odl-ovsdb-library/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <features name="odl-ovsdb-library-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-ovsdb-library" version="${project.version}">
-        <feature version="[5,6)">odl-jackson-2.9</feature>
+        <feature version="[6,7)">odl-jackson-2.9</feature>
         <configfile finalname="etc/org.opendaylight.ovsdb.library.cfg">
             mvn:org.opendaylight.ovsdb/library/${project.version}/cfg/config
         </configfile>

diff --git a/library/features/pom.xml b/library/features/pom.xml
index 2dcadcbb5fbe266fc62e494779baf883751c4f1d..fd1d1b60a889d392d4d6fd72ad0deae89da8609e 100644 (file)
--- a/library/features/pom.xml
+++ b/library/features/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
index 0fce9d46651932d69b4b93e69bf0ced79d52f60f..3be844912705c0a85f535f70d0bd6e55460dac96 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.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.ovsdb.lib.impl;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -15,6 +14,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.AdaptiveRecvByteBufAllocator;
@@ -413,6 +413,8 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
         }, CONNECTION_NOTIFIER_SERVICE);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void handleNewPassiveConnection(final Channel channel) {
         if (!channel.isOpen()) {
             LOG.warn("Channel {} is not open, skipped further processing of the connection.",channel);
@@ -540,6 +542,8 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
         return null;
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static List<OvsdbClient> getPassiveClientsFromSameNode(OvsdbClient ovsdbClient) {
         List<OvsdbClient> passiveClients = new ArrayList<>();
         for (OvsdbClient client : CONNECTIONS.keySet()) {

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java
index dddb8d8734372bcb19731463e47ee98ea3e761dc..613d69a38461817da0217dea458d6d6a17bb1e17 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtils.java
@@ -73,6 +73,8 @@ public final class TyperUtils {
         return tableSchema.column(columnName, metaClass);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static String getColumnName(Method method) {
         TypedColumn typedColumn = method.getAnnotation(TypedColumn.class);
         if (typedColumn != null) {
@@ -97,11 +99,15 @@ public final class TyperUtils {
         return null;
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static boolean isGetTableSchema(Method method) {
         TypedColumn typedColumn = method.getAnnotation(TypedColumn.class);
         return typedColumn != null && typedColumn.method().equals(MethodType.GETTABLESCHEMA);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static boolean isGetRow(Method method) {
         TypedColumn typedColumn = method.getAnnotation(TypedColumn.class);
         if (typedColumn != null) {
@@ -194,6 +200,8 @@ public final class TyperUtils {
         return true;
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void checkColumnSchemaVersion(DatabaseSchema dbSchema, Method method) {
         Version fromVersion = getColumnFromVersion(method);
         Version untilVersion = getColumnUntilVersion(method);

diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml
index 468a76076437f839a7e0342023bc23b13f29e341..f2c55b684636a175ca00301dc3f7aaebb5ac42aa 100644 (file)
--- a/library/karaf/pom.xml
+++ b/library/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.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/library/pom.xml b/library/pom.xml
index 880d1b4da738e67637aae72320b46397fb57af09..954d70e07f1f6315bf712df991923a52016403a0 100644 (file)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index e514b9d28eaba1a48d048134a7d1758e459dd46a..2b95a5cd0d828e068b55ffe8b9ca9e392f43be9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/pom.xml b/schemas/pom.xml
index 9bc2d3dd71860c5c42b7344e560626fb67f73239..2f0a7374846e8f302fe3636b4555fff5a49734e1 100644 (file)
--- a/schemas/pom.xml
+++ b/schemas/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/pom.xml b/southbound/pom.xml
index 278cd99e5660d77ec6af97c5b7c6b61fde0a0491..1159ce3ed836576551a74c88933befd3c2b92d0a 100644 (file)
--- a/southbound/pom.xml
+++ b/southbound/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml
index 64edddfa1a2670feaa0795173f4858ff120fd012..28938f637e2c03a43651f4762d7cf3ea21e6c0c8 100644 (file)
--- a/southbound/southbound-artifacts/pom.xml
+++ b/southbound/southbound-artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml
index 92101e618db9f95737b8cdad9b02c1bc8db7e6c6..eca5d94107f571f2a8ef06b4826bf3bae8db2874 100644 (file)
--- a/southbound/southbound-features/features/pom.xml
+++ b/southbound/southbound-features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
index 23f88c16d2f7b83121c3251e20f2459a856c4ae8..3599852e6d70d2029788c4eb14e7676aff72f200 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
index c52ff81c4aaba63d4a8a721ec17852c45b8b6cd7..60e613236f08cda49743866a8735224a8f62417c 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
index 80843c560eaee61bfbedf82452056cde8115cd8e..00c8d8e107675d526be405f067061a69b881cde8 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
index 3c1ebf7a3bb919d0ec3fdca63a396836f6a4ec62..4bc1675f30497ca9791e069c81e6d2621e19853b 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml
index b38a4584a546ca6ed4a3b8f2662d40cbdbb5fa11..d5bafd76e26cadced8d2ffbde4959f2692ca9db1 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <features name="odl-ovsdb-southbound-impl-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-ovsdb-southbound-impl" version="${project.version}">
-        <feature version="[5,6)">odl-jackson-2.9</feature>
+        <feature version="[6,7)">odl-jackson-2.9</feature>
         <configfile finalname="etc/org.opendaylight.ovsdb.southbound.cfg">
             mvn:org.opendaylight.ovsdb/southbound-impl/${project.version}/cfg/config
         </configfile>

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
index 30e5f55f19265af6bb50fd06f71c937be29fcfef..c877df63161019a8c6557e82f3630f7b59e2e754 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index c2e2d79e4ad16895f9ca53ffe6c19fb4c1cab709..da4b91d872ff3ccacb8161c023d5a32bfa85b690 100644 (file)
--- a/southbound/southbound-features/pom.xml
+++ b/southbound/southbound-features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
index f6c963aa53c3a055b92d526ae76deec9492efc5d..8ba2a3011483847df08a74133e2bc17e5e928b81 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
@@ -16,6 +16,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -406,6 +407,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         reconciliationManager.cancelTerminationPointReconciliation();
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private void handleOwnershipChanged(EntityOwnershipChange ownershipChange) {
         OvsdbConnectionInstance ovsdbConnectionInstance = getConnectionInstanceFromEntity(ownershipChange.getEntity());
         LOG.debug("handleOwnershipChanged: {} event received for device {}",

diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml
index be5df38beb1c8ac758b15391707a2547abd70b50..99fc54b682845989d73daafaf517210e6f809dba 100644 (file)
--- a/southbound/southbound-karaf/pom.xml
+++ b/southbound/southbound-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.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/utils/config/pom.xml b/utils/config/pom.xml
index 3964fa12a87afbe95969a4ac02973ac0a8e598b1..ab64e0cdad43012e5786f54f822a2bd9a78d24eb 100644 (file)
--- a/utils/config/pom.xml
+++ b/utils/config/pom.xml
@@ -51,6 +51,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- FIXME: remove this with odlparent-6.0.1 -->
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.26.0-GA</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml
index ab455f12fd21d8d869390033426da2a5ff672e37..f7053c0ec57a788e95470a22c354a6fdb8928470 100644 (file)
--- a/utils/odl-ovsdb-utils/pom.xml
+++ b/utils/odl-ovsdb-utils/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/pom.xml b/utils/pom.xml
index 75824d113334d327e9b2ec4c30debbe5ca31f54e..e6f90dd750cea7999c74aeb8cbe9724cf3a197ac 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>