From 821763bf4d311006af9aed421cb907e40a2659cc Mon Sep 17 00:00:00 2001
From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Fri, 5 Aug 2022 09:10:23 +0200
Subject: [PATCH] Adapt some dependencies to Chlorine

- remove outdated dependencies (javax.ws.rs-api,
  odl-restconf-nb-bierman02)
- migrate some dependencies (ietf-netconf per rfc6241,
  ietf-netconf-notifications per rfc6470)

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I47015e32bc5cc7d12f1a19b05502f702869e4458
---
 dmaap-client/pom.xml              | 4 ----
 features/odl-transportpce/pom.xml | 6 ------
 networkmodel/pom.xml              | 8 ++++----
 ordmodels/device/pom.xml          | 4 ++--
 pce/pom.xml                       | 4 ----
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index 5209a62b1..0b1ff8940 100644
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -88,10 +88,6 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 5ed7dd2e2..9e21107bd 100644
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -101,12 +101,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-restconf-nb-bierman02</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>odl-netconf-connector</artifactId>
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 0c55dd57d..a845d2834 100644
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -156,12 +156,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mdsal-binding-runtime-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6241</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf-notifications</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6470</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index ad79c2e3e..673fe00a1 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -60,8 +60,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf</artifactId>
+      <groupId>org.opendaylight.netconf.model</groupId>
+      <artifactId>rfc6241</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/pce/pom.xml b/pce/pom.xml
index 7732284a8..7ed52d63a 100644
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -146,10 +146,6 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>
-- 
2.36.6