From 779d23c7ce3ddba0986bc7aa4ef8535b1d36c3c5 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 12 Aug 2020 18:42:35 -0400 Subject: Refactoring POMS running mvn tidy:pom and removing few duplicate dependencies Change-Id: I73144605f24c2d9cb524ab8bcdd6aebb5f0ec682 Issue-ID: CCSDK-2647 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/northbound/CMNotify/feature/pom.xml | 2 -- sdnr/northbound/CMNotify/installer/pom.xml | 2 -- sdnr/northbound/CMNotify/provider/pom.xml | 12 ------------ sdnr/northbound/a1Adapter/feature/pom.xml | 2 -- sdnr/northbound/a1Adapter/installer/pom.xml | 2 -- sdnr/northbound/a1Adapter/provider/pom.xml | 4 ---- sdnr/northbound/oofpcipoc/consumer/pom.xml | 5 ----- sdnr/northbound/oofpcipoc/feature/pom.xml | 2 -- sdnr/northbound/oofpcipoc/installer/pom.xml | 3 --- sdnr/northbound/oofpcipoc/model/pom.xml | 1 - sdnr/northbound/oofpcipoc/provider/pom.xml | 14 -------------- sdnr/wt/apigateway/feature/pom.xml | 2 -- sdnr/wt/apigateway/installer/pom.xml | 1 - sdnr/wt/apigateway/provider/pom.xml | 1 - sdnr/wt/data-provider/installer/pom.xml | 1 - sdnr/wt/data-provider/setup/pom.xml | 1 + sdnr/wt/devicemanager-onf/provider/pom.xml | 1 - sdnr/wt/devicemanager-openroadm/provider/pom.xml | 3 +-- sdnr/wt/devicemanager-oran/provider/pom.xml | 1 - sdnr/wt/devicemanager/provider/pom.xml | 1 - sdnr/wt/helpserver/feature/pom.xml | 2 -- sdnr/wt/helpserver/provider/pom.xml | 1 - sdnr/wt/odlux/apps/app-installer/pom.xml | 1 - sdnr/wt/odlux/core/features/pom.xml | 2 -- sdnr/wt/odlux/core/model/pom.xml | 1 - sdnr/wt/odlux/core/provider/pom.xml | 1 - 26 files changed, 2 insertions(+), 67 deletions(-) (limited to 'sdnr') diff --git a/sdnr/northbound/CMNotify/feature/pom.xml b/sdnr/northbound/CMNotify/feature/pom.xml index 2d6f2d8b7..8aa61e85f 100644 --- a/sdnr/northbound/CMNotify/feature/pom.xml +++ b/sdnr/northbound/CMNotify/feature/pom.xml @@ -38,12 +38,10 @@ ccsdk-features :: sdnr-northbound :: ${project.artifactId} - ${project.groupId} CMNotify-provider ${project.version} - diff --git a/sdnr/northbound/CMNotify/installer/pom.xml b/sdnr/northbound/CMNotify/installer/pom.xml index e63925132..b1e3d626f 100644 --- a/sdnr/northbound/CMNotify/installer/pom.xml +++ b/sdnr/northbound/CMNotify/installer/pom.xml @@ -57,13 +57,11 @@ - ${project.groupId} CMNotify-provider ${project.version} - diff --git a/sdnr/northbound/CMNotify/provider/pom.xml b/sdnr/northbound/CMNotify/provider/pom.xml index 3acb7fcc0..f4c964a34 100644 --- a/sdnr/northbound/CMNotify/provider/pom.xml +++ b/sdnr/northbound/CMNotify/provider/pom.xml @@ -58,7 +58,6 @@ - org.onap.ccsdk.features.sdnr.northbound @@ -116,7 +115,6 @@ org.opendaylight.controller sal-binding-api - org.onap.ccsdk.sli.core sli-common @@ -159,7 +157,6 @@ testng test - org.opendaylight.controller sal-common-util @@ -168,18 +165,9 @@ org.opendaylight.controller sal-core-api - org.opendaylight.yangtools yang-data-impl - - - org.opendaylight.controller - sal-binding-broker-impl - test-jar - tests - test - diff --git a/sdnr/northbound/a1Adapter/feature/pom.xml b/sdnr/northbound/a1Adapter/feature/pom.xml index a4a09bb48..0369d38b2 100644 --- a/sdnr/northbound/a1Adapter/feature/pom.xml +++ b/sdnr/northbound/a1Adapter/feature/pom.xml @@ -38,12 +38,10 @@ ccsdk-features :: sdnr-northbound :: ${project.artifactId} - ${project.groupId} a1Adapter-provider ${project.version} - diff --git a/sdnr/northbound/a1Adapter/installer/pom.xml b/sdnr/northbound/a1Adapter/installer/pom.xml index 4d1d85ef8..0dc280620 100644 --- a/sdnr/northbound/a1Adapter/installer/pom.xml +++ b/sdnr/northbound/a1Adapter/installer/pom.xml @@ -57,13 +57,11 @@ - ${project.groupId} a1Adapter-provider ${project.version} - diff --git a/sdnr/northbound/a1Adapter/provider/pom.xml b/sdnr/northbound/a1Adapter/provider/pom.xml index df8ae952f..1ea85a396 100644 --- a/sdnr/northbound/a1Adapter/provider/pom.xml +++ b/sdnr/northbound/a1Adapter/provider/pom.xml @@ -37,7 +37,6 @@ ccsdk-features :: sdnr-northbound :: ${project.artifactId} - @@ -47,7 +46,6 @@ pom import - org.onap.ccsdk.sli.core sli-core-artifacts @@ -55,7 +53,6 @@ pom import - @@ -111,7 +108,6 @@ utils-provider - diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 48fbf226e..d2a039eb4 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -37,7 +37,6 @@ ccsdk-features :: sdnr-northbound :: ${project.artifactId} - @@ -47,7 +46,6 @@ pom import - org.onap.ccsdk.sli.core sli-core-artifacts @@ -55,7 +53,6 @@ pom import - @@ -97,7 +94,6 @@ jackson-core 2.9.8 - com.fasterxml.jackson.core jackson-annotations @@ -113,7 +109,6 @@ mockito-core test - org.onap.ccsdk.sli.core sli-common diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml index 03ac91f67..b7d45db95 100644 --- a/sdnr/northbound/oofpcipoc/feature/pom.xml +++ b/sdnr/northbound/oofpcipoc/feature/pom.xml @@ -58,12 +58,10 @@ --> - ${project.groupId} oofpcipoc-provider ${project.version} - diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml index b16ac4d08..cd749d939 100644 --- a/sdnr/northbound/oofpcipoc/installer/pom.xml +++ b/sdnr/northbound/oofpcipoc/installer/pom.xml @@ -57,19 +57,16 @@ - ${project.groupId} oofpcipoc-provider ${project.version} - ${project.groupId} oofpcipoc-consumer ${project.version} - diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml index bec0ec2bb..39b51f96a 100644 --- a/sdnr/northbound/oofpcipoc/model/pom.xml +++ b/sdnr/northbound/oofpcipoc/model/pom.xml @@ -42,7 +42,6 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991 - diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index 03a770754..4a7ac1711 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -37,7 +37,6 @@ ccsdk-features :: sdnr-northbound :: ${project.artifactId} - @@ -55,12 +54,10 @@ oofpcipoc-model ${project.version} - org.opendaylight.controller sal-binding-api - org.onap.ccsdk.sli.core sli-common @@ -103,7 +100,6 @@ testng test - org.opendaylight.controller sal-common-util @@ -112,19 +108,9 @@ org.opendaylight.controller sal-core-api - org.opendaylight.yangtools yang-data-impl - - - org.opendaylight.controller - sal-binding-broker-impl - test-jar - tests - test - - diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 84e0e5404..18caada38 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -52,12 +52,10 @@ - ${project.groupId} sdnr-wt-apigateway-provider ${project.version} - diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index d32baa17c..c6a5234bd 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -62,7 +62,6 @@ ${application.name}-provider ${project.version} - diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index d043fdc9a..0ac7bafa7 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -67,7 +67,6 @@ mockito-core test - diff --git a/sdnr/wt/data-provider/installer/pom.xml b/sdnr/wt/data-provider/installer/pom.xml index 32d750028..88f64bfb7 100755 --- a/sdnr/wt/data-provider/installer/pom.xml +++ b/sdnr/wt/data-provider/installer/pom.xml @@ -69,7 +69,6 @@ ${application.name}-setup ${project.version} - diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml index c2c87b6c8..3bdcdd316 100644 --- a/sdnr/wt/data-provider/setup/pom.xml +++ b/sdnr/wt/data-provider/setup/pom.xml @@ -76,6 +76,7 @@ ${project.version} + diff --git a/sdnr/wt/devicemanager-onf/provider/pom.xml b/sdnr/wt/devicemanager-onf/provider/pom.xml index 9d03d7941..b8ace19da 100644 --- a/sdnr/wt/devicemanager-onf/provider/pom.xml +++ b/sdnr/wt/devicemanager-onf/provider/pom.xml @@ -60,7 +60,6 @@ mockito-core test - ${project.groupId} diff --git a/sdnr/wt/devicemanager-openroadm/provider/pom.xml b/sdnr/wt/devicemanager-openroadm/provider/pom.xml index d120276e1..5eeae51e0 100644 --- a/sdnr/wt/devicemanager-openroadm/provider/pom.xml +++ b/sdnr/wt/devicemanager-openroadm/provider/pom.xml @@ -60,12 +60,11 @@ test - byte-buddy net.bytebuddy + byte-buddy 1.9.10 test - ${project.groupId} diff --git a/sdnr/wt/devicemanager-oran/provider/pom.xml b/sdnr/wt/devicemanager-oran/provider/pom.xml index b59123ac8..15b201850 100644 --- a/sdnr/wt/devicemanager-oran/provider/pom.xml +++ b/sdnr/wt/devicemanager-oran/provider/pom.xml @@ -61,7 +61,6 @@ mockito-core test - ${project.groupId} diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index ade47b01f..9213024b7 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -153,7 +153,6 @@ jackson-databind provided - diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 4224e366d..e5b310d7d 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -41,12 +41,10 @@ ccsdk-features :: ${project.artifactId} - ${project.groupId} sdnr-wt-helpserver-provider ${project.version} - diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 2c5d1e4f2..8c64c47a4 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -70,7 +70,6 @@ mockito-core test - diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index b1cf403af..65ee9241c 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -122,7 +122,6 @@ sdnr-wt-odlux-app-configurationApp ${project.version} - diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index e888d27a9..5f17ea5df 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -47,12 +47,10 @@ - ${project.groupId} sdnr-wt-odlux-core-provider ${project.version} - diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index ef3bbfc48..39a09ffe1 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -56,7 +56,6 @@ org.slf4j slf4j-api - diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index 13395ebb7..afe14f4b1 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -59,7 +59,6 @@ jetty-server test - org.osgi org.osgi.core -- cgit 1.2.3-korg