Clean poms after Chlorine bump

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1f587d7ff98f7f241bda9374eba96e97ba1d62bc

diff --git a/api/pom.xml b/api/pom.xml
index 4f6562816d39ca6c0319631cdf771441bcb66a33..41e2805738bf83783249d6f60e7f3db83b2228bd 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -47,10 +47,6 @@ 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.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
@@ -63,6 +59,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc8345-ietf-network-topology</artifactId>

diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index 0b1ff8940788eff9fd4a0b2d1146867cc915ebcd..cb3a12ef30db204bfdec806a02dc785f53f0e623 100644 (file)
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -60,10 +60,6 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.ext</groupId>
       <artifactId>jersey-proxy-client</artifactId>
@@ -88,6 +84,10 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
@@ -105,6 +105,11 @@
       <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-server</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -118,6 +123,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml
index 25c3dacd0bfda5f3d321e380fb37449d2a5e622b..d6647c9043c6e75273cb4a1a1c16ddbc0f6ac3e4 100644 (file)
--- a/nbinotifications/pom.xml
+++ b/nbinotifications/pom.xml
@@ -71,6 +71,10 @@
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index a845d2834a3b4e8dbbbf8017ed3bfefe23f8a1e8..1f8f00d5394492f250c4ff1ffcd3a00391936f00 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -161,7 +161,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf.model</groupId>
-      <artifactId>rfc6470</artifactId>
+      <artifactId>rfc5277</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 2bf7fd3f707bbe80e8f754041f78aef13305e074..bc091c0a42e38a9cc17c0204fead6fb9adc07ea0 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>bundle</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 673fe00a1b58267150c609ab42b733fb0cb32415..1bd590b146c1852513e791b31f0ab27538b07dad 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -39,10 +39,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>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 5bdf4f55a03b249ba21ef11627bf948db10d6730..819bc38491d1752bce7c59de871fc50682243bbf 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -27,10 +27,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>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 82b02102c81689c1fdfd4d596b5f168b76e528ea..5e4d4c6aec4895a22864d109f475e4c2194d1a9b 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -27,10 +27,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>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>

diff --git a/pce/pom.xml b/pce/pom.xml
index 7ed52d63a607acd27199d4691c92139f3bc5691f..63419124869e847da17eb129b9192d492fab90a1 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -130,22 +130,10 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>
@@ -171,6 +159,11 @@
       <artifactId>jgrapht-core</artifactId>
       <version>1.2.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+    </dependency>
+
 
     <!-- Testing Dependencies -->
     <dependency>

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 288376b7885d671ce38b3acd849d14be13776104..50169a07421708b5c541cd0443d503b9fafef49d 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -33,11 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <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}.ordmodels</groupId>
       <artifactId>transportpce-ordmodels-service</artifactId>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index dbe6a62a4c4d85d43ea5d978bafd28fa4920bc1c..a4390f427c162091ec26ca9c3ca328f4b50bce0b 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -30,11 +30,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <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>

diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index 234b9d5296d3c6724858f5c0c37327129c9d86b9..2332db230379527058205c4a349590b06e358ff7 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>bundle</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>concepts</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>