From b665daf9e2860c465d47dbbd9bed796e42aa8972 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 18 Jul 2019 18:14:25 +0200 Subject: [PATCH] Bump odlparent to 5.0.1 This picks up the latest upgrades. Change-Id: If6006a94197839a9718cd5eae16b0a025913af93 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 2 +- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-neutron/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 2 +- features/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- .../implementation/timebucket/TimeBucketWheelUnitTest.java | 6 ------ mappingservice/pom.xml | 2 +- 14 files changed, 13 insertions(+), 19 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index eb12d907a..94444559d 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 5.0.0 + 5.0.1 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 513149a6e..1294ad1ca 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 5.0.0 + 5.0.1 diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 6795cc9ee..4c1809a7b 100644 --- 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 org.opendaylight.odlparent feature-repo-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 679f98617..765f359be 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index bcf34e06a..acccbfcfc 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index a67b92302..79896b22f 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 1eaff706b..188e2887d 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index b701fe885..93f9189d7 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml index a44ea261e..96ea0534e 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 8e8a9b390..e6af167d7 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 5.0.0 + 5.0.1 diff --git a/features/pom.xml b/features/pom.xml index 8f0a4e4e3..0c1826526 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 5.0.0 + 5.0.1 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 58dfe57dd..5d7208a52 100644 --- 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 org.opendaylight.odlparent karaf4-parent - 5.0.0 + 5.0.1 diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java index 4277ed265..0222619cc 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java @@ -5,19 +5,16 @@ * 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.lispflowmapping.implementation.timebucket; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.ConcurrentHashMap; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.config.ConfigIni; import org.opendaylight.lispflowmapping.implementation.MappingSystem; import org.opendaylight.lispflowmapping.implementation.timebucket.containers.TimeBucket; @@ -35,15 +32,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ma import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.modules.junit4.PowerMockRunnerDelegate; import org.powermock.reflect.Whitebox; /** * Created by Shakib Ahmed on 12/13/16. */ - @RunWith(PowerMockRunner.class) -@PowerMockRunnerDelegate(MockitoJUnitRunner.class) @PrepareForTest(TimeBucketWheel.class) public class TimeBucketWheelUnitTest { diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index b5b745c28..c674a6659 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 5.0.0 + 5.0.1 -- 2.36.6