From: Robert Varga Date: Mon, 6 Apr 2020 11:25:15 +0000 (+0200) Subject: Remove references to sal-common-impl X-Git-Tag: release/aluminium~121 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dd39734d10f26749ec82835432b1dab3e37f7c3f;p=netconf.git Remove references to sal-common-impl We do not need anything from sal-common-impl, remove references to it. Change-Id: If99a707c8d3be10d3a491aff1d1564f14727926a Signed-off-by: Robert Varga --- diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml index 5c9e99524b..7921f94b63 100644 --- a/netconf/sal-netconf-connector/pom.xml +++ b/netconf/sal-netconf-connector/pom.xml @@ -134,11 +134,6 @@ test-jar test - - org.opendaylight.controller - sal-common-impl - test - org.hamcrest hamcrest-core diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java index 9236279dc4..a14c3a39e3 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java @@ -19,7 +19,6 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationException; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; @@ -42,7 +41,7 @@ public class ReadOnlyTxTest { private NormalizedNode mockedNode; @Before - public void setUp() throws DataNormalizationException { + public void setUp() { MockitoAnnotations.initMocks(this); doReturn(FluentFutures.immediateFluentFuture(new DefaultDOMRpcResult(mockedNode))).when(rpc) .invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml index a8f493862d..8e4949c050 100644 --- a/restconf/restconf-nb-rfc8040/pom.xml +++ b/restconf/restconf-nb-rfc8040/pom.xml @@ -97,10 +97,6 @@ org.opendaylight.mdsal mdsal-dom-spi - - org.opendaylight.controller - sal-common-impl - org.opendaylight.controller sal-common-util