CLeaning up moved modules and running mvn tidy:pom

Issue-ID: SDNC-1582 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I0ba59010d54d2a379d794beeb7d21b601ac1abf4
author: Singal, Kapil (ks220y) <ks220y@att.com> 2021-07-09 08:48:33 -0400
committer: Singal, Kapil (ks220y) <ks220y@att.com> 2021-07-09 08:48:33 -0400
commit: 0f1a3db830b43cdf7e366b8a92609187c32370ac (patch)
tree: cba02e218f414fc4a6b8a8da3c519b63a3aef12d
parent: 6267cfea5bf17f62c6491318ff2827b8cacfd0b4 (diff)
38 files changed, 675 insertions, 1014 deletions
diff --git a/asdcApi/.gitignore b/asdcApi/.gitignore
deleted file mode 100755
index b73caf31..00000000
--- a/asdcApi/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-#####standard .git ignore entries#####
-
-## IDE Specific Files ##
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-workspace
-
-## Compilation Files ##
-*.class
-**/target
-target
-target-ide
-MANIFEST.MF
-
-## Misc Ignores (OS specific etc) ##
-bin/
-dist
-*~
-*.ipr
-*.iml
-*.iws
-classes
-out/
-.DS_STORE
-.metadata
-
-## Folders which contain auto generated source code ##
-yang-gen-config
-yang-gen-sal
diff --git a/asdcApi/README.md b/asdcApi/README.md
deleted file mode 100644
index acef0674..00000000
--- a/asdcApi/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-ASDCAPI MOVED TO CCSDK!
-
-The code for asdcApi moved to the ccsdk/sli/northbound repository
diff --git a/dataChange/.gitignore b/dataChange/.gitignore
deleted file mode 100755
index b73caf31..00000000
--- a/dataChange/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-#####standard .git ignore entries#####
-
-## IDE Specific Files ##
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-workspace
-
-## Compilation Files ##
-*.class
-**/target
-target
-target-ide
-MANIFEST.MF
-
-## Misc Ignores (OS specific etc) ##
-bin/
-dist
-*~
-*.ipr
-*.iml
-*.iws
-classes
-out/
-.DS_STORE
-.metadata
-
-## Folders which contain auto generated source code ##
-yang-gen-config
-yang-gen-sal
diff --git a/dataChange/.sonar/checkstyle.xml b/dataChange/.sonar/checkstyle.xml
deleted file mode 100755
index 3fa23153..00000000
--- a/dataChange/.sonar/checkstyle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
-\ No newline at end of file
diff --git a/dataChange/.sonar/pmd.xml b/dataChange/.sonar/pmd.xml
deleted file mode 100755
index 80343b3b..00000000
--- a/dataChange/.sonar/pmd.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset>
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">
-    <priority>5</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">
-    <priority>3</priority>
-  </rule>
-</ruleset>
-
diff --git a/dataChange/README.md b/dataChange/README.md
deleted file mode 100644
index c0a1dcb3..00000000
--- a/dataChange/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-DATACHANGE MOVED TO CCSDK!
-
-The code for dataChange moved to the ccsdk/sli/northbound repository
diff --git a/dmaap-listener/.gitignore b/dmaap-listener/.gitignore
deleted file mode 100755
index 1b8a6ba9..00000000
--- a/dmaap-listener/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-*.class
-target/
-MANIFEST.MF
-.DS_STORE
-.metadata
diff --git a/dmaap-listener/.sonar/checkstyle.xml b/dmaap-listener/.sonar/checkstyle.xml
deleted file mode 100755
index 3fa23153..00000000
--- a/dmaap-listener/.sonar/checkstyle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
-\ No newline at end of file
diff --git a/dmaap-listener/.sonar/pmd.xml b/dmaap-listener/.sonar/pmd.xml
deleted file mode 100755
index 80343b3b..00000000
--- a/dmaap-listener/.sonar/pmd.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset>
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">
-    <priority>5</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">
-    <priority>3</priority>
-  </rule>
-</ruleset>
-
diff --git a/dmaap-listener/README.md b/dmaap-listener/README.md
deleted file mode 100644
index ed067b1a..00000000
--- a/dmaap-listener/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-DMAAP-LISTENER MOVED TO CCSDK!
-
-The code for dmaap-listener moved to the ccsdk/sli/northbound repository
diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml
index 2902c9b4..dfa33e6b 100644
--- a/features/features-sdnc-northbound/pom.xml
+++ b/features/features-sdnc-northbound/pom.xml
@@ -24,6 +24,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 8a1bb46a..800ac8f7 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -1,136 +1,132 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound-features-installer</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-features-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: features :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: features :: ${project.artifactId}</name>
 
-	<properties>
-		<application.name>sdnc-northbound-all</application.name>
-		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
-		<include.transitive.dependencies>false</include.transitive.dependencies>
-	</properties>
+    <properties>
+        <application.name>sdnc-northbound-all</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-	<dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
-			<artifactId>${application.name}</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<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.sdnc.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>
-
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <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.sdnc.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>
+        </plugins>
+    </build>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 4b79fd3e..aa9e6fe6 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,22 +1,22 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound-feature-aggregator</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-feature-aggregator</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: features</name>
+    <name>sdnc-northbound :: features</name>
 
-	<modules>
+    <modules>
         <module>sdnc-northbound-all</module>
         <module>features-sdnc-northbound</module>
         <module>installer</module>
diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml
index fb9411ba..39318423 100644
--- a/features/sdnc-northbound-all/pom.xml
+++ b/features/sdnc-northbound-all/pom.xml
@@ -1,55 +1,53 @@
 <?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>single-feature-parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound-all</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-all</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-	<name>sdnc-northbound :: features :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: features :: ${project.artifactId}</name>
 
-	<dependencyManagement>
-	    <dependencies>
-	    	<dependency>
-  <groupId>org.onap.ccsdk.sli.core</groupId>
-  <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
-  <type>pom</type>
-  <scope>import</scope>
-	    	</dependency>
-	    </dependencies>
-	</dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sdnc-generic-resource-api</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-                <dependency>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>sdnc-optical-service</artifactId>
-                        <version>${project.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sdnc-vnftools</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-
-	
-	</dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-core-artifacts</artifactId>
+                <version>${ccsdk.sli.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-generic-resource-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-optical-service</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-vnftools</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml
index 35a400da..36cda5a5 100644
--- a/generic-resource-api/client/pom.xml
+++ b/generic-resource-api/client/pom.xml
@@ -20,6 +20,7 @@
     <properties>
         <api.name>generic-resource</api.name>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -27,6 +28,7 @@
             <version>1.0</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml
index c8dcc505..bd846110 100644
--- a/generic-resource-api/features/features-generic-resource-api/pom.xml
+++ b/generic-resource-api/features/features-generic-resource-api/pom.xml
@@ -1,29 +1,28 @@
 <?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>feature-repo-parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>features-generic-resource-api</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>features-generic-resource-api</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-	<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sdnc-generic-resource-api</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-generic-resource-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
index 8acb44a8..57e69c72 100644
--- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
+++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -40,6 +40,5 @@
             <artifactId>generic-resource-api-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml
index 2f64fe25..60281ffe 100755
--- a/generic-resource-api/installer/pom.xml
+++ b/generic-resource-api/installer/pom.xml
@@ -1,142 +1,137 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>generic-resource-api-installer</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-	<properties>
-		<application.name>sdnc-generic-resource-api</application.name>
-		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
-		<include.transitive.dependencies>false</include.transitive.dependencies>
-	</properties>
+    <properties>
+        <application.name>sdnc-generic-resource-api</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-	<dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>generic-resource-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
-			<artifactId>${application.name}</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
-			<artifactId>generic-resource-api-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-
-	</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>
-						</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.sdnc.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>
-
-		</plugins>
-	</build>
+    <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>
+                        </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.sdnc.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>
+        </plugins>
+    </build>
 </project>
diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
index 792fe04a..4d49bbb8 100644
--- a/generic-resource-api/model/pom.xml
+++ b/generic-resource-api/model/pom.xml
@@ -1,23 +1,23 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>generic-resource-api-model</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-model</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-	<modules>
-		<module>yang</module>
-		<module>swagger</module>
-	</modules>
+    <modules>
+        <module>yang</module>
+        <module>swagger</module>
+    </modules>
 </project>
diff --git a/generic-resource-api/model/swagger/pom.xml b/generic-resource-api/model/swagger/pom.xml
index 871c7444..4b0ce29b 100644
--- a/generic-resource-api/model/swagger/pom.xml
+++ b/generic-resource-api/model/swagger/pom.xml
@@ -29,7 +29,7 @@
             <artifactId>generic-resource-api-model-yang</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- End this is where the yang comes from -->        
+        <!-- End this is where the yang comes from -->
     </dependencies>
 
     <repositories>
@@ -52,7 +52,9 @@
                 <configuration>
                     <outputDirectory>${project.build.directory}/dependency</outputDirectory>
                     <includes>**\/*.yang</includes>
-                    <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds>
+                    <includeGroupIds>
+                        org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound
+                    </includeGroupIds>
                 </configuration>
                 <executions>
                     <execution>
@@ -145,7 +147,8 @@
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/json</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
@@ -169,7 +172,8 @@
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/yaml</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
@@ -213,7 +217,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-             <plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>1.10</version>
diff --git a/generic-resource-api/model/yang/pom.xml b/generic-resource-api/model/yang/pom.xml
index 7dbf48be..8ac6c405 100644
--- a/generic-resource-api/model/yang/pom.xml
+++ b/generic-resource-api/model/yang/pom.xml
@@ -21,8 +21,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 
     <build>
diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml
index 61c65498..a84a8272 100644
--- a/generic-resource-api/pom.xml
+++ b/generic-resource-api/pom.xml
@@ -1,26 +1,26 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>generic-resource-api</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: generic-resource-api</name>
+    <name>sdnc-northbound :: generic-resource-api</name>
 
-	<modules>
-		<module>model</module>
-		<module>provider</module>
-		<module>features</module>
-		<module>client</module>
-		<module>installer</module>
-	</modules>
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>features</module>
+        <module>client</module>
+        <module>installer</module>
+    </modules>
 </project>
diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml
index 2dd8d69e..45ed0aee 100644
--- a/generic-resource-api/provider/pom.xml
+++ b/generic-resource-api/provider/pom.xml
@@ -17,16 +17,16 @@
     <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
     <dependencyManagement>
-	    <dependencies>
-	    	<dependency>
+        <dependencies>
+            <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-	    	</dependency>
-	    </dependencies>
-	</dependencyManagement>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
@@ -76,14 +76,15 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                  <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
-              </plugin>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/optical-service/features/features-optical-service/pom.xml b/optical-service/features/features-optical-service/pom.xml
index eba8f316..5a4ae5c4 100644
--- a/optical-service/features/features-optical-service/pom.xml
+++ b/optical-service/features/features-optical-service/pom.xml
@@ -28,6 +28,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/optical-service/features/sdnc-optical-service/pom.xml b/optical-service/features/sdnc-optical-service/pom.xml
index 1cbc7678..edafbc57 100644
--- a/optical-service/features/sdnc-optical-service/pom.xml
+++ b/optical-service/features/sdnc-optical-service/pom.xml
@@ -17,11 +17,10 @@
     <name>sdnc-northbound :: optical-service :: ${project.artifactId}</name>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -35,6 +34,5 @@
             <artifactId>optical-service-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/optical-service/installer/pom.xml b/optical-service/installer/pom.xml
index b2db80a0..82bdb2ae 100644
--- a/optical-service/installer/pom.xml
+++ b/optical-service/installer/pom.xml
@@ -19,12 +19,12 @@
     <properties>
         <application.name>sdnc-optical-service</application.name>
         <features.boot>${application.name}</features.boot>
-        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features
+        </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>${application.name}</artifactId>
@@ -43,14 +43,11 @@
             <artifactId>optical-service-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>optical-service-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -139,10 +136,8 @@
                             </resources>
                         </configuration>
                     </execution>
-
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/optical-service/model/pom.xml b/optical-service/model/pom.xml
index 346bc1ff..444e92bf 100644
--- a/optical-service/model/pom.xml
+++ b/optical-service/model/pom.xml
@@ -25,7 +25,5 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 </project>
diff --git a/optical-service/provider/pom.xml b/optical-service/provider/pom.xml
index 756737c0..dda0e8cf 100644
--- a/optical-service/provider/pom.xml
+++ b/optical-service/provider/pom.xml
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/pom.xml b/pom.xml
index cc55ba2a..c9f29aaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,102 +1,101 @@
 <?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.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound</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>
-		<name>ONAP</name>
-	</organization>
+    <name>sdnc-northbound</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>
+        <name>ONAP</name>
+    </organization>
 
-	<modules>
-		<module>generic-resource-api</module>
-		<module>optical-service</module>
-		<module>vnftools</module>
-		<module>features</module>
-	</modules>
+    <modules>
+        <module>generic-resource-api</module>
+        <module>optical-service</module>
+        <module>vnftools</module>
+        <module>features</module>
+    </modules>
 
-	<scm>
-		<connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
+    <scm>
+        <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
+        <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection>
+        <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url>
+    </scm>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>https://jenkins.onap.org/</url>
+    </ciManagement>
+    <distributionManagement>
+        <site>
+            <id>sdnc-javadoc</id>
+            <url>
+                dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}
+            </url>
+        </site>
+    </distributionManagement>
 
-		<developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection>
-		<url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url>
-	</scm>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Jenkins</system>
-		<url>https://jenkins.onap.org/</url>
-	</ciManagement>
-	<distributionManagement>
-		<site>
-			<id>sdnc-javadoc</id>
-			<url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
-		</site>
-	</distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <skipTests>false</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.17</version>
-				<configuration>
-					<skipTests>false</skipTests>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>blackduck</id>
-			<activation>
-				<property>
-					<name>blackduck-scan</name>
-				</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>
-
-
-			</build>
-
-		</profile>
-
-	</profiles>
+    <profiles>
+        <profile>
+            <id>blackduck</id>
+            <activation>
+                <property>
+                    <name>blackduck-scan</name>
+                </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>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/ueb-listener/.gitignore b/ueb-listener/.gitignore
deleted file mode 100755
index 1b8a6ba9..00000000
--- a/ueb-listener/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-*.class
-target/
-MANIFEST.MF
-.DS_STORE
-.metadata
diff --git a/ueb-listener/.sonar/checkstyle.xml b/ueb-listener/.sonar/checkstyle.xml
deleted file mode 100755
index 3fa23153..00000000
--- a/ueb-listener/.sonar/checkstyle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
-\ No newline at end of file
diff --git a/ueb-listener/.sonar/pmd.xml b/ueb-listener/.sonar/pmd.xml
deleted file mode 100755
index 80343b3b..00000000
--- a/ueb-listener/.sonar/pmd.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset>
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">
-    <priority>5</priority>
-  </rule>
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">
-    <priority>2</priority>
-  </rule>
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">
-    <priority>3</priority>
-  </rule>
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">
-    <priority>3</priority>
-  </rule>
-</ruleset>
-
diff --git a/ueb-listener/README.md b/ueb-listener/README.md
deleted file mode 100644
index 842ddb16..00000000
--- a/ueb-listener/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-UEB-LISTENER MOVED TO CCSDK!
-
-The code for ueb-listener moved to the ccsdk/sli/northbound repository
diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml
index b996abac..6a400167 100644
--- a/vnftools/features/features-vnftools/pom.xml
+++ b/vnftools/features/features-vnftools/pom.xml
@@ -1,29 +1,28 @@
 <?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>feature-repo-parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>features-vnftools</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>features-vnftools</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-	<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sdnc-vnftools</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-vnftools</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml
index e70447a1..1dca0508 100644
--- a/vnftools/features/sdnc-vnftools/pom.xml
+++ b/vnftools/features/sdnc-vnftools/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -35,6 +35,5 @@
             <artifactId>vnftools-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml
index c29bb4e6..a4ea19fb 100755
--- a/vnftools/installer/pom.xml
+++ b/vnftools/installer/pom.xml
@@ -1,141 +1,136 @@
 <?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.2.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>vnftools-installer</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnftools-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
 
-	<properties>
-		<application.name>sdnc-vnftools</application.name>
-		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
-		<include.transitive.dependencies>false</include.transitive.dependencies>
-	</properties>
+    <properties>
+        <application.name>sdnc-vnftools</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-	<dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>vnftools-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>${application.name}</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
-			<artifactId>vnftools-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-
-	</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>
-						</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.sdnc.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>
-
-		</plugins>
-	</build>
+    <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>
+                        </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.sdnc.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>
+        </plugins>
+    </build>
 </project>
diff --git a/vnftools/pom.xml b/vnftools/pom.xml
index 6b39c131..59eb09a7 100644
--- a/vnftools/pom.xml
+++ b/vnftools/pom.xml
@@ -1,49 +1,45 @@
 <?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>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>vnftools</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<name>VNF Tools Plugin</name>
-	<description>Provides execute nodes to Directed Graphs that use the VNF Module.</description>
-
-	<modules>
-    <module>provider</module>
-    <module>features</module>
-    <module>installer</module>
-  </modules>
-
-	<properties>
-		<feature-name>vnftools</feature-name>
-	</properties>
-
-	<dependencyManagement>
-
-                <dependencies>
-                        <dependency>
-                                <groupId>org.onap.sdnc.northbound</groupId>
-                                <artifactId>vnftools-features</artifactId>
-                                <version>${project.version}</version>
-                                <type>xml</type>
-                                <classifier>features</classifier>
-                        </dependency>
-
-                        <dependency>
-                                <groupId>org.onap.sdnc.northbound</groupId>
-                                <artifactId>vnftools-provider</artifactId>
-                                <version>${project.version}</version>
-                        </dependency>
-                </dependencies>
-
-
-        </dependencyManagement>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnftools</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>VNF Tools Plugin</name>
+    <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description>
+
+    <modules>
+        <module>provider</module>
+        <module>features</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>vnftools</feature-name>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.sdnc.northbound</groupId>
+                <artifactId>vnftools-features</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.sdnc.northbound</groupId>
+                <artifactId>vnftools-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml
index 0e8f04fc..ee271d58 100644
--- a/vnftools/provider/pom.xml
+++ b/vnftools/provider/pom.xml
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
     </dependencies>
 </project>
author	Singal, Kapil (ks220y) <ks220y@att.com>	2021-07-09 08:48:33 -0400
committer	Singal, Kapil (ks220y) <ks220y@att.com>	2021-07-09 08:48:33 -0400
commit	0f1a3db830b43cdf7e366b8a92609187c32370ac (patch)
tree	cba02e218f414fc4a6b8a8da3c519b63a3aef12d
parent	6267cfea5bf17f62c6491318ff2827b8cacfd0b4 (diff)