Merge "Upgrade spring boot, Jackson and Coroutines."

commit: b8245192892593bf59fd4769f72c7732e4e78840 [log] [tgz]
author: Dan Timoney <dtimoney@att.com> Thu Oct 10 17:49:19 2019 +0000
committer: Gerrit Code Review <gerrit@onap.org> Thu Oct 10 17:49:19 2019 +0000
tree: 1c27ac02abc9ce891647bd3efc33127913b538a8
parent: 2e8a4da68b26ffb5bf812fce9ebdace4b39d1c50 [diff]
parent: f08f70f7eb9cb907c40bd29f92ce7fabd5fe8d63 [diff]
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index fa9d64a..037fc1f 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml

@@ -1,13 +1,11 @@
 <?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/maven-v4_0_0.xsd">
-
-
+<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>
-    <packaging>pom</packaging>
+
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>dependencies-bom</artifactId>
     <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <distributionManagement>
         <repository>
@@ -20,7 +18,6 @@
         </snapshotRepository>
     </distributionManagement>
 
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -189,4 +186,4 @@
         </dependencies>
 
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 9018641..d0309dd 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml

@@ -1,21 +1,18 @@
 <?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/maven-v4_0_0.xsd">
-
-
+<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>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>dependencies-odl-bom</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
         <version>3.1.5</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>dependencies-odl-bom</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <distributionManagement>
         <repository>
@@ -28,12 +25,10 @@
         </snapshotRepository>
     </distributionManagement>
 
-
     <!-- Note: maven properties do not work as expected in BOMs.  The property settings are
     not imported - so if you use a property in the version below, the pom that imports your BOM is
     expected to have that property set - defeating the whole point of a BOM.  Moral : use constants,
     not properties, for versions in BOMs -->
-
     <dependencyManagement>
         <dependencies>
             <!-- OpenDaylight dependencies -->
@@ -84,7 +79,6 @@
                 <scope>import</scope>
             </dependency>
 
-
             <!-- Other dependencies -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -492,4 +486,4 @@
         </dependencies>
 
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index ec1d081..2fd20d4 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>binding-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.mdsal</groupId>
 		<artifactId>binding-parent</artifactId>
 		<version>3.0.8</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>binding-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 466b665..877883f 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>bundle-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>bundle-parent</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>bundle-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 155a6d3..296ac78 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml

@@ -1,541 +1,532 @@
 <?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/maven-v4_0_0.xsd">
+<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>
 
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>client-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>client-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <description>Root POM to be used for yang2swagger generation in CCSDK based projects</description>
+    <url>http://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
-	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
-	<description>Root POM to be used for yang2swagger generation in CCSDK based projects</description>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
+    <properties>
 
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
+        <!-- properties from oparent -->
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <!-- sitePath may be overridden in the inheriting POM if desired -->
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 
-	<properties>
+        <!-- ONAP repositories -->
+        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+        <onap.nexus.port>443</onap.nexus.port>
+        <onap.nexus.protocol>https</onap.nexus.protocol>
+        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-		<!-- properties from oparent -->
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-		<!-- sitePath may be overridden in the inheriting POM if desired -->
-		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+        <!-- OpenDaylight repositories -->
+        <opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
+        <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-		<!-- ONAP repositories -->
-		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
-		<onap.nexus.port>443</onap.nexus.port>
-		<onap.nexus.protocol>https</onap.nexus.protocol>
-		<onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-		<onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-		<onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-		<onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+        <java.version.source>1.8</java.version.source>
+        <java.version.target>1.8</java.version.target>
+        <maven.compiler.version>3.6.1</maven.compiler.version>
 
+        <checkstyle.skip>true</checkstyle.skip>
 
-		<!-- OpenDaylight repositories -->
-		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
-		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
+        <org.json.version>20170516</org.json.version>
+        <jackson.version>2.8.9</jackson.version>
+        <!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
+            is fixed (either in PowerMock or with a new JUnit release) -->
+        <!-- Used everywhere -->
+        <junit.version>4.11</junit.version>
+        <mockito.version>2.8.9</mockito.version>
+        <lombok.version>1.18.0</lombok.version>
+        <openpojo.version>0.8.10</openpojo.version>
+        <spring.version>4.3.7.RELEASE</spring.version>
+        <javax.validation.version>2.0.0.Final</javax.validation.version>
+        <swagger.version>1.5.16</swagger.version>
 
+        <!-- ONAP repositories -->
+        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+        <onap.nexus.port>443</onap.nexus.port>
+        <onap.nexus.protocol>https</onap.nexus.protocol>
+        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-		<java.version.source>1.8</java.version.source>
-		<java.version.target>1.8</java.version.target>
-		<maven.compiler.version>3.6.1</maven.compiler.version>
+    </properties>
 
-		<checkstyle.skip>true</checkstyle.skip>
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.openpojo</groupId>
+            <artifactId>openpojo</artifactId>
+            <version>${openpojo.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${org.json.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${javax.validation.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-jaxrs</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+    </dependencies>
 
-		<org.json.version>20170516</org.json.version>
-		<jackson.version>2.8.9</jackson.version>
-		<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560 
-			is fixed (either in PowerMock or with a new JUnit release) -->
-		<!-- Used everywhere -->
-		<junit.version>4.11</junit.version>
-		<mockito.version>2.8.9</mockito.version>
-		<lombok.version>1.18.0</lombok.version>
-		<openpojo.version>0.8.10</openpojo.version>
-		<spring.version>4.3.7.RELEASE</spring.version>
-		<javax.validation.version>2.0.0.Final</javax.validation.version>
-		<swagger.version>1.5.16</swagger.version>
+    <repositories>
+        <repository>
+            <id>onap-public</id>
+            <url>https://nexus.onap.org/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>onap-staging</id>
+            <url>https://nexus.onap.org/content/groups/staging</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>ecomp-release</id>
+            <name>onap-repository-releases</name>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>ecomp-snapshot</id>
+            <name>onap-repository-snapshots</name>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>onap-bintray</id>
+            <name>onap-bintray</name>
+            <url>https://nexus.onap.org/content/repositories/bintray/</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>onap-public</id>
+            <url>${onap.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-staging</id>
+            <url>${onap.nexus.staging-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-snapshot</id>
+            <url>${onap.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>${opendaylight.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${opendaylight.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <!-- Black Duck plugin dependencies -->
+        <pluginRepository>
+            <id>JCenter</id>
+            <name>JCenter Repository</name>
+            <url>http://jcenter.bintray.com</url>
+        </pluginRepository>
 
-		<!-- ONAP repositories -->
-		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
-		<onap.nexus.port>443</onap.nexus.port>
-		<onap.nexus.protocol>https</onap.nexus.protocol>
-		<onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-		<onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-		<onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-		<onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+        <pluginRepository>
+            <id>Restlet</id>
+            <name>Restlet Repository</name>
+            <url>http://maven.restlet.com</url>
+        </pluginRepository>
 
-	</properties>
+        <pluginRepository>
+            <id>onap-bintray</id>
+            <name>onap-bintray</name>
+            <url>https://nexus.onap.org/content/repositories/bintray/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.openpojo</groupId>
-			<artifactId>openpojo</artifactId>
-			<version>${openpojo.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>${org.json.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-base</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-annotations</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>${javax.validation.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-jaxrs</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-models</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-	</dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven.compiler.version}</version>
+                    <configuration>
+                        <source>${java.version.source}</source>
+                        <target>${java.version.target}</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>install-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>deploy-sources</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                        <includes>**\/*.yang</includes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>unpack-shared-resources</id>
+                            <goals>
+                                <goal>unpack-dependencies</goal>
+                            </goals>
+                            <phase>initialize</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                    <executions>
+                        <execution>
+                            <phase>initialize</phase>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <tasks>
+                            <!-- flatten out structure -->
+                            <move todir="${project.build.directory}/dependency" failonerror="false">
+                                <fileset dir="${project.build.directory}/dependency"/>
+                                <mapper type="flatten"/>
+                            </move>
+                            <!-- move to yang folder -->
+                            <copy todir="${project.build.directory}/yang" failonerror="false">
+                                <fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
+                                <mapper type="flatten"/>
+                            </copy>
+                            <!-- add in hard coded items from src/main/yang -->
+                            <copy todir="${project.build.directory}/yang" failonerror="false">
+                                <fileset dir="${project.basedir}/src/main/yang" includes="**/*.yang"/>
+                                <mapper type="flatten"/>
+                            </copy>
+                        </tasks>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <version>1.2.3</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.mrv.yangtools</groupId>
+                            <artifactId>swagger-maven-plugin</artifactId>
+                            <version>1.1.9</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.github.romix</groupId>
+                            <artifactId>java-concurrent-hash-trie-map</artifactId>
+                            <version>0.2.23</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate-sources</goal>
+                            </goals>
+                            <configuration>
+                                <codeGenerators>
+                                    <generator>
+                                        <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/generated-sources/swagger-maven-api-gen</outputBaseDir>
+                                        <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
+                                        <additionalConfiguration>
+                                            <api-version>${project.version}</api-version>
+                                            <base-module>client</base-module>
+                                            <swagger-format>yaml</swagger-format>
+                                        </additionalConfiguration>
+                                    </generator>
+                                </codeGenerators>
+                                <inspectDependencies>false</inspectDependencies>
+                                <yangFilesRootDir>${project.build.directory}/yang</yangFilesRootDir>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-codegen-maven-plugin</artifactId>
+                    <version>2.2.3</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-core</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-databind</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-annotations</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.module</groupId>
+                            <artifactId>jackson-module-jaxb-annotations</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                            <artifactId>jackson-jaxrs-base</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                            <artifactId>jackson-jaxrs-json-provider</artifactId>
+                            <version>${jackson.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate</goal>
+                            </goals>
+                            <configuration>
+                                <inputSpec>${project.build.directory}/generated-sources/swagger-maven-api-gen/client.yaml</inputSpec>
+                                <language>spring</language>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
+            </plugins>
 
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>onap-bintray</id>
-			<name>onap-bintray</name>
-			<url>https://nexus.onap.org/content/repositories/bintray/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>onap-bintray</id>
-			<name>onap-bintray</name>
-			<url>https://nexus.onap.org/content/repositories/bintray/</url>
-		</repository>
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>${maven.compiler.version}</version>
-					<configuration>
-						<source>${java.version.source}</source>
-						<target>${java.version.target}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>3.0.1</version>
-					<executions>
-						<execution>
-							<id>install-sources</id>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>deploy-sources</id>
-							<phase>deploy</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.10</version>
-					<configuration>
-						<outputDirectory>${project.build.directory}/dependency</outputDirectory>
-						<includes>**\/*.yang</includes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>unpack-shared-resources</id>
-							<goals>
-								<goal>unpack-dependencies</goal>
-							</goals>
-							<phase>initialize</phase>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.8</version>
-					<executions>
-						<execution>
-							<phase>initialize</phase>
-							<goals>
-								<goal>run</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<tasks>
-							<!-- flatten out structure -->
-							<move todir="${project.build.directory}/dependency" failonerror="false">
-								<fileset dir="${project.build.directory}/dependency"/>
-								<mapper type="flatten"/>
-							</move>
-							<!-- move to yang folder -->
-							<copy todir="${project.build.directory}/yang" failonerror="false">
-								<fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
-								<mapper type="flatten"/>
-							</copy>
-							<!-- add in hard coded items from src/main/yang -->
-							<copy todir="${project.build.directory}/yang" failonerror="false">
-								<fileset dir="${project.basedir}/src/main/yang" includes="**/*.yang"/>
-								<mapper type="flatten"/>
-							</copy>
-						</tasks>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.opendaylight.yangtools</groupId>
-					<artifactId>yang-maven-plugin</artifactId>
-					<version>1.2.3</version>
-					<dependencies>
-						<dependency>
-							<groupId>com.mrv.yangtools</groupId>
-							<artifactId>swagger-maven-plugin</artifactId>
-							<version>1.1.9</version>
-						</dependency>
-						<dependency>
-							<groupId>com.github.romix</groupId>
-							<artifactId>java-concurrent-hash-trie-map</artifactId>
-							<version>0.2.23</version>
-						</dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<goals>
-								<goal>generate-sources</goal>
-							</goals>
-							<configuration>
-								<codeGenerators>
-									<generator>
-										<codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
-										<outputBaseDir>${project.build.directory}/generated-sources/swagger-maven-api-gen</outputBaseDir>
-										<resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
-										<additionalConfiguration>
-											<api-version>${project.version}</api-version>
-											<base-module>client</base-module>
-											<swagger-format>yaml</swagger-format>
-										</additionalConfiguration>
-									</generator>
-								</codeGenerators>
-								<inspectDependencies>false</inspectDependencies>
-								<yangFilesRootDir>${project.build.directory}/yang</yangFilesRootDir>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>io.swagger</groupId>
-					<artifactId>swagger-codegen-maven-plugin</artifactId>
-					<version>2.2.3</version>
-					<dependencies>
-						<dependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-core</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-databind</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-annotations</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>com.fasterxml.jackson.module</groupId>
-							<artifactId>jackson-module-jaxb-annotations</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>com.fasterxml.jackson.jaxrs</groupId>
-							<artifactId>jackson-jaxrs-base</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>com.fasterxml.jackson.jaxrs</groupId>
-							<artifactId>jackson-jaxrs-json-provider</artifactId>
-							<version>${jackson.version}</version>
-						</dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<goals>
-								<goal>generate</goal>
-							</goals>
-							<configuration>
-								<inputSpec>${project.build.directory}/generated-sources/swagger-maven-api-gen/client.yaml</inputSpec>
-								<language>spring</language>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-
-			</plugins>
-
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<processAllModules>true</processAllModules>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-scm-plugin</artifactId>
-				<version>1.8.1</version>
-				<configuration>
-					<tag>${project.artifactId}-${project.version}</tag>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<organization>
-		<name>ONAP</name>
-	</organization>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <processAllModules>true</processAllModules>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-scm-plugin</artifactId>
+                <version>1.8.1</version>
+                <configuration>
+                    <tag>${project.artifactId}-${project.version}</tag>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 30e13fe..136cc46 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>feature-repo-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>feature-repo-parent</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>feature-repo-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 76295a9..72d6e29 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>karaf4-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>karaf4-parent</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>karaf4-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 1909000..d6776a7 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>mdsal-it-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.controller</groupId>
 		<artifactId>mdsal-it-parent</artifactId>
 		<version>1.9.1</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>mdsal-it-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index dfa5eb4..36089f6 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>odlparent-lite</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>odlparent-lite</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>odlparent-lite</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index d2fd577..325fc87 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>odlparent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>odlparent</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>odlparent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index eede34f..52bf11a 100755
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml

@@ -1,41 +1,41 @@
 <?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>
+    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>odlparent-aggregator</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>odlparent-aggregator</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
 
-	<modules>
-		<module>setup</module>
-		<module>binding-parent</module>
-		<module>bundle-parent</module>
-		<module>feature-repo-parent</module>
-		<module>karaf4-parent</module>
-		<module>mdsal-it-parent</module>
-		<module>odlparent</module>
-		<module>odlparent-lite</module>
-		<module>single-feature-parent</module>
-		<module>client-parent</module>
-	</modules>
+    <modules>
+        <module>setup</module>
+        <module>binding-parent</module>
+        <module>bundle-parent</module>
+        <module>feature-repo-parent</module>
+        <module>karaf4-parent</module>
+        <module>mdsal-it-parent</module>
+        <module>odlparent</module>
+        <module>odlparent-lite</module>
+        <module>single-feature-parent</module>
+        <module>client-parent</module>
+    </modules>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>

diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml
index 3e356a4..c2a519a 100755
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml

@@ -1,309 +1,309 @@
 <?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-aggregator</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-aggregator</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>setup</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>setup</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-	<url>http://wiki.onap.org</url>
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
+    <url>http://wiki.onap.org</url>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>create-binding-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../binding-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/binding-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-bundle-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../bundle-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/bundle-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-feature-repo-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../feature-repo-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-karaf4-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../karaf4-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/karaf4-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-mdsal-it-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../mdsal-it-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/mdsal-it-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-odlparent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../odlparent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/odlparent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-odlparent-lite-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../odlparent-lite</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/odlparent-lite.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-single-feature-parent-pom</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>../single-feature-parent</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<includes>
-										<include>pom-template.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-							<escapeString>\</escapeString>
-							<filters>
-								<filter>${basedir}/src/main/properties/single-feature-parent.properties</filter>
-							</filters>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.coderplus.maven.plugins</groupId>
-				<artifactId>copy-rename-maven-plugin</artifactId>
-				<version>1.0.1</version>
-				<executions>
-					<execution>
-						<id>rename-binding-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../binding-parent/pom-template.xml</sourceFile>
-							<destinationFile>../binding-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-bundle-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../bundle-parent/pom-template.xml</sourceFile>
-							<destinationFile>../bundle-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-feature-repo-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../feature-repo-parent/pom-template.xml</sourceFile>
-							<destinationFile>../feature-repo-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-karaf4-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../karaf4-parent/pom-template.xml</sourceFile>
-							<destinationFile>../karaf4-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-mdsal-it-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../mdsal-it-parent/pom-template.xml</sourceFile>
-							<destinationFile>../mdsal-it-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-odlparent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../odlparent/pom-template.xml</sourceFile>
-							<destinationFile>../odlparent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-odlparent-lite-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../odlparent-lite/pom-template.xml</sourceFile>
-							<destinationFile>../odlparent-lite/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-single-feature-parent-pom</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>rename</goal>
-						</goals>
-						<configuration>
-							<sourceFile>../single-feature-parent/pom-template.xml</sourceFile>
-							<destinationFile>../single-feature-parent/pom.xml</destinationFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>create-binding-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../binding-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/binding-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-bundle-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../bundle-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/bundle-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-feature-repo-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../feature-repo-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-karaf4-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../karaf4-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/karaf4-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-mdsal-it-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../mdsal-it-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/mdsal-it-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-odlparent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../odlparent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/odlparent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-odlparent-lite-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../odlparent-lite</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/odlparent-lite.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-single-feature-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../single-feature-parent</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>pom-template.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <escapeString>\</escapeString>
+                            <filters>
+                                <filter>${basedir}/src/main/properties/single-feature-parent.properties</filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>1.0.1</version>
+                <executions>
+                    <execution>
+                        <id>rename-binding-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../binding-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../binding-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-bundle-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../bundle-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../bundle-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-feature-repo-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../feature-repo-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../feature-repo-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-karaf4-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../karaf4-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../karaf4-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-mdsal-it-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../mdsal-it-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../mdsal-it-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-odlparent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../odlparent/pom-template.xml</sourceFile>
+                            <destinationFile>../odlparent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-odlparent-lite-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../odlparent-lite/pom-template.xml</sourceFile>
+                            <destinationFile>../odlparent-lite/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>rename-single-feature-parent-pom</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rename</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>../single-feature-parent/pom-template.xml</sourceFile>
+                            <destinationFile>../single-feature-parent/pom.xml</destinationFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index ef4bb72..41e3d9f 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>${odlparent.artifactId}</artifactId>
-	<version>${project.version}</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>${odlparent.groupId}</groupId>
 		<artifactId>${odlparent.artifactId}</artifactId>
 		<version>${odlparent.version}</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>${odlparent.artifactId}</artifactId>
+	<version>${project.version}</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: \${project.groupId} :: \${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>\${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>\${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>\${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>\${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>\${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>\${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>\${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>\${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>\${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>\${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>\${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>\${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>\${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>\${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>\${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>\${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>\${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>\${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>\${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>\${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>\${project.artifactId}-\${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>\${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>\${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="\${is_windows}" arg2="true" />
+											<equals arg1="\${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="\${project.build.directory}\${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}" />
+												file="\${project.build.directory}\${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
 												<echo
-													file="\${project.build.directory}\${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true\${line.separator}" />
+												file="\${project.build.directory}\${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="\${project.build.directory}\${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}" />
+												file="\${project.build.directory}\${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/>
 												<echo
-													file="\${project.build.directory}\${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true\${line.separator}" />
+												file="\${project.build.directory}\${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/>
 												<chmod
-													file="\${project.build.directory}\${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="\${project.build.directory}\${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>\${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>\${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>\${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>\${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>\${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>\${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>\${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>\${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>\${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>\${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>\${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>\${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>\${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>\${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>\${project.artifactId}-\${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>\${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>\${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index ae2bb75..a55c60a 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml

@@ -1,35 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-
-	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml 
-		Any updates needed should be made to that template and not to the generated 
-		pom.xml file -->
-
+<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>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>single-feature-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+
+	<!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/setup/src/main/template/pom-template.xml
+        Any updates needed should be made to that template and not to the generated
+        pom.xml file -->
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>single-feature-parent</artifactId>
 		<version>4.0.10</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 
+	<groupId>org.onap.ccsdk.parent</groupId>
+	<artifactId>single-feature-parent</artifactId>
+	<version>1.5.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<url>http://wiki.onap.org</url>
 	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-
+	<url>http://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
 	<issueManagement>
 		<system>JIRA</system>
 		<url>https://jira.onap.org/</url>
 	</issueManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<properties>
 
@@ -46,8 +55,8 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<!-- Default Sonar configuration -->
 		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<!-- If following file exist, auto-generation of swagger.json will be done -->
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
@@ -66,12 +75,10 @@
 		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
 		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
 		<!-- OpenDaylight repositories -->
 		<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
 		<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
 
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version.source>1.8</java.version.source>
 		<java.version.target>1.8</java.version.target>
@@ -82,16 +89,12 @@
 		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 		<checkstyle.skip>true</checkstyle.skip>
 
-
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
-
 		<!-- CCSDK component versions -->
 		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
 		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
@@ -104,7 +107,6 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-
 		<!-- Support libraries used by OpenDaylight -->
 		<odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version>
 		<odl.mdsal.version>3.0.8</odl.mdsal.version>
@@ -129,17 +131,17 @@
 		<gson.version>2.8.5</gson.version>
 		<!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
 		<guava.version>25.1-jre</guava.version>
-		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
-			integration/distribution, snmp4sdn, toolkit, ttp -->
+		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
+            integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.9.8</jackson.version>
 		<jackson.bom.version>2.9.8</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.1-GA</javassist.version>
 
-		<!-- FIXME remove all dependencies for jersey 1.17 after migration all 
-			projects -->
-		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, 
-			snmp4sdn, toolkit -->
+		<!-- FIXME remove all dependencies for jersey 1.17 after migration all
+            projects -->
+		<!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all,
+            snmp4sdn, toolkit -->
 		<jersey.version>2.25.1</jersey.version>
 		<!-- Used by sfc -->
 		<jersey.client.version>2.25.1</jersey.client.version>
@@ -149,8 +151,6 @@
 		<!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
 		<org.json.version>20131018</org.json.version>
 
-
-
 		<!-- Used everywhere -->
 		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
@@ -159,15 +159,13 @@
 		<mockito.version>1.10.19</mockito.version>
 		<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
 		<netty.version>4.1.34.Final</netty.version>
-		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, 
-			toolkit -->
+		<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity,
+            toolkit -->
 		<slf4j.version>1.7.25</slf4j.version>
-		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
-			tsdr, ttp -->
+		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit,
+            tsdr, ttp -->
 		<spring.version>4.3.24.RELEASE</spring.version>
 
-
-
 		<!-- Extra support libraries used by SDN-C -->
 		<jackson-annotations-version>${jackson.version}</jackson-annotations-version>
 		<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
@@ -175,7 +173,6 @@
 
 		<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
-
 		<!-- Managed dependency versions -->
 		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
 		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
@@ -190,6 +187,559 @@
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Note: If value in BOM conflicts with value inherited from
+            parent pom, inherited value takes precedence.  This seems more like
+            a bug than a feature, but this is how maven 3.6 works -->
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-odl-bom</artifactId>
+				<version>1.5.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!-- Override incorrect versions in ODL parent poms -->
+			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>9.4.12.v20180830</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jettison</groupId>
+				<artifactId>jettison</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<url>https://nexus.onap.org/content/groups/staging</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-release</id>
+			<name>onap-repository-releases</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-snapshot</id>
+			<name>onap-repository-snapshots</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<url>${onap.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-staging</id>
+			<url>${onap.nexus.staging-url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-snapshot</id>
+			<url>${onap.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-mirror</id>
+			<name>opendaylight-mirror</name>
+			<url>${opendaylight.nexus.public-url}</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>opendaylight-snapshot</id>
+			<name>opendaylight-snapshot</name>
+			<url>${opendaylight.nexus.snapshot-url}</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+
+				<!-- Plugins from ONAP version (parent of oparent) -->
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<!-- This version supports the "deployAtEnd" parameter -->
+					<version>2.8</version>
+					<configuration>
+						<skip/>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-webdav-jackrabbit</artifactId>
+							<version>2.10</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M2</version>
+					<executions>
+						<execution>
+							<id>enforce-property</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireProperty>
+										<property>onap.nexus.url</property>
+										<message>You must set a onap.nexus.url property in your
+											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+									</requireProperty>
+								</rules>
+								<fail>true</fail>
+							</configuration>
+						</execution>
+						<execution>
+							<id>enforce-no-snapshots</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<requireReleaseDeps>
+										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+										<onlyWhenRelease>true</onlyWhenRelease>
+										<level>WARN</level>
+									</requireReleaseDeps>
+								</rules>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.2</version>
+				</plugin>
+				<!-- end of plugins from ONAP version (parent of oparent) -->
+
+				<!-- Plugins from ONAP oparent -->
+
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the path to the file which contains the execution data. -->
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<!-- Sets the output directory for the code coverage report. -->
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.0</version>
+					<configuration>
+						<!-- Sets the VM argument line used when unit tests are run. -->
+						<argLine>${surefireArgLine}</argLine>
+						<!-- Excludes integration tests when unit tests are run. -->
+						<excludes>
+							<exclude>**/IT*.java</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.22.0</version>
+					<executions>
+						<!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+						<execution>
+							<id>integration-tests</id>
+							<goals>
+								<goal>integration-test</goal>
+								<goal>verify</goal>
+							</goals>
+							<configuration>
+								<!-- Sets the VM argument line used when integration tests are run. -->
+								<argLine>${failsafeArgLine}</argLine>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- End of plugins from ONAP oparent -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>set-system-properties</goal>
+							</goals>
+							<configuration>
+								<properties>
+									<property>
+										<name>maven.wagon.http.ssl.allowall</name>
+										<value>${ssl.allowall}</value>
+									</property>
+									<property>
+										<name>maven.wagon.http.ssl.insecure</name>
+										<value>${ssl.insecure}</value>
+									</property>
+								</properties>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<processAllModules>true</processAllModules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+
+			<!-- Plugins from oparent version (parent of oparent) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent version (parent of oparent) -->
+
+			<!-- Plugins from oparent -->
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.oparent</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>1.2.2</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>onap-license</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<configLocation>onap-checkstyle/check-license.xml</configLocation>
+							<includeResources>false</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>false</includeTestResources>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+					<execution>
+						<id>onap-java-style</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                with minor changes -->
+							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                sources directory -->
+							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+							<includeResources>true</includeResources>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<includeTestResources>true</includeTestResources>
+							<excludes>
+							</excludes>
+							<consoleOutput>true</consoleOutput>
+							<failOnViolation>false</failOnViolation>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.12</version>
+			</plugin>
+			<!-- Jacoco / Sonar -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<!-- end of plugins from oparent -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<!-- Profiles from ONAP oparent -->
 		<profile>
@@ -302,41 +852,41 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+												 classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
+														  value="generated-source-script.bat"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.bat"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
 												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
+														  value="generated-source-script.sh"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
 												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												append="true"
+												message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												file="${project.build.directory}${file.separator}generated-source-script.sh"
+												perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -353,8 +903,8 @@
 								<version>1.0b3</version>
 								<exclusions>
 									<exclusion>
-										<artifactId>ant</artifactId>
 										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
 									</exclusion>
 								</exclusions>
 							</dependency>
@@ -388,8 +938,8 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
 						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
 						<version>1.5.0</version>
 						<executions>
 							<execution>
@@ -492,573 +1042,4 @@
 		</profile>
 
 	</profiles>
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- Note: If value in BOM conflicts with value inherited from
-			parent pom, inherited value takes precedence.  This seems more like
-			a bug than a feature, but this is how maven 3.6 works -->
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- Override incorrect versions in ODL parent poms -->
-			<!-- to match versions actually installed in ODL Neon -->
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport</artifactId>
-				<version>4.1.34.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>4.1.34.Final</version>
-				<!-- <version>${netty.version}</version> -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlets</artifactId>
-				<version>9.4.12.v20180830</version>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-				<artifactId>jersey-guava</artifactId>
-				<version>2.25.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.8</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP version (parent of oparent) -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip />
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
-					<executions>
-						<execution>
-							<id>enforce-property</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireProperty>
-										<property>onap.nexus.url</property>
-										<message>You must set a onap.nexus.url property in your
-											~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-									</requireProperty>
-								</rules>
-								<fail>true</fail>
-							</configuration>
-						</execution>
-						<execution>
-							<id>enforce-no-snapshots</id>
-							<goals>
-								<goal>enforce</goal>
-							</goals>
-							<configuration>
-								<rules>
-									<requireReleaseDeps>
-										<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-										<onlyWhenRelease>true</onlyWhenRelease>
-										<level>WARN</level>
-									</requireReleaseDeps>
-								</rules>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<!-- end of plugins from ONAP version (parent of oparent) -->
-
-				<!-- Plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.0</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.0</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0.0</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>set-system-properties</goal>
-							</goals>
-							<configuration>
-								<properties>
-									<property>
-										<name>maven.wagon.http.ssl.allowall</name>
-										<value>${ssl.allowall}</value>
-									</property>
-									<property>
-										<name>maven.wagon.http.ssl.insecure</name>
-										<value>${ssl.insecure}</value>
-									</property>
-								</properties>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<processAllModules>true</processAllModules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.8.1</version>
-					<configuration>
-						<tag>${project.artifactId}-${project.version}</tag>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-
-			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent version (parent of oparent) -->
-
-			<!-- Plugins from oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.2</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>onap-license</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<configLocation>onap-checkstyle/check-license.xml</configLocation>
-							<includeResources>false</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<includeTestResources>true</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failOnViolation>false</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<!-- end of plugins from oparent -->
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId>
-			    <version>2.10.4</version>
-			    <executions>
-			        <execution>
-			            <id>attach-javadocs</id>
-			            <goals>
-			                <goal>jar</goal>
-			            </goals>
-			            <configuration>
-			                <additionalparam>-Xdoclint:none</additionalparam>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-		</plugins>
-	</build>
-    <reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<organization>
-		<name>ONAP</name>
-	</organization>
 </project>

diff --git a/pom.xml b/pom.xml
index d64cf26..195d668 100755
--- a/pom.xml
+++ b/pom.xml

@@ -32,10 +32,6 @@
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
         <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-
-        <!-- Properties for POM Format -->
-        <format.skipValidate>false</format.skipValidate>
-        <format.skipExecute>true</format.skipExecute>
     </properties>
 
     <build>
@@ -48,46 +44,6 @@
                     <processAllModules>true</processAllModules>
                 </configuration>
             </plugin>
-
-            <!-- Plugin to Format/Validate POM Files -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tidy-maven-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <id>format-pom</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>pom</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${format.skipExecute}</skip>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>validate-pom</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${format.skipValidate}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <!-- Profile to format skip validate or execute -->
-        <profile>
-            <id>format</id>
-            <properties>
-                <format.skipValidate>true</format.skipValidate>
-                <format.skipExecute>false</format.skipExecute>
-            </properties>
-        </profile>
-    </profiles>
 </project>

diff --git a/springboot/pom.xml b/springboot/pom.xml
index 26d69d9..c68e651 100755
--- a/springboot/pom.xml
+++ b/springboot/pom.xml

@@ -1,33 +1,33 @@
 <?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>
+    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>springboot-aggregator</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>springboot-aggregator</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
 
-	<modules>
-		<module>springboot1</module>
-		<module>springboot2</module>
-	</modules>
+    <modules>
+        <module>springboot1</module>
+        <module>springboot2</module>
+    </modules>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 482f226..ae7b42f 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml

@@ -1,981 +1,962 @@
 <?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/maven-v4_0_0.xsd">
+<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.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.22.RELEASE</version>
+        <relativePath/>
+    </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>pom</packaging>
-	<groupId>org.onap.ccsdk.parent</groupId>
-	<artifactId>spring-boot-1-starter-parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>spring-boot-1-starter-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.22.RELEASE</version>
-		<relativePath/>
-	</parent>
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
+    <url>http://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
-	<url>http://wiki.onap.org</url>
-	<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-	<description>Root POM to be used in place of odlparent for CCSDK based projects</description>
+    <properties>
 
+        <!-- properties from oparent -->
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <!-- sitePath may be overridden in the inheriting POM if desired -->
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <!-- If following file exist, auto-generation of swagger.json will be done -->
+        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
+        <!-- If following file exist, auto-generation of sdk will be done -->
+        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
+        <!-- end of properties from oparent -->
 
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
+        <!-- ONAP repositories -->
+        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+        <onap.nexus.port>443</onap.nexus.port>
+        <onap.nexus.protocol>https</onap.nexus.protocol>
+        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-	<properties>
+        <java.version.source>1.8</java.version.source>
+        <java.version.target>1.8</java.version.target>
+        <bundle.plugin.version>2.5.0</bundle.plugin.version>
+        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+        <features.file>features.xml</features.file>
+        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <checkstyle.skip>true</checkstyle.skip>
 
-		<!-- properties from oparent -->
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-		<!-- sitePath may be overridden in the inheriting POM if desired -->
-		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-		<jacoco.version>0.7.7.201606060606</jacoco.version>
-		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-		<!-- Default Sonar configuration -->
-		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
-		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-			below -->
-		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-		<!-- If following file exist, auto-generation of swagger.json will be done -->
-		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
-		<!-- If following file exist, auto-generation of sdk will be done -->
-		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!-- end of properties from oparent -->
+        <sonar.language>java</sonar.language>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-		<!-- ONAP repositories -->
-		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
-		<onap.nexus.port>443</onap.nexus.port>
-		<onap.nexus.protocol>https</onap.nexus.protocol>
-		<onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-		<onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-		<onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-		<onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-		<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-		<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+        <!-- CCSDK component versions -->
+        <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdk.distribution.version>0.7.0-SNAPSHOT</ccsdk.distribution.version>
+        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
+        <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
+        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
+        <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
+        <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+        <mariadb.connector.version>2.1.1</mariadb.connector.version>
 
-		<java.version.source>1.8</java.version.source>
-		<java.version.target>1.8</java.version.target>
-		<bundle.plugin.version>2.5.0</bundle.plugin.version>
-		<maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
-		<features.file>features.xml</features.file>
-		<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-		<checkstyle.skip>true</checkstyle.skip>
+    </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.parent</groupId>
+                <artifactId>dependencies-bom</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+            </dependency>
 
-		<sonar.language>java</sonar.language>
-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>aai-service-provider</artifactId>
+                <version>${sdnctl.aai.service.version}</version>
+            </dependency>
 
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${sdnctl.dblib.version}</version>
+            </dependency>
 
+        </dependencies>
 
+    </dependencyManagement>
 
-		<!-- CCSDK component versions -->
-		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
-		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-		<ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
-		<ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
-		<ccsdk.distribution.version>0.7.0-SNAPSHOT</ccsdk.distribution.version>
-		<sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
-		<sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
-		<sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
-		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
-		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
-		
+    <repositories>
+        <repository>
+            <id>onap-public</id>
+            <url>https://nexus.onap.org/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>onap-staging</id>
+            <url>https://nexus.onap.org/content/groups/staging</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>ecomp-release</id>
+            <name>onap-repository-releases</name>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>ecomp-snapshot</id>
+            <name>onap-repository-snapshots</name>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
 
-		<mariadb.connector.version>2.1.1</mariadb.connector.version>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>onap-public</id>
+            <url>${onap.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-staging</id>
+            <url>${onap.nexus.staging-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-snapshot</id>
+            <url>${onap.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>${opendaylight.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${opendaylight.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <!-- Black Duck plugin dependencies -->
+        <pluginRepository>
+            <id>JCenter</id>
+            <name>JCenter Repository</name>
+            <url>http://jcenter.bintray.com</url>
+        </pluginRepository>
 
-		
+        <pluginRepository>
+            <id>Restlet</id>
+            <name>Restlet Repository</name>
+            <url>http://maven.restlet.com</url>
+        </pluginRepository>
+    </pluginRepositories>
 
-	</properties>
+    <build>
+        <pluginManagement>
+            <plugins>
 
+                <!-- Plugins from ONAP oparent -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <!-- This version supports the "deployAtEnd" parameter -->
+                    <version>2.8</version>
+                    <configuration>
+                        <skip/>
+                    </configuration>
+                </plugin>
 
-	<profiles>
-		<!-- Profiles from ONAP oparent -->
-		<profile>
-			<id>generate-json</id>
-			<activation>
-				<file>
-					<exists>${swagger-properties}</exists>
-				</file>
-				<property>
-					<name>swagger-sdk.generate-json</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0.0</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${basedir}/src/main/resources/swagger.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>com.github.kongchen</groupId>
-						<artifactId>swagger-maven-plugin</artifactId>
-						<version>3.1.4</version>
-						<configuration>
-							<apiSources>
-								<apiSource>
-									<locations>${api-rest-package}</locations>
-									<schemes>http,https</schemes>
-									<host>${api-host-ip}:${api-host-port}</host>
-									<basePath>${api-base-path}</basePath>
-									<info>
-										<title>${api-title}</title>
-										<version>${api-version}</version>
-										<description>${api-description}</description>
-										<license>
-											<name>${api-license}</name>
-										</license>
-									</info>
-									<swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-								</apiSource>
-							</apiSources>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<goals>
-									<goal>generate</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-install-plugin</artifactId>
-						<version>2.3.1</version>
-						<executions>
-							<execution>
-								<id>install-file-id</id>
-								<phase>install</phase>
-								<goals>
-									<goal>install-file</goal>
-								</goals>
-								<configuration>
-									<file>${basedir}/src/main/resources/swagger.json</file>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>${project.artifactId}-swagger-schema</artifactId>
-									<version>${project.version}</version>
-									<packaging>json</packaging>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>generate-sdk</id>
-			<activation>
-				<file>
-					<exists>${swagger-json}</exists>
-				</file>
-				<property>
-					<name>swagger-sdk.generate-java-sdk</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.8</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<id>ant-create-script</id>
-								<configuration>
-									<exportAntProperties>true</exportAntProperties>
-									<tasks>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.6</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.wagon</groupId>
+                            <artifactId>wagon-webdav-jackrabbit</artifactId>
+                            <version>2.10</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-core</artifactId>
+                            <version>1.7</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-sink-api</artifactId>
+                            <version>1.7</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-logging-api</artifactId>
+                            <version>1.7</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>attach-descriptor</id>
+                            <goals>
+                                <goal>attach-descriptor</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.17</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.onap.oparent</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>1.1.1</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>check-license</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                            <configuration>
+                                <configLocation>onap-checkstyle/check-license.xml</configLocation>
+                                <headerLocation>onap-checkstyle/apache-license-2.regexp.txt</headerLocation>
+                                <includeResources>false</includeResources>
+                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                <includeTestResources>false</includeTestResources>
+                                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                                <excludes>
+                                </excludes>
+                                <failsOnError>false</failsOnError>
+                                <consoleOutput>true</consoleOutput>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>check-style</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                            <configuration>
+                                <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                                    with minor changes -->
+                                <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                                <!-- <sourceDirectory> is needed so that checkstyle ignores the generated
+                                    sources directory -->
+                                <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+                                <includeResources>true</includeResources>
+                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                <includeTestResources>true</includeTestResources>
+                                <excludes>
+                                </excludes>
+                                <failsOnError>false</failsOnError>
+                                <consoleOutput>true</consoleOutput>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${jacoco.version}</version>
+                    <configuration>
+                        <!-- Note: This exclusion list should match <sonar.exclusions> property
+                            above -->
+                        <excludes>
+                            <exclude>**/gen/**</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                            <exclude>**/yang-gen/**</exclude>
+                            <exclude>**/pax/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed. -->
+                        <execution>
+                            <id>pre-unit-test</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Sets the path to the file which contains the execution data. -->
+                                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                <!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+                                <propertyName>surefireArgLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <!-- Ensures that the code coverage report for unit tests is created
+                            after unit tests have been run. -->
+                        <execution>
+                            <id>post-unit-test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Sets the path to the file which contains the execution data. -->
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                <!-- Sets the output directory for the code coverage report. -->
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>pre-integration-test</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Sets the path to the file which contains the execution data. -->
+                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                <!-- Sets the name of the property containing the settings for JaCoCo
+                                    runtime agent. -->
+                                <propertyName>failsafeArgLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <!-- Ensures that the code coverage report for integration tests after
+                            integration tests have been run. -->
+                        <execution>
+                            <id>post-integration-test</id>
+                            <phase>post-integration-test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Sets the path to the file which contains the execution data. -->
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                <!-- Sets the output directory for the code coverage report. -->
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.19.1</version>
+                    <configuration>
+                        <!-- Sets the VM argument line used when unit tests are run. -->
+                        <argLine>${surefireArgLine}</argLine>
+                        <!-- Excludes integration tests when unit tests are run. -->
+                        <excludes>
+                            <exclude>**/IT*.java</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.19.1</version>
+                    <executions>
+                        <!-- Ensures that both integration-test and verify goals of the Failsafe
+                            Maven plugin are executed. -->
+                        <execution>
+                            <id>integration-tests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Sets the VM argument line used when integration tests are run. -->
+                                <argLine>${failsafeArgLine}</argLine>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven.compile.plugin.version}</version>
+                    <configuration>
+                        <source>${java.version.source}</source>
+                        <target>${java.version.target}</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.3.0.603</version>
+                </plugin>
 
-										<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
-										<condition property="is_windows" value="true">
-											<os family="windows"/>
-										</condition>
-										<condition property="isLinux" value="true">
-											<os family="unix"/>
-										</condition>
-										<if>
-											<equals arg1="${is_windows}" arg2="true"/>
-											<then>
-												<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-												<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-												<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-											</then>
-											<else>
-												<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-												<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-												<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-												<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-											</else>
-										</if>
-									</tasks>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>1.0b3</version>
-								<exclusions>
-									<exclusion>
-										<artifactId>ant</artifactId>
-										<groupId>ant</groupId>
-									</exclusion>
-								</exclusions>
-							</dependency>
-						</dependencies>
-					</plugin>
-					<plugin>
-						<groupId>io.swagger</groupId>
-						<artifactId>swagger-codegen-maven-plugin</artifactId>
-						<version>2.2.1</version>
-						<executions>
-							<execution>
-								<goals>
-									<goal>generate</goal>
-								</goals>
-								<configuration>
-									<inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-									<output>${project.build.directory}/generated-sources</output>
-									<language>java</language>
-									<configOptions>
-										<dateLibrary>joda</dateLibrary>
-									</configOptions>
-									<library>jersey2</library>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>${project.artifactId}-java-sdk</artifactId>
-									<artifactVersion>${project.version}</artifactVersion>
-									<modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-									<apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-									<invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
-						<groupId>org.codehaus.mojo</groupId>
-						<version>1.5.0</version>
-						<executions>
-							<execution>
-								<id>swagger-generate-sources</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-clean-plugin</artifactId>
-						<version>3.0.0</version>
-						<executions>
-							<execution>
-								<id>clean-generated-files</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>clean</goal>
-								</goals>
-								<configuration>
-									<filesets>
-										<fileset>
-											<directory>${project.build.directory}/generated-sources</directory>
-										</fileset>
-									</filesets>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.onap.msb.swagger-sdk</groupId>
-					<artifactId>swagger-sdk</artifactId>
-					<version>1.0.0</version>
-				</dependency>
-			</dependencies>
-		</profile>
+                <!-- End of plugins from ONAP oparent -->
 
-		<!-- End of profiles from ONAP oparent -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <additionalDependencies>
+                            <additionalDependency>
+                                <groupId>org.slf4j</groupId>
+                                <artifactId>slf4j-api</artifactId>
+                                <version>${slf4j.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>org.antlr</groupId>
+                                <artifactId>antlr4</artifactId>
+                                <version>${antlr.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>org.antlr</groupId>
+                                <artifactId>antlr4-runtime</artifactId>
+                                <version>${antlr.version}</version>
+                            </additionalDependency>
 
-	</profiles>
+                            <additionalDependency>
+                                <groupId>com.sun.jersey</groupId>
+                                <artifactId>jersey-client</artifactId>
+                                <version>${jersey.client.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>com.sun.jersey</groupId>
+                                <artifactId>jersey-core</artifactId>
+                                <version>${jersey.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>org.apache.httpcomponents</groupId>
+                                <artifactId>httpcore-osgi</artifactId>
+                                <version>${apache.httpcomponents.core.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>org.apache.httpcomponents</groupId>
+                                <artifactId>httpclient-osgi</artifactId>
+                                <version>${apache.httpcomponents.client.version}</version>
+                            </additionalDependency>
+                            <additionalDependency>
+                                <groupId>commons-lang</groupId>
+                                <artifactId>commons-lang</artifactId>
+                                <version>${commons.lang.version}</version>
+                            </additionalDependency>
+                        </additionalDependencies>
+                    </configuration>
 
+                    <executions>
+                        <execution>
+                            <id>aggregate</id>
+                            <goals>
+                                <goal>aggregate</goal>
+                            </goals>
+                            <phase>site</phase>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.onap.ccsdk.parent</groupId>
-				<artifactId>dependencies-bom</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>sli-common</artifactId>
-				<version>${ccsdk.sli.core.version}</version>
-			</dependency>
+                        </execution>
+                    </executions>
+                </plugin>
 
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>sli-provider</artifactId>
-				<version>${ccsdk.sli.core.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>ccsdk-sli</artifactId>
-				<version>${ccsdk.sli.core.version}</version>
-				<type>xml</type>
-				<classifier>features</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.adaptors</groupId>
-				<artifactId>aai-service-provider</artifactId>
-				<version>${sdnctl.aai.service.version}</version>
-			</dependency>
+            </plugins>
 
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>dblib-provider</artifactId>
-				<version>${sdnctl.dblib.version}</version>
-			</dependency>
+        </pluginManagement>
+        <plugins>
+            <!-- Plugins from ONAP oparent -->
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.12</version>
+            </plugin>
+            <!-- Jacoco / Sonar -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
 
-		</dependencies>
+            <!-- End of plugins from ONAP oparent -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>set-system-properties</goal>
+                        </goals>
+                        <configuration>
+                            <properties>
+                                <property>
+                                    <name>maven.wagon.http.ssl.allowall</name>
+                                    <value>${ssl.allowall}</value>
+                                </property>
+                                <property>
+                                    <name>maven.wagon.http.ssl.insecure</name>
+                                    <value>${ssl.insecure}</value>
+                                </property>
+                            </properties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <processAllModules>true</processAllModules>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-scm-plugin</artifactId>
+                <version>1.8.1</version>
+                <configuration>
+                    <tag>${project.artifactId}-${project.version}</tag>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	</dependencyManagement>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                    <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc-no-fork</report>
+                            <report>test-javadoc-no-fork</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                            <report>test-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                            <report>test-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
 
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changelog-plugin</artifactId>
+                <version>2.3</version>
+                <reportSets>
+                    <reportSet>
+                        <id>dual-report</id>
+                        <configuration>
+                            <type>range</type>
+                            <range>30</range>
+                        </configuration>
+                        <reports>
+                            <report>changelog</report>
+                            <report>file-activity</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+        </plugins>
+    </reporting>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-					<excludePackageNames>org.opendaylight.*</excludePackageNames>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>javadoc-no-fork</report>
-							<report>test-javadoc-no-fork</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>aggregate</id>
-						<reports>
-							<report>aggregate</report>
-							<report>test-aggregate</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.3</version>
-				<reportSets>
-					<reportSet>
-						<id>aggregate</id>
-						<reports>
-							<report>aggregate</report>
-							<report>test-aggregate</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
+    <profiles>
+        <!-- Profiles from ONAP oparent -->
+        <profile>
+            <id>generate-json</id>
+            <activation>
+                <file>
+                    <exists>${swagger-properties}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-json</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0.0</version>
+                        <executions>
+                            <execution>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${basedir}/src/main/resources/swagger.properties</file>
+                                    </files>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.kongchen</groupId>
+                        <artifactId>swagger-maven-plugin</artifactId>
+                        <version>3.1.4</version>
+                        <configuration>
+                            <apiSources>
+                                <apiSource>
+                                    <locations>${api-rest-package}</locations>
+                                    <schemes>http,https</schemes>
+                                    <host>${api-host-ip}:${api-host-port}</host>
+                                    <basePath>${api-base-path}</basePath>
+                                    <info>
+                                        <title>${api-title}</title>
+                                        <version>${api-version}</version>
+                                        <description>${api-description}</description>
+                                        <license>
+                                            <name>${api-license}</name>
+                                        </license>
+                                    </info>
+                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
+                                </apiSource>
+                            </apiSources>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <version>2.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>install-file-id</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>install-file</goal>
+                                </goals>
+                                <configuration>
+                                    <file>${basedir}/src/main/resources/swagger.json</file>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
+                                    <version>${project.version}</version>
+                                    <packaging>json</packaging>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>generate-sdk</id>
+            <activation>
+                <file>
+                    <exists>${swagger-json}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-java-sdk</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+                            <execution>
+                                <phase>initialize</phase>
+                                <id>ant-create-script</id>
+                                <configuration>
+                                    <exportAntProperties>true</exportAntProperties>
+                                    <tasks>
 
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.17</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<version>2.3</version>
-				<reportSets>
-					<reportSet>
-						<id>dual-report</id>
-						<configuration>
-							<type>range</type>
-							<range>30</range>
-						</configuration>
-						<reports>
-							<report>changelog</report>
-							<report>file-activity</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.4</version>
-			</plugin>
-		</plugins>
-	</reporting>
+                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
+                                        <condition property="is_windows" value="true">
+                                            <os family="windows"/>
+                                        </condition>
+                                        <condition property="isLinux" value="true">
+                                            <os family="unix"/>
+                                        </condition>
+                                        <if>
+                                            <equals arg1="${is_windows}" arg2="true"/>
+                                            <then>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                            </then>
+                                            <else>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
+                                            </else>
+                                        </if>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant-contrib</groupId>
+                                <artifactId>ant-contrib</artifactId>
+                                <version>1.0b3</version>
+                                <exclusions>
+                                    <exclusion>
+                                        <groupId>ant</groupId>
+                                        <artifactId>ant</artifactId>
+                                    </exclusion>
+                                </exclusions>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-codegen-maven-plugin</artifactId>
+                        <version>2.2.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                                <configuration>
+                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
+                                    <output>${project.build.directory}/generated-sources</output>
+                                    <language>java</language>
+                                    <configOptions>
+                                        <dateLibrary>joda</dateLibrary>
+                                    </configOptions>
+                                    <library>jersey2</library>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
+                                    <artifactVersion>${project.version}</artifactVersion>
+                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
+                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
+                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>swagger-generate-sources</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>clean-generated-files</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>${project.build.directory}/generated-sources</directory>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.onap.msb.swagger-sdk</groupId>
+                    <artifactId>swagger-sdk</artifactId>
+                    <version>1.0.0</version>
+                </dependency>
+            </dependencies>
+        </profile>
 
+        <!-- End of profiles from ONAP oparent -->
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>onap-public</id>
-			<url>${onap.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-staging</id>
-			<url>${onap.nexus.staging-url}</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>onap-snapshot</id>
-			<url>${onap.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>${opendaylight.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Black Duck plugin dependencies -->
-		<pluginRepository>
-			<id>JCenter</id>
-			<name>JCenter Repository</name>
-			<url>http://jcenter.bintray.com</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>Restlet</id>
-			<name>Restlet Repository</name>
-			<url>http://maven.restlet.com</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-
-	<repositories>
-		<repository>
-			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>onap-staging</id>
-			<url>https://nexus.onap.org/content/groups/staging</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-release</id>
-			<name>onap-repository-releases</name>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>ecomp-snapshot</id>
-			<name>onap-repository-snapshots</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>https://nexus.opendaylight.org/content/repositories/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<url>https://nexus.onap.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<url>https://nexus.onap.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- Plugins from ONAP oparent -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<!-- This version supports the "deployAtEnd" parameter -->
-					<version>2.8</version>
-					<configuration>
-						<skip/>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.doxia</groupId>
-							<artifactId>doxia-core</artifactId>
-							<version>1.7</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.doxia</groupId>
-							<artifactId>doxia-sink-api</artifactId>
-							<version>1.7</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.doxia</groupId>
-							<artifactId>doxia-logging-api</artifactId>
-							<version>1.7</version>
-						</dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<id>attach-descriptor</id>
-							<goals>
-								<goal>attach-descriptor</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>2.17</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.onap.oparent</groupId>
-							<artifactId>checkstyle</artifactId>
-							<version>1.1.1</version>
-						</dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<id>check-license</id>
-							<goals>
-								<goal>check</goal>
-							</goals>
-							<phase>process-sources</phase>
-							<configuration>
-								<configLocation>onap-checkstyle/check-license.xml</configLocation>
-								<headerLocation>onap-checkstyle/apache-license-2.regexp.txt</headerLocation>
-								<includeResources>false</includeResources>
-								<includeTestSourceDirectory>true</includeTestSourceDirectory>
-								<includeTestResources>false</includeTestResources>
-								<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-								<excludes>
-								</excludes>
-								<failsOnError>false</failsOnError>
-								<consoleOutput>true</consoleOutput>
-							</configuration>
-						</execution>
-						<execution>
-							<id>check-style</id>
-							<goals>
-								<goal>check</goal>
-							</goals>
-							<phase>process-sources</phase>
-							<configuration>
-								<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-									with minor changes -->
-								<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-								<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-									sources directory -->
-								<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-								<includeResources>true</includeResources>
-								<includeTestSourceDirectory>true</includeTestSourceDirectory>
-								<includeTestResources>true</includeTestResources>
-								<excludes>
-								</excludes>
-								<failsOnError>false</failsOnError>
-								<consoleOutput>true</consoleOutput>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-					<configuration>
-						<!-- Note: This exclusion list should match <sonar.exclusions> property 
-							above -->
-						<excludes>
-							<exclude>**/gen/**</exclude>
-							<exclude>**/generated-sources/**</exclude>
-							<exclude>**/yang-gen/**</exclude>
-							<exclude>**/pax/**</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-							is passed as VM argument when Maven the Surefire plugin is executed. -->
-						<execution>
-							<id>pre-unit-test</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>surefireArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for unit tests is created 
-							after unit tests have been run. -->
-						<execution>
-							<id>post-unit-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>pre-integration-test</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-								<!-- Sets the name of the property containing the settings for JaCoCo 
-									runtime agent. -->
-								<propertyName>failsafeArgLine</propertyName>
-							</configuration>
-						</execution>
-						<!-- Ensures that the code coverage report for integration tests after 
-							integration tests have been run. -->
-						<execution>
-							<id>post-integration-test</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>report</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the path to the file which contains the execution data. -->
-								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-								<!-- Sets the output directory for the code coverage report. -->
-								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.19.1</version>
-					<configuration>
-						<!-- Sets the VM argument line used when unit tests are run. -->
-						<argLine>${surefireArgLine}</argLine>
-						<!-- Excludes integration tests when unit tests are run. -->
-						<excludes>
-							<exclude>**/IT*.java</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.19.1</version>
-					<executions>
-						<!-- Ensures that both integration-test and verify goals of the Failsafe 
-							Maven plugin are executed. -->
-						<execution>
-							<id>integration-tests</id>
-							<goals>
-								<goal>integration-test</goal>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<!-- Sets the VM argument line used when integration tests are run. -->
-								<argLine>${failsafeArgLine}</argLine>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>${maven.compile.plugin.version}</version>
-					<configuration>
-						<source>${java.version.source}</source>
-						<target>${java.version.target}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.sonarsource.scanner.maven</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.3.0.603</version>
-				</plugin>
-
-				<!-- End of plugins from ONAP oparent -->
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10</version>
-					<configuration>
-						<additionalDependencies>
-							<additionalDependency>
-								<groupId>org.slf4j</groupId>
-								<artifactId>slf4j-api</artifactId>
-								<version>${slf4j.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>org.antlr</groupId>
-								<artifactId>antlr4</artifactId>
-								<version>${antlr.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>org.antlr</groupId>
-								<artifactId>antlr4-runtime</artifactId>
-								<version>${antlr.version}</version>
-							</additionalDependency>
-
-							<additionalDependency>
-								<groupId>com.sun.jersey</groupId>
-								<artifactId>jersey-client</artifactId>
-								<version>${jersey.client.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>com.sun.jersey</groupId>
-								<artifactId>jersey-core</artifactId>
-								<version>${jersey.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>org.apache.httpcomponents</groupId>
-								<artifactId>httpcore-osgi</artifactId>
-								<version>${apache.httpcomponents.core.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>org.apache.httpcomponents</groupId>
-								<artifactId>httpclient-osgi</artifactId>
-								<version>${apache.httpcomponents.client.version}</version>
-							</additionalDependency>
-							<additionalDependency>
-								<groupId>commons-lang</groupId>
-								<artifactId>commons-lang</artifactId>
-								<version>${commons.lang.version}</version>
-							</additionalDependency>
-						</additionalDependencies>
-					</configuration>
-
-					<executions>
-						<execution>
-							<id>aggregate</id>
-							<goals>
-								<goal>aggregate</goal>
-							</goals>
-							<phase>site</phase>
-
-						</execution>
-					</executions>
-				</plugin>
-
-			</plugins>
-
-		</pluginManagement>
-
-		<plugins>
-			<!-- Plugins from ONAP oparent -->
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.12</version>
-			</plugin>
-			<!-- Jacoco / Sonar -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-
-			<!-- End of plugins from ONAP oparent -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>properties-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>set-system-properties</goal>
-						</goals>
-						<configuration>
-							<properties>
-								<property>
-									<name>maven.wagon.http.ssl.allowall</name>
-									<value>${ssl.allowall}</value>
-								</property>
-								<property>
-									<name>maven.wagon.http.ssl.insecure</name>
-									<value>${ssl.insecure}</value>
-								</property>
-							</properties>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<processAllModules>true</processAllModules>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-scm-plugin</artifactId>
-				<version>1.8.1</version>
-				<configuration>
-					<tag>${project.artifactId}-${project.version}</tag>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<organization>
-		<name>ONAP</name>
-	</organization>
+    </profiles>
 </project>

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 04f1954..8df735a 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml

@@ -1,11 +1,6 @@
 <?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/maven-v4_0_0.xsd">
-
+<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>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -14,14 +9,32 @@
         <relativePath/>
     </parent>
 
-    <url>http://wiki.onap.org</url>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
     <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
+    <url>http://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <issueManagement>
         <system>JIRA</system>
         <url>https://jira.onap.org/</url>
     </issueManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>https://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
     <properties>
         <!-- properties from oparent -->
@@ -116,278 +129,6 @@
 
     </properties>
 
-    <profiles>
-        <!-- Profiles from ONAP oparent -->
-        <profile>
-            <id>generate-json</id>
-            <activation>
-                <file>
-                    <exists>${swagger-properties}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-json</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0.0</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${basedir}/src/main/resources/swagger.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <locations>${api-rest-package}</locations>
-                                    <schemes>http,https</schemes>
-                                    <host>${api-host-ip}:${api-host-port}</host>
-                                    <basePath>${api-base-path}</basePath>
-                                    <info>
-                                        <title>${api-title}</title>
-                                        <version>${api-version}</version>
-                                        <description>${api-description}</description>
-                                        <license>
-                                            <name>${api-license}</name>
-                                        </license>
-                                    </info>
-                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>install-file-id</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <configuration>
-                                    <file>${basedir}/src/main/resources/swagger.json</file>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
-                                    <version>${project.version}</version>
-                                    <packaging>json</packaging>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-sdk</id>
-            <activation>
-                <file>
-                    <exists>${swagger-json}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-java-sdk</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <id>ant-create-script</id>
-                                <configuration>
-                                    <exportAntProperties>true</exportAntProperties>
-                                    <tasks>
-
-                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
-                                        <condition property="is_windows" value="true">
-                                            <os family="windows"/>
-                                        </condition>
-                                        <condition property="isLinux" value="true">
-                                            <os family="unix"/>
-                                        </condition>
-                                        <if>
-                                            <equals arg1="${is_windows}" arg2="true"/>
-                                            <then>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                            </then>
-                                            <else>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-                                            </else>
-                                        </if>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ant-contrib</groupId>
-                                <artifactId>ant-contrib</artifactId>
-                                <version>1.0b3</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <artifactId>ant</artifactId>
-                                        <groupId>ant</groupId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-codegen-maven-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                                <configuration>
-                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-                                    <output>${project.build.directory}/generated-sources</output>
-                                    <language>java</language>
-                                    <configOptions>
-                                        <dateLibrary>joda</dateLibrary>
-                                    </configOptions>
-                                    <library>jersey2</library>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
-                                    <artifactVersion>${project.version}</artifactVersion>
-                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <version>1.5.0</version>
-                        <executions>
-                            <execution>
-                                <id>swagger-generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>clean-generated-files</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>${project.build.directory}/generated-sources</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.onap.msb.swagger-sdk</groupId>
-                    <artifactId>swagger-sdk</artifactId>
-                    <version>1.0.0</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- http://blog2.vorburger.ch/2016/06/improve-maven-build-speed-with-q.html
-                 q = http://memory-alpha.wikia.com/wiki/Q ;)
-
-                 The Quick profile is used during incremental local development, when you want to "just get that JAR built",
-                 which is very handy e.g. for fast hot reloading cycles in Karaf with bundle watch.  It (intentionally!) skips
-                 tests, quality checks etc. which are great and useful to run before finally submitting changes to Gerrit, and
-                 which all must run on Gerrit, but which are overhead during ongoing fast iterative local development.
-
-                 Note that the idea here is that your IDE will already have run quality checks such as e.g. Checkstyle
-                 while you typed the code anyway.  Similarly, if you wrote a test, you'll probably already have compiled and run it
-                 from your IDE, so when you want the OSGi bundle JAR for Karaf, ASAP, you typically don't want all that to run again.
-              -->
-            <id>q</id>
-            <properties>
-                <skipTests>true</skipTests>
-                <!-- But NOT <maven.test.skip>true, as that's for compiling, not running, tests;
-                     and that's usually quick.  Skipping test compilation with -Pq with maven.test.skip would be
-                     particularly confusing when used in a project with maven-jar-plugin <goal>test-jar, so don't.)  -->
-                <skipIT>true</skipIT>
-                <skipITs>true</skipITs>
-                <skip.karaf.featureTest>true</skip.karaf.featureTest>
-                <jacoco.skip>true</jacoco.skip>
-                <maven.javadoc.skip>true</maven.javadoc.skip>
-                <maven.source.skip>true</maven.source.skip>
-                <checkstyle.skip>true</checkstyle.skip>
-                <findbugs.skip>true</findbugs.skip>
-                <spotbugs.skip>true</spotbugs.skip>
-                <pmd.skip>true</pmd.skip>
-                <cpd.skip>true</cpd.skip>
-                <maven.site.skip>true</maven.site.skip>
-                <invoker.skip>true</invoker.skip>
-                <enforcer.skip>true</enforcer.skip>
-                <duplicate-finder.skip>true</duplicate-finder.skip>
-                <mdsal.skip.verbose>true</mdsal.skip.verbose> <!-- Bug 6236 -->
-                <maven.gitcommitid.skip>true</maven.gitcommitid.skip>
-                <modernizer.skip>true</modernizer.skip>
-            </properties>
-        </profile>
-        <!-- End of profiles from ONAP oparent -->
-
-    </profiles>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -436,152 +177,6 @@
 
     </dependencyManagement>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-                    <docletArtifact>
-                        <groupId>org.umlgraph</groupId>
-                        <artifactId>umlgraph</artifactId>
-                        <version>5.6</version>
-                    </docletArtifact>
-                    <additionalparam>-views</additionalparam>
-                    <useStandardDocletOptions>true</useStandardDocletOptions>
-                    <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                </configuration>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>javadoc-no-fork</report>
-                            <report>test-javadoc-no-fork</report>
-                        </reports>
-                    </reportSet>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                            <report>test-aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                            <report>test-aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changelog-plugin</artifactId>
-                <version>2.3</version>
-                <reportSets>
-                    <reportSet>
-                        <id>dual-report</id>
-                        <configuration>
-                            <type>range</type>
-                            <range>30</range>
-                        </configuration>
-                        <reports>
-                            <report>changelog</report>
-                            <report>file-activity</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-snapshot</id>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <repositories>
         <repository>
             <id>onap-public</id>
@@ -655,17 +250,73 @@
         </repository>
 
     </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>onap-public</id>
+            <url>${onap.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-staging</id>
+            <url>${onap.nexus.staging-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-snapshot</id>
+            <url>${onap.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>${opendaylight.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${opendaylight.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <!-- Black Duck plugin dependencies -->
+        <pluginRepository>
+            <id>JCenter</id>
+            <name>JCenter Repository</name>
+            <url>http://jcenter.bintray.com</url>
+        </pluginRepository>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+        <pluginRepository>
+            <id>Restlet</id>
+            <name>Restlet Repository</name>
+            <url>http://maven.restlet.com</url>
+        </pluginRepository>
+    </pluginRepositories>
 
     <build>
         <pluginManagement>
@@ -962,7 +613,6 @@
             </plugins>
 
         </pluginManagement>
-
         <plugins>
             <!-- Plugins from ONAP oparent -->
             <plugin>
@@ -1029,7 +679,354 @@
             </plugin>
         </plugins>
     </build>
-    <organization>
-        <name>ONAP</name>
-    </organization>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                    <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc-no-fork</report>
+                            <report>test-javadoc-no-fork</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                            <report>test-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                            <report>test-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changelog-plugin</artifactId>
+                <version>2.3</version>
+                <reportSets>
+                    <reportSet>
+                        <id>dual-report</id>
+                        <configuration>
+                            <type>range</type>
+                            <range>30</range>
+                        </configuration>
+                        <reports>
+                            <report>changelog</report>
+                            <report>file-activity</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <profiles>
+        <!-- Profiles from ONAP oparent -->
+        <profile>
+            <id>generate-json</id>
+            <activation>
+                <file>
+                    <exists>${swagger-properties}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-json</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0.0</version>
+                        <executions>
+                            <execution>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${basedir}/src/main/resources/swagger.properties</file>
+                                    </files>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.kongchen</groupId>
+                        <artifactId>swagger-maven-plugin</artifactId>
+                        <version>3.1.4</version>
+                        <configuration>
+                            <apiSources>
+                                <apiSource>
+                                    <locations>${api-rest-package}</locations>
+                                    <schemes>http,https</schemes>
+                                    <host>${api-host-ip}:${api-host-port}</host>
+                                    <basePath>${api-base-path}</basePath>
+                                    <info>
+                                        <title>${api-title}</title>
+                                        <version>${api-version}</version>
+                                        <description>${api-description}</description>
+                                        <license>
+                                            <name>${api-license}</name>
+                                        </license>
+                                    </info>
+                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
+                                </apiSource>
+                            </apiSources>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <version>2.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>install-file-id</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>install-file</goal>
+                                </goals>
+                                <configuration>
+                                    <file>${basedir}/src/main/resources/swagger.json</file>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
+                                    <version>${project.version}</version>
+                                    <packaging>json</packaging>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>generate-sdk</id>
+            <activation>
+                <file>
+                    <exists>${swagger-json}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-java-sdk</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+                            <execution>
+                                <phase>initialize</phase>
+                                <id>ant-create-script</id>
+                                <configuration>
+                                    <exportAntProperties>true</exportAntProperties>
+                                    <tasks>
+
+                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
+                                        <condition property="is_windows" value="true">
+                                            <os family="windows"/>
+                                        </condition>
+                                        <condition property="isLinux" value="true">
+                                            <os family="unix"/>
+                                        </condition>
+                                        <if>
+                                            <equals arg1="${is_windows}" arg2="true"/>
+                                            <then>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                            </then>
+                                            <else>
+                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
+                                            </else>
+                                        </if>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant-contrib</groupId>
+                                <artifactId>ant-contrib</artifactId>
+                                <version>1.0b3</version>
+                                <exclusions>
+                                    <exclusion>
+                                        <groupId>ant</groupId>
+                                        <artifactId>ant</artifactId>
+                                    </exclusion>
+                                </exclusions>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-codegen-maven-plugin</artifactId>
+                        <version>2.2.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                                <configuration>
+                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
+                                    <output>${project.build.directory}/generated-sources</output>
+                                    <language>java</language>
+                                    <configOptions>
+                                        <dateLibrary>joda</dateLibrary>
+                                    </configOptions>
+                                    <library>jersey2</library>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
+                                    <artifactVersion>${project.version}</artifactVersion>
+                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
+                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
+                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>swagger-generate-sources</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>clean-generated-files</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>${project.build.directory}/generated-sources</directory>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.onap.msb.swagger-sdk</groupId>
+                    <artifactId>swagger-sdk</artifactId>
+                    <version>1.0.0</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <!-- http://blog2.vorburger.ch/2016/06/improve-maven-build-speed-with-q.html
+                 q = http://memory-alpha.wikia.com/wiki/Q ;)
+
+                 The Quick profile is used during incremental local development, when you want to "just get that JAR built",
+                 which is very handy e.g. for fast hot reloading cycles in Karaf with bundle watch.  It (intentionally!) skips
+                 tests, quality checks etc. which are great and useful to run before finally submitting changes to Gerrit, and
+                 which all must run on Gerrit, but which are overhead during ongoing fast iterative local development.
+
+                 Note that the idea here is that your IDE will already have run quality checks such as e.g. Checkstyle
+                 while you typed the code anyway.  Similarly, if you wrote a test, you'll probably already have compiled and run it
+                 from your IDE, so when you want the OSGi bundle JAR for Karaf, ASAP, you typically don't want all that to run again.
+              -->
+            <id>q</id>
+            <properties>
+                <skipTests>true</skipTests>
+                <!-- But NOT <maven.test.skip>true, as that's for compiling, not running, tests;
+                     and that's usually quick.  Skipping test compilation with -Pq with maven.test.skip would be
+                     particularly confusing when used in a project with maven-jar-plugin <goal>test-jar, so don't.)  -->
+                <skipIT>true</skipIT>
+                <skipITs>true</skipITs>
+                <skip.karaf.featureTest>true</skip.karaf.featureTest>
+                <jacoco.skip>true</jacoco.skip>
+                <maven.javadoc.skip>true</maven.javadoc.skip>
+                <maven.source.skip>true</maven.source.skip>
+                <checkstyle.skip>true</checkstyle.skip>
+                <findbugs.skip>true</findbugs.skip>
+                <spotbugs.skip>true</spotbugs.skip>
+                <pmd.skip>true</pmd.skip>
+                <cpd.skip>true</cpd.skip>
+                <maven.site.skip>true</maven.site.skip>
+                <invoker.skip>true</invoker.skip>
+                <enforcer.skip>true</enforcer.skip>
+                <duplicate-finder.skip>true</duplicate-finder.skip>
+                <mdsal.skip.verbose>true</mdsal.skip.verbose> <!-- Bug 6236 -->
+                <maven.gitcommitid.skip>true</maven.gitcommitid.skip>
+                <modernizer.skip>true</modernizer.skip>
+            </properties>
+        </profile>
+        <!-- End of profiles from ONAP oparent -->
+
+    </profiles>
 </project>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index f410429..a2db56c 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml

@@ -1,19 +1,6 @@
 <?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/maven-v4_0_0.xsd">
-
-
+<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>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>standalone-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-
-
-    <url>http://wiki.onap.org</url>
-    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-    <description>Root POM to be used in place of oparent for CCSDK based projects</description>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
@@ -21,6 +8,18 @@
         <version>2.0.0</version>
     </parent>
 
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>standalone-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+    <description>Root POM to be used in place of oparent for CCSDK based projects</description>
+    <url>http://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+
     <issueManagement>
         <system>JIRA</system>
         <url>https://jira.onap.org/</url>
@@ -28,7 +27,6 @@
 
     <properties>
 
-
         <!-- ONAP repositories -->
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -41,21 +39,17 @@
         <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-
         <java.version.source>1.8</java.version.source>
         <java.version.target>1.8</java.version.target>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
 
-
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-
-
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
         <velocity.version>2.0</velocity.version>
@@ -64,7 +58,6 @@
         <sdc.client.version>1.4.0</sdc.client.version>
         <sdc.tosca.version>1.5.1</sdc.tosca.version>
 
-
     </properties>
 
     <dependencyManagement>
@@ -193,7 +186,6 @@
         </repository>
     </repositories>
 
-
     <build>
         <plugins>
             <plugin>
@@ -206,7 +198,4 @@
             </plugin>
         </plugins>
     </build>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
commit	b8245192892593bf59fd4769f72c7732e4e78840	[log] [tgz]
author	Dan Timoney <dtimoney@att.com>	Thu Oct 10 17:49:19 2019 +0000
committer	Gerrit Code Review <gerrit@onap.org>	Thu Oct 10 17:49:19 2019 +0000
tree	1c27ac02abc9ce891647bd3efc33127913b538a8
parent	2e8a4da68b26ffb5bf812fce9ebdace4b39d1c50 [diff]
parent	f08f70f7eb9cb907c40bd29f92ce7fabd5fe8d63 [diff]