Bump odlparent to 5.0.0

Change-Id: Ia750003dafa61d3b584c8f98c6b7b74f0b221e55
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 4e2960395ad5df80ec084f22ba285021ba8aabd3..eb12d907ad7c2aa86ea37acea0f4a54a1a5c6580 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index fa638b8311869df41053c27bfd8bce389afb2719..5193d849afa4f3cb82a62915a028b81627d1e567 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index b2a84d995bee89a53272fdf0c825c9fc9f0bd49e..8d044d9d9bdc70387d0753f9e034e27f562acb2c 100644 (file)
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -23,6 +23,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 3364ca182fcd48afacd43e458176174984f81231..6795cc9ee4d0b8803d96dcdabcedcc82c4d1f91a 100644 (file)
--- a/features/features-lispflowmapping/pom.xml
+++ b/features/features-lispflowmapping/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 32af2da94176615cd9449e0523f9c38c88f05da4..679f986174695a8584dc74aff438005a07b97211 100644 (file)
--- a/features/odl-lispflowmapping-inmemorydb/pom.xml
+++ b/features/odl-lispflowmapping-inmemorydb/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 5df890247616973083491d40d9736321a1c4d014..bcf34e06a5f1d2274dab37f60897ca28df7d7295 100644 (file)
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index d1424fa8659a258183f8ccfd760168bfc0ced70d..a67b92302362b2bf0ed88acac16d53e3807ad776 100644 (file)
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index e77282d0f634f55ef69e79d243e1680c46cce04f..f524d18bb18a60c9bb6e7d1a64331ce20ecd7d44 100644 (file)
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index e10cba17f5190fd40af18d6a25e2123186520292..b701fe8850f5b6835cb9997802cb4eb808dfac60 100644 (file)
--- a/features/odl-lispflowmapping-msmr/pom.xml
+++ b/features/odl-lispflowmapping-msmr/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index c860a671036882e8db04266739e23d641a523452..0c6111b17fee1e08d2c6b885517e7276bc6528e4 100644 (file)
--- a/features/odl-lispflowmapping-neutron/pom.xml
+++ b/features/odl-lispflowmapping-neutron/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 18a4a85133ffdb9c28d4545afacfe8107c244108..8e8a9b3909d390593f1235a8c779e1d5b3977ebe 100644 (file)
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index c1081a7179fc8ca5c2a8eec342d57b9843b06ad2..bbe014fca1629737e3e560d898cd44e34a7dfde3 100644 (file)
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
     <feature name="odl-lispflowmapping-southbound">
-        <feature version="[4,5)">odl-netty-4</feature>
-        <feature version="[4,5)">odl-guava</feature>
+        <feature version="[5,6)">odl-netty-4</feature>
+        <feature version="[5,6)">odl-guava</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 8f5cf1104d14c83c2d73397745c1430f8808ee26..8f0a4e4e3f6b3d78a8ae395ec881e658ac3485ec 100644 (file)
--- a/features/pom.xml
+++ b/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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index 14fb3c9b96ba338016bdaec1934245b3e449113d..58dfe57dd4dad0499c59341a0f7e4076a8ba5cb2 100644 (file)
--- a/lispflowmapping-karaf/pom.xml
+++ b/lispflowmapping-karaf/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>karaf4-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
index d2c77f6a8d49a244fff7e13b185ba2d03538cafc..74199b2cd11c0a00c9e13b969f4120f24a36ce83 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
@@ -9,10 +9,10 @@
 package org.opendaylight.lispflowmapping.implementation.util;
 
 import com.google.common.base.Preconditions;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;

diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index d8358630d167eed3a194701401bbe69b3aba93ad..7be24d9e8ce73fa097c9ecda78c8221481b5e96b 100644 (file)
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -87,6 +87,11 @@
       <artifactId>mdsal-singleton-common-api</artifactId>
       <version>3.0.6</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!--Needed for testing-->
     <dependency>
@@ -95,33 +100,28 @@
       <version>1.4</version>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>2.0.0</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-support</artifactId>
-      <version>2.0.0</version>
+      <artifactId>powermock-api-mockito2</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
-      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-reflect</artifactId>
-      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java
index 33cdc47eb55ad84499a9581a918e4941e8b46c8c..ba37815ef93d4e65494dca52a3097419a743575f 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VbridgeTopologyListener.java
@@ -13,8 +13,8 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
 
+import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 1f7fc1f4e0666a3e71db8e3a9e3329082042119b..1b99bbe3194a071612bc0eb246b1f1c153afecc0 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 
@@ -62,37 +62,6 @@
         <version>1.4</version>
         <scope>test</scope>
       </dependency>
-      <!-- Use PowerMock 2 (beta) -->
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito2</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-support</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-core</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-reflect</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>