From 27c9392d35aa2d5667ec4167a00ae2fe22c45f09 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 10 Dec 2020 13:43:23 +0100 Subject: [PATCH] Bump MRI upstreams Adopt following versions: - odlparent-8.0.2 - infrautils-1.9.3 - yangtools-6.0.2 - mdsal-7.0.3 - controller-3.0.3 Change-Id: Id975b4ab08b204c8c6008e0a73b3b4a4a481bff2 Signed-off-by: Robert Varga --- alivenessmonitor/pom.xml | 2 +- arputil/pom.xml | 2 +- artifacts/pom.xml | 2 +- cloudscaler/pom.xml | 2 +- commons/binding-parent/pom.xml | 6 +++--- commons/checkstyle/pom.xml | 2 +- commons/pom.xml | 2 +- commons/quality-parent/pom.xml | 8 ++++---- fcapsapplication/pom.xml | 2 +- fcapsmanager/pom.xml | 2 +- features/genius-features/pom.xml | 2 +- features/odl-genius-api/pom.xml | 6 +++--- features/odl-genius-fcaps-application/pom.xml | 4 ++-- features/odl-genius-fcaps-framework/pom.xml | 4 ++-- features/odl-genius-rest/pom.xml | 2 +- features/odl-genius/pom.xml | 4 ++-- features/pom.xml | 2 +- idmanager/pom.xml | 2 +- interfacemanager/pom.xml | 2 +- ipv6util/pom.xml | 2 +- .../genius/itm/impl/ItmInternalTunnelDeleteTest.java | 4 ++-- itm/pom.xml | 2 +- karaf/pom.xml | 2 +- lockmanager/pom.xml | 2 +- .../genius/mdsalutil/interfaces/IMdsalApiManager.java | 5 ----- mdsalutil/pom.xml | 2 +- networkutils/pom.xml | 2 +- pom.xml | 2 +- 28 files changed, 38 insertions(+), 43 deletions(-) diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml index af569a4c1..323627144 100644 --- a/alivenessmonitor/pom.xml +++ b/alivenessmonitor/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/arputil/pom.xml b/arputil/pom.xml index e241fa405..32e228b13 100644 --- a/arputil/pom.xml +++ b/arputil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 615d18a3b..4fb163f88 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/cloudscaler/pom.xml b/cloudscaler/pom.xml index 874d509d5..5e8a43176 100644 --- a/cloudscaler/pom.xml +++ b/cloudscaler/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index 9b3998df3..832409ba3 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 7.0.1 + 7.0.3 @@ -33,14 +33,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 pom import diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml index cee6b32dc..3c4648901 100644 --- a/commons/checkstyle/pom.xml +++ b/commons/checkstyle/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 8.0.0 + 8.0.2 diff --git a/commons/pom.xml b/commons/pom.xml index c941477d5..79aa4ca2e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml index 5da2cc510..24e9552ae 100644 --- a/commons/quality-parent/pom.xml +++ b/commons/quality-parent/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.infrautils parent - 1.9.1 + 1.9.3 @@ -22,21 +22,21 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.0 + 6.0.2 pom import org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml index ef17c2228..1a42ed57c 100644 --- a/fcapsapplication/pom.xml +++ b/fcapsapplication/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml index 060a53cde..82cb5b49f 100644 --- a/fcapsmanager/pom.xml +++ b/fcapsmanager/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml index 8836ff694..7b8d40084 100644 --- a/features/genius-features/pom.xml +++ b/features/genius-features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml index a4e79704b..bd157fa94 100644 --- a/features/odl-genius-api/pom.xml +++ b/features/odl-genius-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -27,14 +27,14 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 import pom org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 import pom diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml index 99af84e22..033f3822b 100644 --- a/features/odl-genius-fcaps-application/pom.xml +++ b/features/odl-genius-fcaps-application/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -27,7 +27,7 @@ org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 import pom diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml index 4cc6780af..dacd374d2 100644 --- a/features/odl-genius-fcaps-framework/pom.xml +++ b/features/odl-genius-fcaps-framework/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -27,7 +27,7 @@ org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 pom import diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml index dc5d6ee10..335d5b24d 100644 --- a/features/odl-genius-rest/pom.xml +++ b/features/odl-genius-rest/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml index cb4d9b10e..8d320c532 100644 --- a/features/odl-genius/pom.xml +++ b/features/odl-genius/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -27,7 +27,7 @@ org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 pom import diff --git a/features/pom.xml b/features/pom.xml index 39cb6b29c..ac1872711 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/idmanager/pom.xml b/idmanager/pom.xml index 77658f952..85ef25dc0 100644 --- a/idmanager/pom.xml +++ b/idmanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/interfacemanager/pom.xml b/interfacemanager/pom.xml index d2f7ab939..09f87fe04 100644 --- a/interfacemanager/pom.xml +++ b/interfacemanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml index c91b8d290..905b8fdaa 100644 --- a/ipv6util/pom.xml +++ b/ipv6util/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java index 2dd4059bb..c2d9c2b3d 100644 --- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java +++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java @@ -171,8 +171,8 @@ public class ItmInternalTunnelDeleteTest { itmInternalTunnelDeleteWorker = new ItmInternalTunnelDeleteWorker(dataBroker, jobCoordinator, new TunnelMonitoringConfig(dataBroker, new GuavaCacheProvider(new CacheManagersRegistryImpl())), interfaceManager, new DpnTepStateCache(dataBroker, jobCoordinator, - new GuavaCacheProvider(new CacheManagersRegistryImpl()), directTunnelUtils, dpntePsInfoCache, - unprocessedNodeConnectorCache, unprocessedNodeConnectorEndPointCache), + new GuavaCacheProvider(new CacheManagersRegistryImpl()), directTunnelUtils, dpntePsInfoCache, + unprocessedNodeConnectorCache, unprocessedNodeConnectorEndPointCache), new OvsBridgeEntryCache(dataBroker, new GuavaCacheProvider(new CacheManagersRegistryImpl())), new OvsBridgeRefEntryCache(dataBroker, new GuavaCacheProvider(new CacheManagersRegistryImpl())), new TunnelStateCache(dataBroker, new GuavaCacheProvider(new CacheManagersRegistryImpl())), diff --git a/itm/pom.xml b/itm/pom.xml index a74c6cdc9..2d411b84f 100644 --- a/itm/pom.xml +++ b/itm/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index bb1508231..96aeaa6dd 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 8.0.0 + 8.0.2 diff --git a/lockmanager/pom.xml b/lockmanager/pom.xml index e5ee33e18..f588fc1c0 100644 --- a/lockmanager/pom.xml +++ b/lockmanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/interfaces/IMdsalApiManager.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/interfaces/IMdsalApiManager.java index 37502e5ca..449cbb4d8 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/interfaces/IMdsalApiManager.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/interfaces/IMdsalApiManager.java @@ -29,7 +29,6 @@ public interface IMdsalApiManager { * * @param flowEntity The flow entity. * @deprecated Use {@link #addFlow(TypedWriteTransaction, FlowEntity)}. - * @return */ @Deprecated FluentFuture installFlow(FlowEntity flowEntity); @@ -40,7 +39,6 @@ public interface IMdsalApiManager { * @param dpId The DPN identifier. * @param flowEntity The flow entity. * @deprecated Use {@link #addFlow(TypedWriteTransaction, Uint64, Flow)}. - * @return */ @Deprecated FluentFuture installFlow(Uint64 dpId, Flow flowEntity); @@ -51,7 +49,6 @@ public interface IMdsalApiManager { * @param dpId The DPN identifier. * @param flowEntity The flow entity. * @deprecated Use {@link #addFlow(TypedWriteTransaction, FlowEntity)}. - * @return */ @Deprecated FluentFuture installFlow(Uint64 dpId, FlowEntity flowEntity); @@ -80,7 +77,6 @@ public interface IMdsalApiManager { * @param tableId The table identifier. * @param flowId The flow identifier. * @deprecated Use {@link #removeFlow(TypedReadWriteTransaction, Uint64, String, short)}. - * @return */ @Deprecated ListenableFuture removeFlow(Uint64 dpId, short tableId, FlowId flowId); @@ -90,7 +86,6 @@ public interface IMdsalApiManager { * * @param flowEntity The flow entity. * @deprecated Use {@link #removeFlow(TypedReadWriteTransaction, FlowEntity)}. - * @return */ @Deprecated FluentFuture removeFlow(FlowEntity flowEntity); diff --git a/mdsalutil/pom.xml b/mdsalutil/pom.xml index 389c10f90..4ef64ba8a 100644 --- a/mdsalutil/pom.xml +++ b/mdsalutil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/networkutils/pom.xml b/networkutils/pom.xml index ee6f97912..5eefe23de 100644 --- a/networkutils/pom.xml +++ b/networkutils/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/pom.xml b/pom.xml index e4f1a58ce..f41e5ecb3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 -- 2.36.6