From b6e7ff6ca2774daf7af3e68b97172ae465d70a3a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 29 May 2020 14:25:27 +0200
Subject: [PATCH] Drop mdsal-binding-dom-adapter's dependency on in-memory
 datastore

We do not want to be pulling in in-memory datastore just for the
sake of making test-jar work. Now that we binding-test-utils, which
downstreams can nicely depend on, we can express the test-jar
dependency in a reasonable way.

This has the effect of removing the mdsal-dom-inmemory-datastore
from odl-mdsal-binding-dom-adapter.

JIRA: MDSAL-559
Change-Id: I723285a77e0d48ca36cce4d21fffbbcf2c2e9e25
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/mdsal-binding-dom-adapter/pom.xml | 22 +++++++++++-----------
 binding/mdsal-binding-test-utils/pom.xml  | 16 +++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index 8fc4b9a21f..21159c6b90 100644
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -32,11 +32,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-broker</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-api</artifactId>
@@ -76,10 +71,6 @@
             <artifactId>osgi.cmpn</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-test-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-impl</artifactId>
@@ -92,12 +83,21 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-test-model</artifactId>
+            <artifactId>mdsal-dom-broker</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-            <!-- scope=compile to make test-jar work -->
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-test-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-test-model</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 2c2f6a306a..aefc46dded 100644
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -49,6 +49,7 @@
             <scope>compile</scope>
             <version>1.3.1</version>
         </dependency>
+
         <dependency>
             <groupId>io.github.java-diff-utils</groupId>
             <artifactId>java-diff-utils</artifactId>
@@ -74,34 +75,27 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
             <type>test-jar</type>
+            <!-- We are building on top of abstract test classes -->
             <scope>compile</scope>
         </dependency>
-        <!-- The following are dependencies which are listed
-             as scope test in mdsal-binding-dom-adapter; we
-             wanted most of them as scope compile here...      -->
+        <!-- For testing purposes we want to bring in also implementation
+             artifacts -->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-broker</artifactId>
         </dependency>
-
-        <!-- The following, contrary to the above, ARE <scope>test,
-             because they are only required by the test utilities
-             self test code in src/test, but not (necessarily)
-             by a downstream consumer of the test utilities.   -->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-            <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-model</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
-- 
2.36.6