From 8848faeec4bb3d1ea8e3a27ff2f05e53a7183360 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Tue, 24 Aug 2021 12:44:47 +0200
Subject: [PATCH] Fix unused dependencies warnings after bump to P

JIRA: TRNSPRTPCE-435
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I904740e44c78f530126e4dd713443d5628ba09e4
---
 api/pom.xml               | 17 ++++++++++++-----
 common/pom.xml            | 27 +++++++++++++++++----------
 dmaap-client/pom.xml      |  9 +++++----
 nbinotifications/pom.xml  |  9 +++++----
 networkmodel/pom.xml      |  3 +--
 olm/pom.xml               |  5 +++++
 ordmodels/network/pom.xml |  6 +++++-
 pce/pom.xml               | 15 +++++----------
 renderer/pom.xml          |  9 ---------
 servicehandler/pom.xml    | 11 ++++++++---
 tapi/pom.xml              | 10 +++++-----
 test-common/pom.xml       | 18 ++++++------------
 12 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index a357270cc..9aab5d876 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,11 +32,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>transportpce-ordmodels-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-network</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}.ordmodels</groupId>
       <artifactId>transportpce-ordmodels-service</artifactId>
@@ -47,6 +42,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>transportpce-tapimodels</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/common/pom.xml b/common/pom.xml
index f43e28508..c8d8862e5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>transportpce-ordmodels-device</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}.ordmodels</groupId>
+            <artifactId>transportpce-ordmodels-network</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>transportpce-api</artifactId>
@@ -48,22 +53,24 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
+            <artifactId>mdsal-binding-dom-codec-spi</artifactId>
         </dependency>
-        <!-- Aluminium bump: undocumented new dependencies -->
-        <!-- dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-broker</artifactId>
-        </dependency-->
-        <!-- dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-        </dependency-->
+        <!-- Testing dependencies -->
         <dependency>
             <groupId>org.opendaylight.transportpce</groupId>
             <artifactId>test-common</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-runtime-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index 5e2316616..5360050a8 100644
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -40,10 +40,6 @@
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-proxy-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
@@ -53,6 +49,11 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <!-- Testing dependencies -->
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>
diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml
index 1e04e3539..4e7e6d23f 100644
--- a/nbinotifications/pom.xml
+++ b/nbinotifications/pom.xml
@@ -49,10 +49,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
         <!-- Testing Dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -60,6 +56,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 5753273a2..63227c6d9 100644
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -63,9 +63,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
+      <artifactId>mdsal-binding-generator</artifactId>
       <scope>test</scope>
-      <type>test-jar</type>
     </dependency>
   </dependencies>
 
diff --git a/olm/pom.xml b/olm/pom.xml
index 3f3c2456c..4b30a4f99 100644
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -30,6 +30,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+       <groupId>org.opendaylight.mdsal</groupId>
+       <artifactId>mdsal-binding-generator</artifactId>
+       <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 41a21e8cc..df168f2fe 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -42,7 +42,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- to upgrade topology to 4.1 -->
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc8345</artifactId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/pce/pom.xml b/pce/pom.xml
index 26b1c31b6..83dde8a29 100644
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -34,20 +34,10 @@
             <artifactId>jgrapht-core</artifactId>
             <version>1.2.0</version>
         </dependency>
-
-        <!-- Aluminium bump -->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-runtime-spi</artifactId>
         </dependency>
-
-        <!-- Sodium bump: javax.annotation.Nullable and friends -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -70,6 +60,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/renderer/pom.xml b/renderer/pom.xml
index facb28c59..34b9d20c5 100644
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -33,7 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>transportpce-networkmodel</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -41,14 +40,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <!-- Sodium bump: javax.annotation.Nullable and friends -->
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-        <optional>true</optional>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index f4eec6738..30586dd14 100644
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -30,6 +30,11 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <artifactId>transportpce-pce</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-renderer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
@@ -39,9 +44,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-renderer</artifactId>
-      <version>${project.version}</version>
+       <groupId>org.opendaylight.mdsal</groupId>
+       <artifactId>mdsal-binding-generator</artifactId>
+       <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/tapi/pom.xml b/tapi/pom.xml
index bab36e539..815baed43 100644
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -87,17 +87,17 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-renderer</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>test-common</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+       <groupId>org.opendaylight.mdsal</groupId>
+       <artifactId>mdsal-binding-generator</artifactId>
+       <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/test-common/pom.xml b/test-common/pom.xml
index a7c7bba02..34bd7d728 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -32,32 +32,26 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-device</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>transportpce-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-tapimodels</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-xml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-gson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
+            <artifactId>mdsal-binding-runtime-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator</artifactId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
         </dependency>
         <!-- Aluminium bump: undocumented new dependencies -->
         <dependency>
-- 
2.36.6