diff options
30 files changed, 6 insertions, 79 deletions
diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index bbce21e45..d161c9855 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -47,6 +47,5 @@ <type>xml</type> <classifier>features</classifier> </dependency> - </dependencies> </project> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 54467d420..4c1079bda 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -62,7 +62,6 @@ </exclusion> </exclusions> </dependency> - </dependencies> <build> diff --git a/lib/doorman/pom.xml b/lib/doorman/pom.xml index fca0a086b..f10a3235b 100644 --- a/lib/doorman/pom.xml +++ b/lib/doorman/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -13,10 +12,10 @@ <groupId>org.onap.ccsdk.features.lib.doorman</groupId> <artifactId>doorman</artifactId> + <name>ccsdk-features :: ${project.artifactId}</name> <description>Doorman - Request prioritization and aggregation queue</description> <dependencies> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -30,7 +29,6 @@ <artifactId>rlock</artifactId> <version>1.0.1-SNAPSHOT</version> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -47,6 +45,5 @@ <scope>test</scope> </dependency> - </dependencies> - + </dependencies> </project> diff --git a/lib/rlock/pom.xml b/lib/rlock/pom.xml index d116b6505..9a8a9b809 100644 --- a/lib/rlock/pom.xml +++ b/lib/rlock/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -13,15 +12,14 @@ <groupId>org.onap.ccsdk.features.lib.rlock</groupId> <artifactId>rlock</artifactId> + <name>ccsdk-features :: ${project.artifactId}</name> <description>Resource Lock - Distributed locking feature using database</description> <dependencies> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -38,6 +36,5 @@ <scope>test</scope> </dependency> - </dependencies> - + </dependencies> </project> 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 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>CMNotify-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>CMNotify-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ </dependency> </dependencies> </dependencyManagement> - <dependencies> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> @@ -116,7 +115,6 @@ <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-api</artifactId> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> @@ -159,7 +157,6 @@ <artifactId>testng</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> @@ -168,18 +165,9 @@ <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-api</artifactId> </dependency> - <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> </dependency> - - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>sal-binding-broker-impl</artifactId> - <type>test-jar</type> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> </dependencies> </project> 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 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>a1Adapter-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>a1Adapter-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> <dependencies> <dependency> @@ -47,7 +46,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> @@ -55,7 +53,6 @@ <type>pom</type> <scope>import</scope> </dependency> - </dependencies> </dependencyManagement> <dependencies> @@ -111,7 +108,6 @@ <artifactId>utils-provider</artifactId> <!-- <version>${sdnctl.sli.version}</version> --> </dependency> - </dependencies> <build> 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 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> <dependencies> <dependency> @@ -47,7 +46,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> @@ -55,7 +53,6 @@ <type>pom</type> <scope>import</scope> </dependency> - </dependencies> </dependencyManagement> <dependencies> @@ -97,7 +94,6 @@ <artifactId>jackson-core</artifactId> <version>2.9.8</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> @@ -113,7 +109,6 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> 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 @@ </dependencyManagement> --> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>oofpcipoc-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>oofpcipoc-provider</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>oofpcipoc-consumer</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991</artifactId> </dependency> - </dependencies> <build> 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 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> <dependencies> <dependency> @@ -55,12 +54,10 @@ <artifactId>oofpcipoc-model</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-api</artifactId> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> @@ -103,7 +100,6 @@ <artifactId>testng</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> @@ -112,19 +108,9 @@ <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-api</artifactId> </dependency> - <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> </dependency> - - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>sal-binding-broker-impl</artifactId> - <type>test-jar</type> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - </dependencies> </project> 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 @@ </dependencies> </dependencyManagement> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-apigateway-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ <artifactId>${application.name}-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> 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 @@ <artifactId>${application.name}-setup</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ <version>${project.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> 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 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <!-- end for testing --> <dependency> <groupId>${project.groupId}</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 @@ <scope>test</scope> </dependency> <dependency> - <artifactId>byte-buddy</artifactId> <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> <version>1.9.10</version> <scope>test</scope> </dependency> - <!-- end for testing --> <dependency> <groupId>${project.groupId}</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 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <!-- end for testing --> <dependency> <groupId>${project.groupId}</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 @@ <artifactId>jackson-databind</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> 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 @@ <name>ccsdk-features :: ${project.artifactId}</name> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-helpserver-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> 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 @@ <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId> <version>${project.version}</version> </dependency> - </dependencies> <build> 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 @@ </licenses> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-odlux-core-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> 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 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - </dependencies> <build> 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 @@ <artifactId>jetty-server</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> |