From 227ba03df57b64f68a22c7580d7403c246257c81 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 7 Jan 2024 19:06:32 +0100
Subject: [PATCH] Cleanup dependencies

The movement of {Yin,Yang}TextSource has implications on dependencies,
clean them up.

JIRA: YANGTOOLS-1561
Change-Id: I4bdc5522b8a4135352a8de494f36ecbf3a11531d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 plugin/plugin-generator-api/pom.xml            |  4 ----
 .../src/main/java/module-info.java             |  1 -
 tools/yang-validation-tool/pom.xml             | 18 +++++++++---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/plugin/plugin-generator-api/pom.xml b/plugin/plugin-generator-api/pom.xml
index dcd59024b6..d846ebe3c8 100644
--- a/plugin/plugin-generator-api/pom.xml
+++ b/plugin/plugin-generator-api/pom.xml
@@ -38,10 +38,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-spi</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
diff --git a/plugin/plugin-generator-api/src/main/java/module-info.java b/plugin/plugin-generator-api/src/main/java/module-info.java
index 9d83c314d5..fa9aab7421 100644
--- a/plugin/plugin-generator-api/src/main/java/module-info.java
+++ b/plugin/plugin-generator-api/src/main/java/module-info.java
@@ -10,7 +10,6 @@ module org.opendaylight.yangtools.plugin.generator.api {
 
     requires transitive com.google.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.model.spi;
     requires transitive org.opendaylight.yangtools.concepts;
 
     // Annotations
diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml
index b5519b63c4..fd6d5cfc02 100644
--- a/tools/yang-validation-tool/pom.xml
+++ b/tools/yang-validation-tool/pom.xml
@@ -34,25 +34,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-test-util</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-test-util</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-- 
2.36.6