From: Robert Varga Date: Fri, 25 Jun 2021 15:00:49 +0000 (+0200) Subject: Fixup MD-SAL breakages X-Git-Tag: v2.0.0~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c35d7b529e5def780036cd0a77a79feae80444a7;p=netconf.git Fixup MD-SAL breakages There are a few last-minute breaking changes coming from MD-SAL, make sure we adapt to them. Also use released artifacts, so we should be fine until we use snapshots again. Change-Id: I12a44b2041fc47a824c039dddfdb21e3ebc8be17 Signed-off-by: Robert Varga --- diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index f73ac0d6b5..4b6b4f0e8d 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -69,7 +69,7 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl + mdsal-binding-generator test diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml index e398a48dbf..884edafaa0 100644 --- a/netconf/netconf-util/pom.xml +++ b/netconf/netconf-util/pom.xml @@ -78,7 +78,7 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl + mdsal-binding-generator test diff --git a/parent/pom.xml b/parent/pom.xml index 3c8295d299..4afc43385b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 8.0.0-SNAPSHOT + 8.0.0 diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java index eeeccc6cc4..da973ccb91 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java @@ -79,6 +79,11 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements Cluster this.controllerContext = controllerContext; } + @Override + public void onInitialData() { + // No-op + } + @Override public void onDataTreeChanged(final Collection dataTreeCandidates) { final Instant now = Instant.now(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java index 8e3de8fde7..06797690b6 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java @@ -90,6 +90,11 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements Cluster } } + @Override + public void onInitialData() { + // No-op + } + @Override @SuppressWarnings("checkstyle:IllegalCatch") public void onDataTreeChanged(final Collection dataTreeCandidates) {