From e513a4dc2b737c78b7251ab508fdb31ea23cd549 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 14 Nov 2023 15:28:12 +0100
Subject: [PATCH] Clean up dependencies

Propagate JDT annotation dependency, re-enabling dependency enforcement
where applicable.

Change-Id: I56e4e914c59392c553f3c62979f9e47ca15a8280
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 bgp/cli/pom.xml                     | 16 ++++++-------
 bmp/bmp-mock/pom.xml                | 35 +++++++++++++++--------------
 bmp/bmp-spi/pom.xml                 | 12 ++++++----
 pcep/impl/pom.xml                   |  4 ++--
 pcep/topology/cli/pom.xml           | 17 +++++++-------
 pcep/tunnel/tunnel-provider/pom.xml | 24 ++++++++++----------
 rsvp/spi/pom.xml                    |  8 +++----
 7 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml
index d4d87f4bcf..3f0acd0ce2 100644
--- a/bgp/cli/pom.xml
+++ b/bgp/cli/pom.xml
@@ -24,15 +24,19 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-openconfig-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
@@ -67,10 +71,6 @@
             <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
 
         <!--Test dependencies-->
         <dependency>
diff --git a/bmp/bmp-mock/pom.xml b/bmp/bmp-mock/pom.xml
index 186545d7cc..68fbefbc35 100644
--- a/bmp/bmp-mock/pom.xml
+++ b/bmp/bmp-mock/pom.xml
@@ -61,17 +61,14 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-inet-types</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -82,21 +79,25 @@
             <artifactId>netty-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>net.sourceforge.argparse4j</groupId>
+            <artifactId>argparse4j</artifactId>
+            <version>0.9.0</version>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.argparse4j</groupId>
-            <artifactId>argparse4j</artifactId>
-            <version>0.9.0</version>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/bmp/bmp-spi/pom.xml b/bmp/bmp-spi/pom.xml
index 8a5e500367..9c4e620c35 100644
--- a/bmp/bmp-spi/pom.xml
+++ b/bmp/bmp-spi/pom.xml
@@ -45,16 +45,20 @@
             <artifactId>bgp-concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 4eb4490a9f..e06b5fe741 100644
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -98,8 +98,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/pcep/topology/cli/pom.xml b/pcep/topology/cli/pom.xml
index 8bbec0d7fb..7cc7bedc17 100644
--- a/pcep/topology/cli/pom.xml
+++ b/pcep/topology/cli/pom.xml
@@ -24,15 +24,19 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
@@ -71,10 +75,7 @@
             <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
+
         <!--Test dependencies-->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
diff --git a/pcep/tunnel/tunnel-provider/pom.xml b/pcep/tunnel/tunnel-provider/pom.xml
index 6272ebf196..2363fb8d59 100644
--- a/pcep/tunnel/tunnel-provider/pom.xml
+++ b/pcep/tunnel/tunnel-provider/pom.xml
@@ -24,10 +24,6 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -82,6 +78,18 @@
             <artifactId>rsvp-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
@@ -114,14 +122,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.framework</artifactId>
diff --git a/rsvp/spi/pom.xml b/rsvp/spi/pom.xml
index eaa754e263..d7298dfb2c 100644
--- a/rsvp/spi/pom.xml
+++ b/rsvp/spi/pom.xml
@@ -23,10 +23,6 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -44,6 +40,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
-- 
2.36.6