Bump odlparent to 5.0.0

This bumps odlparent to 5.0.0 as part of Sodium MRI, also migrates
simple use of JSR305 to JDT.

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

diff --git a/commons/pom.xml b/commons/pom.xml
index fae5295c0dad61b3b99ca2a35a6789ac29048120..8c68d5336f6da46099139a2874cb7b30065bc6f6 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
index 6dcd19837ad3ada9cbd2bbef0f0356bc2e9209c5..30a9a226885d2fa2c5e21340fdf6ee88441b43e6 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
index 0f7f88caf351077608bbae8f94c7572d5362de53..8c4004772acd097de3ae6d7cab6537923094292f 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>4.0.9</version>
+        <version>5.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 08f0c8ce8f9e5b93605057a1a6e1398f170f9152..98af986e51d6198d74cfbe2ed8ea4d4df83fe4be 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>4.0.9</version>
+        <version>5.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 84ec1d891661e36389a79d88b45a5ab8f4ff4937..c5720e4c51228f31e747f122e46065f6f7a5f351 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>4.0.9</version>
+        <version>5.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 510c7ab4962eb42db2e1bd71de01b18c527e58c3..b9633bdc6c319c2879c6e479b54e777d81ee9246 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>4.0.9</version>
+        <version>5.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 8f64b48b0f46fce7ac6e13de236281812c8a412a..06e904f71aa53d662f2b42f25a177f0dbe938817 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>4.0.9</version>
+        <version>5.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 8138bf8f7a23410393861f638d5e2b35418054f2..3633cd4276ea869bd38b17064117b9f6261a06d5 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index 91e59a60f2397d47e4315188785e871130197068..a816666358c0057a0c9ced089ade78096548c8b2 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 9a00c035ff43b712c79ce3d5e520f7c75d273e70..ca0da14f062ac912919c7fa8ff28117d89191d86 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -84,32 +84,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <optional>true</optional>
     </dependency>
     <!-- Testing Dependencies -->
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-broker-impl</artifactId>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-broker-impl</artifactId>
-          <scope>test</scope>
-          <type>test-jar</type>
-      </dependency>
-      <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-simple</artifactId>
-          <scope>test</scope>
-      </dependency>
-
-      <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-broker-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-broker-impl</artifactId>
       <scope>test</scope>
+      <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionInstance.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionInstance.java
index 64b205c0da575557e4355b539b62ab3f11c37232..b10e8781cf97902574daebc7cba782ddcd5d27c2 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionInstance.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionInstance.java
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.mdsal.eos.binding.api.Entity;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
@@ -334,7 +334,7 @@ public class HwvtepConnectionInstance {
         }
     }
 
-    public void setDeviceOwnershipCandidateRegistration(@Nonnull EntityOwnershipCandidateRegistration registration) {
+    public void setDeviceOwnershipCandidateRegistration(@NonNull EntityOwnershipCandidateRegistration registration) {
         this.deviceOwnershipCandidateRegistration = registration;
     }
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java
index a1f1f66bfb907360ed976a918ba3704dcf965a3f..7fd4960f3a4b583b88c5ceb2b020111cab6c2990 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java
@@ -17,7 +17,7 @@ import java.util.concurrent.CountDownLatch;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.DependencyQueue;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.DependentJob;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.HwvtepOperationalState;
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.reflect.Whitebox;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class DependencyQueueTest extends DataChangeListenerTestBase {
 
     String[][] terminationPoints = new String[][]{

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListenerTest.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListenerTest.java
index cae2c7a0b8c18f17d47f2ac01d0e12057f26035a..c3d7fb0d49186f0c4b2176cb7d963115fa67cdbd 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListenerTest.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListenerTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.DependencyQueue;
 import org.opendaylight.ovsdb.lib.operations.Operations;
 import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Unit tests for the data-tree change listener.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
 
     static Logger LOG = LoggerFactory.getLogger(HwvtepDataChangeListenerTest.class);
@@ -121,7 +121,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         addData(CONFIGURATION, TerminationPoint.class, terminationPoints);
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
         //4 ucast macs + 2 termination points
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
         //TODO add finer grained validation
     }
 
@@ -132,7 +132,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         resetOperations();
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
         //4 ucast macs + 2 termination points
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
         //TODO add finer grained validation
     }
 
@@ -193,7 +193,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         resetOperations();
         addData(CONFIGURATION, TerminationPoint.class, terminationPoints);
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
 
         addData(OPERATIONAL, TerminationPoint.class, terminationPoints);
         addData(OPERATIONAL, RemoteUcastMacs.class, ucastMacs);
@@ -210,7 +210,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         resetOperations();
         addData(CONFIGURATION, TerminationPoint.class, terminationPoints);
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
 
         addData(OPERATIONAL, TerminationPoint.class, terminationPoints);
         addData(OPERATIONAL, RemoteUcastMacs.class, ucastMacs);
@@ -233,7 +233,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         resetOperations();
         addData(CONFIGURATION, TerminationPoint.class, terminationPoints);
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
 
         addData(OPERATIONAL, TerminationPoint.class, terminationPoints);
         addData(OPERATIONAL, RemoteUcastMacs.class, ucastMacs);
@@ -254,7 +254,7 @@ public class HwvtepDataChangeListenerTest extends DataChangeListenerTestBase {
         resetOperations();
         addData(CONFIGURATION, TerminationPoint.class, terminationPoints);
         addData(CONFIGURATION, RemoteUcastMacs.class, ucastMacs);
-        verify(Operations.op,  times(6)).insert(any(UcastMacsRemote.class));
+        verify(Operations.op,  times(4)).insert(any(UcastMacsRemote.class));
 
         resetOperations();
         addData(CONFIGURATION, RemoteMcastMacs.class, mcastMacs);

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalStateTest.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalStateTest.java
index 0548b02769212eb15d4fd1a17a101a2376053a77..cb49f6950b02eba9a1656388fcdac2a76091d5a4 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalStateTest.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalStateTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.HwvtepOperationalState;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
@@ -24,7 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitchesKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class HwvtepOperationalStateTest extends DataChangeListenerTestBase {
 
     UUID uuid = new UUID("ls0");

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/UnMetDependencyGetterTest.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/UnMetDependencyGetterTest.java
index 8de4cc14e5ede7717405acce5139766138779618..0fe5a6d0c46f644992b371de7a81d5f41f366cb4 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/UnMetDependencyGetterTest.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/UnMetDependencyGetterTest.java
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.HwvtepOperationalState;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.McastMacsRemoteUpdateCommand;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transact.UnMetDependencyGetter;
@@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.reflect.Whitebox;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class UnMetDependencyGetterTest extends DataChangeListenerTestBase {
 
     UnMetDependencyGetter<RemoteMcastMacs> mcastMacDataValidator;

diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
index 94f9e0328f52f659bc2d498ffc89cfd4d1595692..3906d08da4ba50ea9a33f536fb2dda79dfefe03b 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index 28b866433047f59c7d99b0b4bb67679185ac6876..cababec6c14c1bb1641f5ff8d1e15d2c6525ff33 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml
index 6b3954e99395c598a494e88ea38370a12ba14460..a41113c3b4aad62013113109b58accb5e403e41c 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml
index dceb5b0652d4c59faa77a1158f7c3672a9fea22f..bdd1a5cdc4458528230c02fcc8ed1e7939fe2299 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml
index 01d7e96101d4c1bcc6bde8a716cb24a5374482f5..7dddb8069433541d47a82eb9af4e1ee54c4caf7d 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>4.0.9</version>
+        <version>5.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>4.0.9</version>
+            <version>5.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 f6c0e7024e42779c728334bc039c6ebbbe105199..6ef9d209f23e5dbe621110aa738170ca4ef85eeb 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="[4,5)">odl-jackson-2.9</feature>
+        <feature version="[5,6)">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 f1fb0ddb40c47c57499167a29c95726df6eb60e4..9413c725c25b036c35e83c798a63e2d6b0ad83fe 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/library/impl/pom.xml b/library/impl/pom.xml
index f4a122db5a499dd29dd545fd9cf709979aea3762..90a2ef0fb3717bfd2a17d2a0bdbe7df8d3a9f885 100644 (file)
--- a/library/impl/pom.xml
+++ b/library/impl/pom.xml
@@ -79,21 +79,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
 
     <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>

diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml
index 9dd325ed388f7e45a9c27e505ae350fffe1988b2..eb18f95efc3f22a9972c93b5fa90c1914ef4bdcb 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/library/pom.xml b/library/pom.xml
index 1ebaaf940b30f45005ee2985b6705adbd38f3d93..e865e6a251e4276e3559e7951455848781592071 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index f0e558de4a2e226b2731c93c723c5e341b58b33d..36ddf71606b8972c37e18fd504ed8fdd9e5ff369 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml
index 7c47e0ee4ab6dd8380725ae3b23f9deb0ae91a48..db67e62f81d31fcca990138dd42bfcdf3d653dc6 100644 (file)
--- a/schemas/hardwarevtep/pom.xml
+++ b/schemas/hardwarevtep/pom.xml
@@ -30,11 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>library</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml
index e48052620a0179db281b0b4f52f39a6ec2132743..489a6042c6c52631890fe8cfdafdf7e0ecbc41fb 100644 (file)
--- a/schemas/openvswitch/pom.xml
+++ b/schemas/openvswitch/pom.xml
@@ -30,11 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>library</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/schemas/pom.xml b/schemas/pom.xml
index 75fc65504504a6d1ed3140f44beb82c63230ae3d..0d4361f726fb6a70c16e539bb6fa667dabd0d9c1 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/pom.xml b/southbound/pom.xml
index 4f3678e427187d3de608c4ba257af7661beafa0a..fed527b1e451128ffbd8bdf83a45e88cbb64b307 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml
index cd5a5c3bf017268958347450dac2981d72f39705..61f74cbe3390d86944a1c522110dbc43f49d8d82 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml
index 08c0d8261092a70e45cee3c643bf653bdeff1a9f..ada464bb287b5fe60d21f3e84bfda949ee787193 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>4.0.9</version>
+        <version>5.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 ecec36b73a7c8f67f216524f0f6bebbbbc524099..e6a60d3d4f69fdf844b1879eff1fbdce6f752f6a 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>4.0.9</version>
+        <version>5.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 b7d54a0aa9db858eba10a4c9f045f3f947a11cbc..039d34e508fcbbab10e415f9b438fb408eec3243 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>4.0.9</version>
+        <version>5.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 399bdc289505a53b0aba1590564776d992bd01d0..a21ae230f606c7ad23bcf5646ee1f1dfaaf8d396 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>4.0.9</version>
+        <version>5.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 61e4529542544f9f62c0cb4aac41d0a4918c3abc..6b6067e321f1cf78493dfb2d831fec3c671dd8c5 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>4.0.9</version>
+        <version>5.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 a5b7b0c475a9f50e0fd9382247559d423a1d9ba1..b38a4584a546ca6ed4a3b8f2662d40cbdbb5fa11 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="[4,5)">odl-jackson-2.9</feature>
+        <feature version="[5,6)">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 8a0c79eb89aa04a2e30fc94a5ad82801ff56122c..4f6b40a3c38908540c4887d2670b1317f260b7a6 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index 54b66f8126db61818d2289d304a472c7671bc0f8..14fddbc61ca3f8b2431a1cfef08bcc5f528eb4da 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 44a1d2b7a00246f28fd386f6ea57fb6d62c23ac4..e1197ad97391d5f1234542797d5ebbcd8f0cf6ae 100644 (file)
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -96,6 +96,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
+
+    <!-- testing dependencies -->
     <dependency>
       <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
@@ -107,40 +109,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- testing dependencies -->
+
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <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-module-junit4</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-reflect</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>

diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml
index 3f1898b28ed55f8531dda36a31d9fda774f538ae..020d1f408b8937023c67dbf1067d7478b15571d6 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/utils/config/pom.xml b/utils/config/pom.xml
index 9b1e31955d8efeebbb2e7bc6d30ed1390321dff8..e190731d3c1e6ab165688e11215714bec5b025f2 100644 (file)
--- a/utils/config/pom.xml
+++ b/utils/config/pom.xml
@@ -31,22 +31,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
 
     <!-- testing dependencies -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <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-core</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/utils/hwvtepsouthbound-utils/pom.xml b/utils/hwvtepsouthbound-utils/pom.xml
index 9b81831b8ec4377dbaeaa194bf3cac2db97cff33..5e146ce459cf7d84d04fa74be1db15ea8cb9f88f 100644 (file)
--- a/utils/hwvtepsouthbound-utils/pom.xml
+++ b/utils/hwvtepsouthbound-utils/pom.xml
@@ -40,17 +40,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>utils.mdsal-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!-- testing dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <!--

diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml
index 62488055efede359ad704f4448a231fd41583438..48872d315f5a19797fe11f6fbf0aacab6212e5d4 100644 (file)
--- a/utils/mdsal-utils/pom.xml
+++ b/utils/mdsal-utils/pom.xml
@@ -30,16 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
 
     <!-- testing dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-api</artifactId>

diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml
index c6747ebafa6c0b6f73bea27c06d2f8aafec96ab8..54d93c95b6982aa822540fbd446f406ef7245dc0 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/pom.xml b/utils/pom.xml
index 204669f54d860594f87319f4994098896e4cb3a5..e63a28736a2763f947cefd79632cf1dbab93164c 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/utils/servicehelper/pom.xml b/utils/servicehelper/pom.xml
index e8085b0f42f53a7bde44a872ea7423d911903826..8093cda44ee60fadcb0e9342b663e3a7966617a7 100644 (file)
--- a/utils/servicehelper/pom.xml
+++ b/utils/servicehelper/pom.xml
@@ -25,11 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
@@ -38,22 +33,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <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-core</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>
     <dependency>

diff --git a/utils/yang-utils/pom.xml b/utils/yang-utils/pom.xml
index c7c3690e15d6513ac570327436f3077ecaa65f98..5eddb2d31613223201eea7e6f5568f52e37829d7 100644 (file)
--- a/utils/yang-utils/pom.xml
+++ b/utils/yang-utils/pom.xml
@@ -24,11 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>