Refactoring pom's name tag
Indenting pom's and running mvn tidy:pom to rearrange items
Issue-ID: CCSDK-3198
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735
diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml
index 50d4b23..e197c0a 100755
--- a/northbound/artifacts/pom.xml
+++ b/northbound/artifacts/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<description>CCSDK northbound components Bill of Materials (BOM)</description>
<url>https://wiki.onap.org</url>
<organization>
diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml
index cef565c..796cb27 100755
--- a/northbound/asdcApi/installer/pom.xml
+++ b/northbound/asdcApi/installer/pom.xml
@@ -1,134 +1,133 @@
<?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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.1</version>
- <relativePath/>
- </parent>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>2.1.1</version>
+ <relativePath/>
+ </parent>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>asdcApi-installer</artifactId>
- <version>1.2.1-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>asdcApi-installer</artifactId>
+ <version>1.2.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
- <properties>
- <application.name>ccsdk-asdcApi</application.name>
- <features.boot>${application.name}</features.boot>
+ <properties>
+ <application.name>ccsdk-asdcApi</application.name>
+ <features.boot>${application.name}</features.boot>
<features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
- <include.transitive.dependencies>false</include.transitive.dependencies>
- </properties>
+ <include.transitive.dependencies>false</include.transitive.dependencies>
+ </properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>asdcApi-model</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>asdcApi-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>asdcApi-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>maven-repo-zip</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <attach>true</attach>
+ <finalName>stage/${application.name}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>installer-zip</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <attach>true</attach>
+ <finalName>${application.name}-${project.version}-installer</finalName>
+ <descriptors>
+ <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <transitive>false</transitive>
+ <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <useRepositoryLayout>true</useRepositoryLayout>
+ <addParentPoms>false</addParentPoms>
+ <copyPom>false</copyPom>
+ <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
+ <scope>provided</scope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-version</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/stage</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/scripts</directory>
+ <includes>
+ <include>install-feature.sh</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>maven-repo-zip</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <attach>true</attach>
- <finalName>stage/${application.name}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
- </descriptors>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>installer-zip</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <attach>true</attach>
- <finalName>${application.name}-${project.version}-installer</finalName>
- <descriptors>
- <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <transitive>false</transitive>
- <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <useRepositoryLayout>true</useRepositoryLayout>
- <addParentPoms>false</addParentPoms>
- <copyPom>false</copyPom>
- <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
- <scope>provided</scope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-version</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${basedir}/target/stage</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources/scripts</directory>
- <includes>
- <include>install-feature.sh</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
+ </executions>
+ </plugin>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml
index e19f213..a214add 100755
--- a/northbound/asdcApi/model/pom.xml
+++ b/northbound/asdcApi/model/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencies>
@@ -23,6 +23,5 @@
<artifactId>rfc6991</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml
index fecbff0..c8debab 100755
--- a/northbound/asdcApi/pom.xml
+++ b/northbound/asdcApi/pom.xml
@@ -14,12 +14,11 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: asdcApi</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<modules>
<module>model</module>
<module>provider</module>
<module>installer</module>
</modules>
-
</project>
diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml
index a89adfb..347ecd3 100755
--- a/northbound/asdcApi/provider/pom.xml
+++ b/northbound/asdcApi/provider/pom.xml
@@ -14,18 +14,18 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@@ -59,10 +59,9 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-adapter</artifactId>
+ <artifactId>mdsal-binding-dom-adapter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml
index 551c5b7..0e4fb8d 100755
--- a/northbound/daexim-offsite-backup/installer/pom.xml
+++ b/northbound/daexim-offsite-backup/installer/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<properties>
<application.name>ccsdk-daexim-offsite-backup</application.name>
diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml
index a40283e..8edccbb 100755
--- a/northbound/daexim-offsite-backup/model/pom.xml
+++ b/northbound/daexim-offsite-backup/model/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
@@ -22,6 +22,5 @@
<artifactId>rfc6991</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml
index 0733e51..71af57c 100755
--- a/northbound/daexim-offsite-backup/pom.xml
+++ b/northbound/daexim-offsite-backup/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: daexim-offsite-backup</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<description>ODL feature used for transferring MD-SAL data to an offsite location.</description>
<modules>
diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml
index af8cd51..f661878 100755
--- a/northbound/daexim-offsite-backup/provider/pom.xml
+++ b/northbound/daexim-offsite-backup/provider/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
@@ -35,18 +35,18 @@
<artifactId>mdsal-binding-test-model</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.opendaylight.controller</groupId> -->
-<!-- <artifactId>sal-binding-broker-impl</artifactId> -->
-<!-- <scope>test</scope> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.opendaylight.controller</groupId> -->
-<!-- <artifactId>sal-binding-broker-impl</artifactId> -->
-<!-- <type>test-jar</type> -->
-<!-- <classifier>tests</classifier> -->
-<!-- <scope>test</scope> -->
-<!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.opendaylight.controller</groupId> -->
+ <!-- <artifactId>sal-binding-broker-impl</artifactId> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.opendaylight.controller</groupId> -->
+ <!-- <artifactId>sal-binding-broker-impl</artifactId> -->
+ <!-- <type>test-jar</type> -->
+ <!-- <classifier>tests</classifier> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -62,8 +62,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml
index 705bbff..849a3f3 100755
--- a/northbound/dataChange/installer/pom.xml
+++ b/northbound/dataChange/installer/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<properties>
<application.name>ccsdk-dataChange</application.name>
@@ -37,7 +37,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
<build>
diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml
index 4a4e6b5..8f21714 100755
--- a/northbound/dataChange/model/pom.xml
+++ b/northbound/dataChange/model/pom.xml
@@ -14,8 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
-
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
@@ -23,6 +22,5 @@
<artifactId>rfc6991</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml
index 0291e1b..2b64df3 100755
--- a/northbound/dataChange/pom.xml
+++ b/northbound/dataChange/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: dataChange</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<modules>
<module>model</module>
diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml
index e4f8aaf..9617e9a 100755
--- a/northbound/dataChange/provider/pom.xml
+++ b/northbound/dataChange/provider/pom.xml
@@ -14,18 +14,18 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@@ -58,18 +58,18 @@
<scope>test</scope>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.opendaylight.controller</groupId> -->
-<!-- <artifactId>sal-binding-broker-impl</artifactId> -->
-<!-- <scope>test</scope> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.opendaylight.controller</groupId> -->
-<!-- <artifactId>sal-binding-broker-impl</artifactId> -->
-<!-- <type>test-jar</type> -->
-<!-- <classifier>tests</classifier> -->
-<!-- <scope>test</scope> -->
-<!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.opendaylight.controller</groupId> -->
+ <!-- <artifactId>sal-binding-broker-impl</artifactId> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.opendaylight.controller</groupId> -->
+ <!-- <artifactId>sal-binding-broker-impl</artifactId> -->
+ <!-- <type>test-jar</type> -->
+ <!-- <classifier>tests</classifier> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml
index acb100b..84f6f99 100755
--- a/northbound/dmaap-listener/pom.xml
+++ b/northbound/dmaap-listener/pom.xml
@@ -6,6 +6,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>standalone-parent</artifactId>
<version>2.1.1</version>
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
@@ -13,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>ccsdk-sli-northbound :: dmaap-listener</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<description>DMAAP Listener</description>
<properties>
@@ -73,7 +74,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml
index efff465..dc1b9b2 100644
--- a/northbound/features/ccsdk-asdcApi/pom.xml
+++ b/northbound/features/ccsdk-asdcApi/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
<dependencies>
<dependency>
diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
index 8def7d8..ef207f2 100644
--- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
+++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
<dependencies>
<dependency>
diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml
index f993ec6..15fb23e 100644
--- a/northbound/features/ccsdk-dataChange/pom.xml
+++ b/northbound/features/ccsdk-dataChange/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
<dependencies>
diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml
index 3062e0f..af56788 100644
--- a/northbound/features/ccsdk-lcm/pom.xml
+++ b/northbound/features/ccsdk-lcm/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
<dependencies>
diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml
index 7ebc66d..7873fe4 100644
--- a/northbound/features/ccsdk-sli-northbound-all/pom.xml
+++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml
@@ -39,6 +39,5 @@
<classifier>features</classifier>
</dependency>
-
</dependencies>
</project>
diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml
index d1afadf..46f9902 100755
--- a/northbound/features/installer/pom.xml
+++ b/northbound/features/installer/pom.xml
@@ -77,7 +77,6 @@
</exclusions>
</dependency>
-
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>${application.name}</artifactId>
@@ -92,7 +91,6 @@
</exclusions>
</dependency>
-
</dependencies>
<build>
@@ -151,7 +149,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
+ <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
<scope>provided</scope>
</configuration>
</execution>
diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml
index 107aa68..0c453c6 100755
--- a/northbound/lcm/installer/pom.xml
+++ b/northbound/lcm/installer/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<properties>
<application.name>ccsdk-lcm</application.name>
@@ -36,7 +36,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
<build>
diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml
index a1a262c..51c6d01 100755
--- a/northbound/lcm/model/pom.xml
+++ b/northbound/lcm/model/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencies>
@@ -23,6 +23,5 @@
<artifactId>rfc6991</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml
index a8d70ae..35891a3 100755
--- a/northbound/lcm/pom.xml
+++ b/northbound/lcm/pom.xml
@@ -14,7 +14,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound :: lcm</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<modules>
<module>model</module>
diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml
index 7666fe2..65ab606 100755
--- a/northbound/lcm/provider/pom.xml
+++ b/northbound/lcm/provider/pom.xml
@@ -14,18 +14,18 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@@ -84,26 +84,26 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <MYSQL_USER>dummyUser</MYSQL_USER>
- <MYSQL_PASSWORD>dummyPassword</MYSQL_PASSWORD>
- <MYSQL_DATABASE>dummyDatabase</MYSQL_DATABASE>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <environmentVariables>
+ <MYSQL_USER>dummyUser</MYSQL_USER>
+ <MYSQL_PASSWORD>dummyPassword</MYSQL_PASSWORD>
+ <MYSQL_DATABASE>dummyDatabase</MYSQL_DATABASE>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
diff --git a/northbound/pom.xml b/northbound/pom.xml
index b49c05f..838d065 100644
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -13,7 +13,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sli-northbound</name>
+ <name>${project.artifactId}</name>
<description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description>
<url>https://wiki.onap.org</url>
<organization>
@@ -73,28 +73,27 @@
</property>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
+ <plugins>
+ <plugin>
+ <groupId>com.blackducksoftware.integration</groupId>
+ <artifactId>hub-maven-plugin</artifactId>
+ <version>1.4.0</version>
+ <inherited>false</inherited>
+ <configuration>
+ <hubProjectName>${project.name}</hubProjectName>
+ <outputDirectory>${project.basedir}</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-bdio-file</id>
+ <phase>package</phase>
+ <goals>
+ <goal>createHubOutput</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml
index ae854d4..7863dc8 100755
--- a/northbound/ueb-listener/pom.xml
+++ b/northbound/ueb-listener/pom.xml
@@ -13,7 +13,7 @@
<version>1.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>ccsdk-sli-northbound :: ueb-listener</name>
+ <name>ccsdk-sli-northbound :: ${project.artifactId}</name>
<description>UEB Listener</description>
<properties>
@@ -23,7 +23,7 @@
<build.number>${maven.build.timestamp}</build.number>
<SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
<sdc.client.version>1.4.1</sdc.client.version>
- <sdc.tosca.version>1.6.5</sdc.tosca.version>
+ <sdc.tosca.version>1.6.5</sdc.tosca.version>
</properties>
<dependencyManagement>
@@ -38,7 +38,6 @@
</dependencies>
</dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>