From f31d6eb2946e2c22bface66a8cc405c45706a9d6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 10 Dec 2020 13:41:41 +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: Ib0a37fff00f4d85dcab90fe606d5a0ab7184addd Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- .../netconf-connector/features-netconf-connector/pom.xml | 2 +- features/netconf-connector/odl-message-bus/pom.xml | 4 ++-- .../netconf-connector/odl-netconf-callhome-ssh/pom.xml | 2 +- .../odl-netconf-clustered-topology/pom.xml | 2 +- .../netconf-connector/odl-netconf-connector-all/pom.xml | 2 +- features/netconf-connector/odl-netconf-connector/pom.xml | 6 +++--- features/netconf-connector/odl-netconf-console/pom.xml | 2 +- features/netconf-connector/odl-netconf-topology/pom.xml | 2 +- features/netconf-connector/pom.xml | 2 +- features/netconf/features-netconf/pom.xml | 2 +- .../netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml | 2 +- features/netconf/odl-aaa-netconf-plugin/pom.xml | 2 +- features/netconf/odl-netconf-all/pom.xml | 2 +- features/netconf/odl-netconf-api/pom.xml | 6 +++--- features/netconf/odl-netconf-client/pom.xml | 4 ++-- features/netconf/odl-netconf-impl/pom.xml | 4 ++-- features/netconf/odl-netconf-mapping-api/pom.xml | 2 +- features/netconf/odl-netconf-mdsal/pom.xml | 2 +- features/netconf/odl-netconf-netty-util/pom.xml | 2 +- features/netconf/odl-netconf-notifications-api/pom.xml | 2 +- features/netconf/odl-netconf-notifications-impl/pom.xml | 4 ++-- features/netconf/odl-netconf-ssh/pom.xml | 2 +- features/netconf/odl-netconf-tcp/pom.xml | 2 +- features/netconf/odl-netconf-util/pom.xml | 4 ++-- features/netconf/pom.xml | 2 +- features/pom.xml | 2 +- features/restconf/features-restconf/pom.xml | 2 +- features/restconf/odl-mdsal-apidocs/pom.xml | 4 ++-- features/restconf/odl-restconf-all/pom.xml | 2 +- features/restconf/odl-restconf-common/pom.xml | 8 ++++---- features/restconf/odl-restconf-nb-bierman02/pom.xml | 4 ++-- features/restconf/odl-restconf-nb-rfc8040/pom.xml | 4 ++-- features/restconf/odl-restconf/pom.xml | 2 +- features/restconf/pom.xml | 2 +- features/yanglib/features-yanglib/pom.xml | 2 +- features/yanglib/odl-yanglib/pom.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf/pom.xml | 2 +- netconf/models/pom.xml | 2 +- netconf/netconf-config/pom.xml | 2 +- .../topology/singleton/impl/MountPointEndToEndTest.java | 4 +--- netconf/pom.xml | 2 +- netconf/shaded-exificient-jar/pom.xml | 2 +- netconf/shaded-exificient/pom.xml | 2 +- netconf/shaded-sshd-jar/pom.xml | 2 +- netconf/shaded-sshd/pom.xml | 2 +- netconf/tools/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/restconf-models/pom.xml | 2 +- .../netconf/sal/restconf/impl/BrokerFacade.java | 2 +- restconf/sal-rest-connector-config/pom.xml | 2 +- 54 files changed, 71 insertions(+), 73 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 9e56230753..74baccaaeb 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index 589a7290b0..415d93bfe3 100644 --- a/features/netconf-connector/features-netconf-connector/pom.xml +++ b/features/netconf-connector/features-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml index 970068d158..bfaa7ea48e 100644 --- a/features/netconf-connector/odl-message-bus/pom.xml +++ b/features/netconf-connector/odl-message-bus/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -34,7 +34,7 @@ org.opendaylight.controller odl-controller-exp-messagebus - 3.0.1 + 3.0.3 xml features diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml index 5c49785774..07502ee9b7 100644 --- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml index dd2c88445b..5ad2fec517 100644 --- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml index 023aab55ab..dbc1cb6e0f 100644 --- a/features/netconf-connector/odl-netconf-connector-all/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index a854106962..bce071e149 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,14 +28,14 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml index 559e1a0af4..b3e747b38e 100644 --- a/features/netconf-connector/odl-netconf-console/pom.xml +++ b/features/netconf-connector/odl-netconf-console/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml index 473b8e10dc..800081170d 100644 --- a/features/netconf-connector/odl-netconf-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index d3a9d86e2f..6579fbe336 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 6de0af5150..4439133516 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml index 6705b24a7a..96d84bf3d1 100644 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index ca0b3b4122..29b624bc06 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index e6dad0387c..45293934b7 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 4bc5ec535d..1a90dcaf87 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,14 +28,14 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.0 + 6.0.2 pom import org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml index 5bf1de5220..858c71a07c 100644 --- a/features/netconf/odl-netconf-client/pom.xml +++ b/features/netconf/odl-netconf-client/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -25,7 +25,7 @@ org.opendaylight.controller odl-controller-exp-netty-config - 3.0.1 + 3.0.3 xml features diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index e25a3dc3ba..9757537ad5 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,7 +28,7 @@ org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml index 585cc73a69..8d38df6dac 100644 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ b/features/netconf/odl-netconf-mapping-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index 2fa7078efa..83bde8b647 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index f158eb042e..a8e7a1573f 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml index af269ff106..38a7b179b7 100644 --- a/features/netconf/odl-netconf-notifications-api/pom.xml +++ b/features/netconf/odl-netconf-notifications-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 470d2ce9a6..5c2cd01269 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index 16163b6a54..e2e36a28f6 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml index bf70d40246..04afed1702 100644 --- a/features/netconf/odl-netconf-tcp/pom.xml +++ b/features/netconf/odl-netconf-tcp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index 8c59a0b96b..f667293bf3 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -32,7 +32,7 @@ org.opendaylight.yangtools odl-yangtools-codec - 6.0.0 + 6.0.2 xml features diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index b9031c1d3d..4b4a3d8de1 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/pom.xml b/features/pom.xml index 7623c70cc5..38afd4cb09 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 47711da59d..7afeb9769d 100644 --- a/features/restconf/features-restconf/pom.xml +++ b/features/restconf/features-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml index a9984f8191..e337385aa2 100644 --- a/features/restconf/odl-mdsal-apidocs/pom.xml +++ b/features/restconf/odl-mdsal-apidocs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -27,7 +27,7 @@ org.opendaylight.odlparent odl-jackson-2.10 - 8.0.0 + 8.0.2 xml features diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml index 01bc756dd3..4f248ba727 100644 --- a/features/restconf/odl-restconf-all/pom.xml +++ b/features/restconf/odl-restconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index b2a34762c0..53085dc5da 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,21 +28,21 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.0 + 6.0.2 pom import org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml index 916f4a8e2b..3d8ef51376 100644 --- a/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 pom import diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml index ece2294238..7fa8fbcac8 100644 --- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -28,7 +28,7 @@ org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml index 969b8ee515..12707b5397 100644 --- a/features/restconf/odl-restconf/pom.xml +++ b/features/restconf/odl-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index c1662dbca5..9d020aec61 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index 958fc1db96..0c0a667ab6 100644 --- a/features/yanglib/features-yanglib/pom.xml +++ b/features/yanglib/features-yanglib/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 42542477d5..8dbd8fd96c 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index 46ecc03c32..910abe39e7 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 3c8cc26ff0..ea9c5a0c84 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 8.0.0 + 8.0.2 org.opendaylight.netconf diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index abae58096b..430b504ff5 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index 4985610b7d..61402a4e17 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.0 + 8.0.2 diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java index 135434552e..59916be1a9 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java @@ -93,7 +93,6 @@ import org.opendaylight.mdsal.dom.api.DOMService; import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl; import org.opendaylight.mdsal.dom.broker.DOMRpcRouter; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; -import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; @@ -275,8 +274,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest { masterSystem = ActorSystem.create(ACTOR_SYSTEM_NAME, ConfigFactory.load().getConfig("Master")); - masterClusterSingletonServiceProvider = new DOMClusterSingletonServiceProviderImpl( - new SimpleDOMEntityOwnershipService()); + masterClusterSingletonServiceProvider = new DOMClusterSingletonServiceProviderImpl(); masterClusterSingletonServiceProvider.initializeProvider(); doReturn(masterSystem).when(mockMasterActorSystemProvider).getActorSystem(); diff --git a/netconf/pom.xml b/netconf/pom.xml index c3378925c2..b8b6b35196 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml index 6fe023ad7d..694405b590 100644 --- a/netconf/shaded-exificient-jar/pom.xml +++ b/netconf/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.0 + 8.0.2 diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml index 8ba32c54e4..c31eff8934 100644 --- a/netconf/shaded-exificient/pom.xml +++ b/netconf/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.0 + 8.0.2 diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml index cbcd4b9a51..d74591e17c 100644 --- a/netconf/shaded-sshd-jar/pom.xml +++ b/netconf/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 8.0.0 + 8.0.2 diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml index e6d240766b..19d494e3e5 100644 --- a/netconf/shaded-sshd/pom.xml +++ b/netconf/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.0 + 8.0.2 diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index cdd4d146b5..3b58900b4f 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/parent/pom.xml b/parent/pom.xml index a497569582..197a2dfb77 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 7.0.1 + 7.0.3 @@ -32,14 +32,14 @@ org.opendaylight.controller bundle-parent - 3.0.1 + 3.0.3 pom import org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 pom import diff --git a/pom.xml b/pom.xml index b0d66e3a29..27a8a942ee 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/restconf/pom.xml b/restconf/pom.xml index 6c1937587a..efa7b831e2 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml index a1bafd6cf4..76453e88ef 100644 --- a/restconf/restconf-models/pom.xml +++ b/restconf/restconf-models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java index 8add32b987..114ddf8a08 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java @@ -456,7 +456,7 @@ public class BrokerFacade implements Closeable { // if commit failed it is global error LOG.error("Http Patch {} transaction commit has failed", patchContext.getPatchId()); status.setStatus(new PatchStatusContext(patchContext.getPatchId(), ImmutableList.copyOf(editCollection), - false, ImmutableList.of( + false, ImmutableList.of( new RestconfError(ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED, throwable.getMessage())))); waiter.countDown(); } diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index 11e6b5377d..17a60b25b3 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 -- 2.36.6