From f1e02fd8577e35a3035e72dc580aae0266111f6b Mon Sep 17 00:00:00 2001
From: Faseela K <faseela.k@ericsson.com>
Date: Thu, 12 Apr 2018 20:53:30 +0530
Subject: [PATCH] wrong feature dependencies in newly added features.

Change-Id: Ie592de3ee8f6ba01c86e7d411dad8d5c411cf59c
Signed-off-by: Faseela K <faseela.k@ericsson.com>
---
 features/odl-genius-tools/pom.xml             | 17 ++++--
 features/odl-genius/pom.xml                   | 16 +++---
 srm/shell/pom.xml                             |  5 --
 .../genius/srm/shell/SrmDebugCommand.java     | 10 ++--
 tools/api/pom.xml                             | 52 ++-----------------
 tools/testutils/pom.xml                       |  1 +
 6 files changed, 30 insertions(+), 71 deletions(-)

diff --git a/features/odl-genius-tools/pom.xml b/features/odl-genius-tools/pom.xml
index 35918cfda..0d5211a25 100644
--- a/features/odl-genius-tools/pom.xml
+++ b/features/odl-genius-tools/pom.xml
@@ -25,13 +25,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>tools-api</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-metrics</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
-      <artifactId>tools-testutils</artifactId>
+      <artifactId>tools-api</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index caf6dae8f..6804dfe54 100644
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -51,6 +51,12 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>odl-genius-srm</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>odl-infrautils-diagstatus</artifactId>
@@ -204,15 +210,5 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>srm-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>srm-shell</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/srm/shell/pom.xml b/srm/shell/pom.xml
index 32cfd78ca..6327ba307 100644
--- a/srm/shell/pom.xml
+++ b/srm/shell/pom.xml
@@ -25,11 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: genius :: ${project.artifactId}</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>mdsalutil-api</artifactId>
-      <version>${genius.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>srm-api</artifactId>
diff --git a/srm/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmDebugCommand.java b/srm/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmDebugCommand.java
index fbc57826e..176a8d320 100644
--- a/srm/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmDebugCommand.java
+++ b/srm/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmDebugCommand.java
@@ -12,8 +12,8 @@ import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.ops.rev170711.ServiceOps;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
@@ -24,10 +24,10 @@ public class SrmDebugCommand extends OsgiCommandSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(SrmDebugCommand.class);
 
-    private final SingleTransactionDataBroker txDataBroker;
+    private final DataBroker txDataBroker;
 
     public SrmDebugCommand(DataBroker dataBroker) {
-        this.txDataBroker = new SingleTransactionDataBroker(dataBroker);
+        this.txDataBroker = dataBroker;
     }
 
     @Option(name = "-c", aliases = {"--clear-ops"}, description = "Clear operations DS",
@@ -44,7 +44,9 @@ public class SrmDebugCommand extends OsgiCommandSupport {
 
     private void clearOpsDs() throws Exception {
         InstanceIdentifier<ServiceOps> path = getInstanceIdentifier();
-        txDataBroker.syncDelete(LogicalDatastoreType.OPERATIONAL, path);
+        WriteTransaction tx = txDataBroker.newWriteOnlyTransaction();
+        tx.delete(LogicalDatastoreType.OPERATIONAL, path);
+        tx.submit();
     }
 
     private static InstanceIdentifier<ServiceOps> getInstanceIdentifier() {
diff --git a/tools/api/pom.xml b/tools/api/pom.xml
index ffa7ccf3c..2e2b8d668 100644
--- a/tools/api/pom.xml
+++ b/tools/api/pom.xml
@@ -34,11 +34,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>inject</artifactId>
-      <version>${genius.infrautils.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>metrics-api</artifactId>
@@ -49,6 +44,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>infrautils-util</artifactId>
       <version>${genius.infrautils.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>value</artifactId>
@@ -62,48 +61,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>pax-cdi-api</artifactId>
       <optional>true</optional>
     </dependency>
-
-    <!-- Dependencies with <scope>test -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>testutils</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-test-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-    </dependency>
-    <dependency>
-       <groupId>org.opendaylight.controller</groupId>
-       <artifactId>sal-binding-broker-impl</artifactId>
-       <scope>test</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.controller</groupId>
-       <artifactId>sal-binding-broker-impl</artifactId>
-       <scope>test</scope>
-       <type>test-jar</type>
-     </dependency>
   </dependencies>
 </project>
diff --git a/tools/testutils/pom.xml b/tools/testutils/pom.xml
index 04dcf5830..e8664b133 100644
--- a/tools/testutils/pom.xml
+++ b/tools/testutils/pom.xml
@@ -70,6 +70,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
       <version>1.4.0-SNAPSHOT</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>
-- 
2.36.6