From 8f40b77529ca9a1dcd19128992986f3e7b8fa4fc Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 12 Sep 2022 21:09:50 +0200 Subject: [PATCH] Clean poms after Chlorine bump Signed-off-by: guillaume.lambert Change-Id: I1f587d7ff98f7f241bda9374eba96e97ba1d62bc --- api/pom.xml | 8 ++++---- dmaap-client/pom.xml | 14 ++++++++++---- nbinotifications/pom.xml | 4 ++++ networkmodel/pom.xml | 2 +- ordmodels/common/pom.xml | 4 ---- ordmodels/device/pom.xml | 4 ---- ordmodels/network/pom.xml | 4 ---- ordmodels/service/pom.xml | 4 ---- pce/pom.xml | 17 +++++------------ renderer/pom.xml | 5 ----- servicehandler/pom.xml | 5 ----- tapimodels/pom.xml | 4 ---- 12 files changed, 24 insertions(+), 51 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4f6562816..41e280573 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -47,10 +47,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html transportpce-tapimodels ${project.version} - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common @@ -63,6 +59,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-yang-types + + org.opendaylight.mdsal.binding.model.ietf + rfc8345-ietf-network + org.opendaylight.mdsal.binding.model.ietf rfc8345-ietf-network-topology diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index 0b1ff8940..cb3a12ef3 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -60,10 +60,6 @@ org.glassfish.jersey.core jersey-client - - org.glassfish.jersey.core - jersey-server - org.glassfish.jersey.ext jersey-proxy-client @@ -88,6 +84,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 + + jakarta.ws.rs + jakarta.ws.rs-api + @@ -105,6 +105,11 @@ jersey-test-framework-provider-grizzly2 test + + org.glassfish.jersey.core + jersey-server + test + org.mockito mockito-core @@ -118,6 +123,7 @@ ch.qos.logback logback-core + test diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index 25c3dacd0..d6647c904 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -71,6 +71,10 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-common-api + org.opendaylight.mdsal mdsal-binding-api diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index a845d2834..1f8f00d53 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -161,7 +161,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf.model - rfc6470 + rfc5277 org.opendaylight.netconf diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 2bf7fd3f7..bc091c0a4 100644 --- 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 bundle - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 673fe00a1..1bd590b14 100644 --- 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 transportpce-ordmodels-common ${project.version} - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index 5bdf4f55a..819bc3849 100644 --- 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 transportpce-ordmodels-common ${project.version} - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index 82b02102c..5e4d4c6ae 100644 --- 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 transportpce-ordmodels-common ${project.version} - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common diff --git a/pce/pom.xml b/pce/pom.xml index 7ed52d63a..634191248 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -130,22 +130,10 @@ com.google.code.gson gson - - com.fasterxml.jackson.core - jackson-databind - com.fasterxml.jackson.core jackson-annotations - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - org.glassfish.jersey.core jersey-common @@ -171,6 +159,11 @@ jgrapht-core 1.2.0 + + jakarta.ws.rs + jakarta.ws.rs-api + + diff --git a/renderer/pom.xml b/renderer/pom.xml index 288376b78..50169a074 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -33,11 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html transportpce-ordmodels-device ${project.version} - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - ${project.groupId}.ordmodels transportpce-ordmodels-service diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index dbe6a62a4..a4390f427 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -30,11 +30,6 @@ Author: Martial Coulibaly on behalf of Orange transportpce-ordmodels-common ${project.version} - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - ${project.groupId}.ordmodels transportpce-ordmodels-service diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml index 234b9d529..2332db230 100644 --- a/tapimodels/pom.xml +++ b/tapimodels/pom.xml @@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle - - org.opendaylight.yangtools - concepts - org.opendaylight.yangtools yang-common -- 2.36.6