From 57521b8187b48b4cff85cdd6422755ebe353f1d3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 16 Nov 2023 19:27:44 +0100
Subject: [PATCH] Cleanup netconf-console dependencies

We have a ton of warnings here, clean up -- most notably ditching
dependency on org.apache.karaf.shell.console.

Change-Id: Iea280b000d5e8b3f75285646c64a20933a851db5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 apps/netconf-console/pom.xml | 60 +++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/apps/netconf-console/pom.xml b/apps/netconf-console/pom.xml
index ae9c79588b..7fb47df9f2 100644
--- a/apps/netconf-console/pom.xml
+++ b/apps/netconf-console/pom.xml
@@ -20,12 +20,48 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>bundle</packaging>
 
   <dependencies>
-      <!-- Apache Karaf console dependency -->
+      <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>com.guicedee.services</groupId>
+          <artifactId>javax.inject</artifactId>
+          <optional>true</optional>
+      </dependency>
       <dependency>
           <groupId>org.apache.karaf.shell</groupId>
-          <artifactId>org.apache.karaf.shell.console</artifactId>
+          <artifactId>org.apache.karaf.shell.core</artifactId>
           <scope>provided</scope>
       </dependency>
+      <dependency>
+          <groupId>org.eclipse.jdt</groupId>
+          <artifactId>org.eclipse.jdt.annotation</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-common</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-api</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-common-api</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>yang-binding</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+          <artifactId>rfc6991-ietf-inet-types</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>ietf-topology</artifactId>
+      </dependency>
       <dependency>
           <groupId>org.opendaylight.netconf</groupId>
           <artifactId>netconf-topology</artifactId>
@@ -34,11 +70,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           <groupId>org.opendaylight.netconf</groupId>
           <artifactId>netconf-client-mdsal</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.guicedee.services</groupId>
-          <artifactId>javax.inject</artifactId>
-          <optional>true</optional>
-      </dependency>
       <dependency>
           <groupId>org.osgi</groupId>
           <artifactId>org.osgi.service.component.annotations</artifactId>
@@ -48,6 +79,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-test-util</artifactId>
       </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-dom-adapter</artifactId>
+          <type>test-jar</type>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-runtime-api</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-runtime-spi</artifactId>
+          <scope>test</scope>
+      </dependency>
       <dependency>
           <groupId>org.opendaylight.mdsal</groupId>
           <artifactId>mdsal-binding-test-utils</artifactId>
-- 
2.36.6