[SDNC-5] Boron port and bug fixes

Changes to support Boron as well as bug fixes discovered during initial testing.

Change-Id: Ic6c156c8fe884a6a3bccc19d0676da312be8a4c2
Signed-off-by: Dan Timoney <dtimoney@att.com>

3 files changed, 515 insertions, 514 deletions

diff --git a/rootpom/pom.xml b/rootpom/pom.xml
index 7e1d06e..8bc3855 100755
--- a/rootpom/pom.xml
+++ b/rootpom/pom.xml
@@ -39,6 +39,7 @@
 		<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>
@@ -68,11 +69,11 @@
 
 
 		<!--  SDN-C component versions  -->
-		<sdnc.core.version>1.1.0-SNAPSHOT</sdnc.core.version>
-		<sdnc.adaptors.version>1.1.0-SNAPSHOT</sdnc.adaptors.version>
-		<sdnc.northbound.version>1.1.0-SNAPSHOT</sdnc.northbound.version>
-		<sdnc.oam.version>1.1.0-SNAPSHOT</sdnc.oam.version>
-		<sdnc.plugins.version>1.1.0-SNAPSHOT</sdnc.plugins.version>
+		<sdnc.core.version>(1.0.999,1.1.999)</sdnc.core.version>
+		<sdnc.adaptors.version>(1.0.999,1.1.999)</sdnc.adaptors.version>
+		<sdnc.northbound.version>(1.0.999,1.1.999)</sdnc.northbound.version>
+		<sdnc.oam.version>(1.0.999,1.1.999)</sdnc.oam.version>
+		<sdnc.plugins.version>(1.0.999,1.1.999)</sdnc.plugins.version>
 		<sdnctl.sli.version>${sdnc.core.version}</sdnctl.sli.version>
 		<sdnctl.aai.service.version>${sdnc.adaptors.version}</sdnctl.aai.service.version>
 		<sdnctl.dblib.version>${sdnc.core.version}</sdnctl.dblib.version>
@@ -156,400 +157,80 @@
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.sdnc.core</groupId>
 	<artifactId>root</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
-
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.opendaylight.controller</groupId>
-				<artifactId>opendaylight-karaf-empty</artifactId>
-				<version>${odl.karaf.empty.distro.version}</version>
-				<type>zip</type>
-			</dependency>
-
-
-			<dependency>
-				<groupId>org.openecomp.sdnc.core</groupId>
-				<artifactId>sli-common</artifactId>
-				<version>${sdnctl.sli.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.openecomp.sdnc.core</groupId>
-				<artifactId>sli-provider</artifactId>
-				<version>${sdnctl.sli.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.openecomp.sdnc.core</groupId>
-				<artifactId>aai-service-provider</artifactId>
-				<version>${sdnctl.aai.service.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.openecomp.sdnc.core</groupId>
-				<artifactId>dblib-provider</artifactId>
-				<version>${sdnctl.dblib.version}</version>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
-
-	<name>SDNC Root</name>
-	<url>http://wiki.onap.org</url>
-	<description>Root POM to be used for all SDNC projects</description>
-
-
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
-
-	<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>
-					<additionalDependencies>
-						<additionalDependency>
-							<groupId>org.opendaylight.odlparent</groupId>
-							<artifactId>odlparent</artifactId>
-							<version>1.7.1-Boron-SR1</version>
-						</additionalDependency>
-						<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.json.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>com.sun.jersey</groupId>
-							<artifactId>jersey-core</artifactId>
-							<version>${jersey.json.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.apache.httpcomponents</groupId>
-							<artifactId>httpcore-osgi</artifactId>
-							<version>${apache.httpcomponents.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.apache.httpcomponents</groupId>
-							<artifactId>httpclient-osgi</artifactId>
-							<version>${apache.httpcomponents.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-databind</artifactId>
-							<version>${fasterxml.jackson.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-annotations</artifactId>
-							<version>${fasterxml.jackson.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-core</artifactId>
-							<version>${fasterxml.jackson.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>commons-lang</groupId>
-							<artifactId>commons-lang</artifactId>
-							<version>${commons.lang.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.opendaylight.mdsal</groupId>
-							<artifactId>yang-binding</artifactId>
-							<version>${odl.mdsal.yang.binding.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.opendaylight.yangtools</groupId>
-							<artifactId>yang-common</artifactId>
-							<version>${odl.yangtools.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.opendaylight.mdsal.model</groupId>
-							<artifactId>ietf-inet-types</artifactId>
-							<version>${odl.ietf-inet-types.version}</version>
-						</additionalDependency>
-						<additionalDependency>
-							<groupId>org.opendaylight.mdsal.model</groupId>
-							<artifactId>ietf-yang-types</artifactId>
-							<version>${odl.ietf-yang-types.version}</version>
-						</additionalDependency>
-					</additionalDependencies>
-				</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>openecomp-public</id>
-			<url>${openecomp.nexus.public-url}</url>
-			<releases>
-				<enabled>true</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>openecomp-public</id>
-			<url>${openecomp.nexus.public-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<!-- <updatePolicy>always</updatePolicy> <updatePolicy>never</updatePolicy>
-					<updatePolicy>daily</updatePolicy> <updatePolicy>interval:in minutes</updatePolicy> -->
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<!-- <updatePolicy>always</updatePolicy> <updatePolicy>never</updatePolicy>
-					<updatePolicy>daily</updatePolicy> <updatePolicy>interval:30</updatePolicy> -->
-			</snapshots>
-		</repository>
-		<repository>
-			<id>openecomp-release</id>
-			<name>openecomp-repository-releases</name>
-			<url>${openecomp.nexus.release-url}</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>openecomp-snapshot</id>
-			<name>openecomp-repository-snapshots</name>
-			<url>${openecomp.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<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>
-		</repository>
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>${opendaylight.nexus.snapshot-url}</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/${project.version}</url>
-		</site>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>openecomp-repository-releases</name>
-			<url>${openecomp.nexus.release-url}</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>openecomp-repository-snapshots</name>
-			<url>${openecomp.nexus.snapshot-url}</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<pluginManagement>
+	<version>1.1.0-SNAPSHOT</version>
+
+
+		<dependencyManagement>
+			<dependencies>
+				<dependency>
+					<groupId>org.opendaylight.controller</groupId>
+					<artifactId>opendaylight-karaf-empty</artifactId>
+					<version>${odl.karaf.empty.distro.version}</version>
+					<type>zip</type>
+				</dependency>
+
+
+				<dependency>
+					<groupId>org.openecomp.sdnc.core</groupId>
+					<artifactId>sli-common</artifactId>
+					<version>${sdnctl.sli.version}</version>
+				</dependency>
+
+				<dependency>
+					<groupId>org.openecomp.sdnc.core</groupId>
+					<artifactId>sli-provider</artifactId>
+					<version>${sdnctl.sli.version}</version>
+				</dependency>
+
+				<dependency>
+					<groupId>org.openecomp.sdnc.core</groupId>
+					<artifactId>aai-service-provider</artifactId>
+					<version>${sdnctl.aai.service.version}</version>
+				</dependency>
+
+				<dependency>
+					<groupId>org.openecomp.sdnc.core</groupId>
+					<artifactId>dblib-provider</artifactId>
+					<version>${sdnctl.dblib.version}</version>
+				</dependency>
+			</dependencies>
+
+		</dependencyManagement>
+
+
+		<name>SDNC Root</name>
+		<url>http://wiki.onap.org</url>
+		<description>Root POM to be used for all SDNC projects</description>
+
+
+		<issueManagement>
+			<system>JIRA</system>
+			<url>https://jira.onap.org/</url>
+		</issueManagement>
+
+		<reporting>
 			<plugins>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency><!-- add support for ssh/scp -->
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-ssh</artifactId>
-							<version>1.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-webdav-jackrabbit</artifactId>
-							<version>2.10</version>
-						</dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<id>attach-descriptor</id>
-							<goals>
-								<goal>attach-descriptor</goal>
-							</goals>
-						</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.codehaus.mojo</groupId>
-					<artifactId>sonar-maven-plugin</artifactId>
-					<version>3.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10</version>
+					<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>
 						<additionalDependencies>
 							<additionalDependency>
+								<groupId>org.opendaylight.odlparent</groupId>
+								<artifactId>odlparent</artifactId>
+								<version>1.7.1-Boron-SR1</version>
+							</additionalDependency>
+							<additionalDependency>
 								<groupId>org.slf4j</groupId>
 								<artifactId>slf4j-api</artifactId>
 								<version>${slf4j.version}</version>
@@ -568,12 +249,12 @@
 							<additionalDependency>
 								<groupId>com.sun.jersey</groupId>
 								<artifactId>jersey-client</artifactId>
-								<version>${jersey.client.version}</version>
+								<version>${jersey.json.version}</version>
 							</additionalDependency>
 							<additionalDependency>
 								<groupId>com.sun.jersey</groupId>
 								<artifactId>jersey-core</artifactId>
-								<version>${jersey.version}</version>
+								<version>${jersey.json.version}</version>
 							</additionalDependency>
 							<additionalDependency>
 								<groupId>org.apache.httpcomponents</groupId>
@@ -588,17 +269,17 @@
 							<additionalDependency>
 								<groupId>com.fasterxml.jackson.core</groupId>
 								<artifactId>jackson-databind</artifactId>
-								<version>${jackson.version}</version>
+								<version>${fasterxml.jackson.version}</version>
 							</additionalDependency>
 							<additionalDependency>
 								<groupId>com.fasterxml.jackson.core</groupId>
 								<artifactId>jackson-annotations</artifactId>
-								<version>${jackson.version}</version>
+								<version>${fasterxml.jackson.version}</version>
 							</additionalDependency>
 							<additionalDependency>
 								<groupId>com.fasterxml.jackson.core</groupId>
 								<artifactId>jackson-core</artifactId>
-								<version>${jackson.version}</version>
+								<version>${fasterxml.jackson.version}</version>
 							</additionalDependency>
 							<additionalDependency>
 								<groupId>commons-lang</groupId>
@@ -627,155 +308,475 @@
 							</additionalDependency>
 						</additionalDependencies>
 					</configuration>
-
-					<executions>
-						<execution>
+					<reportSets>
+						<reportSet>
+							<reports>
+								<report>javadoc-no-fork</report>
+								<report>test-javadoc-no-fork</report>
+							</reports>
+						</reportSet>
+						<reportSet>
 							<id>aggregate</id>
-							<goals>
-								<goal>aggregate</goal>
-							</goals>
-							<phase>site</phase>
-
-						</execution>
-					</executions>
+							<reports>
+								<report>aggregate</report>
+								<report>test-aggregate</report>
+							</reports>
+						</reportSet>
+					</reportSets>
 				</plugin>
 				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
+					<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>openecomp-public</id>
+				<url>${openecomp.nexus.public-url}</url>
+				<releases>
+					<enabled>true</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>openecomp-public</id>
+				<url>${openecomp.nexus.public-url}</url>
+				<releases>
+					<enabled>true</enabled>
+					<!-- <updatePolicy>always</updatePolicy> <updatePolicy>never</updatePolicy>
+						<updatePolicy>daily</updatePolicy> <updatePolicy>interval:in minutes</updatePolicy> -->
+					<updatePolicy>never</updatePolicy>
+				</releases>
+				<snapshots>
+					<enabled>true</enabled>
+					<updatePolicy>always</updatePolicy>
+					<!-- <updatePolicy>always</updatePolicy> <updatePolicy>never</updatePolicy>
+						<updatePolicy>daily</updatePolicy> <updatePolicy>interval:30</updatePolicy> -->
+				</snapshots>
+			</repository>
+			<repository>
+				<id>openecomp-release</id>
+				<name>openecomp-repository-releases</name>
+				<url>${openecomp.nexus.release-url}</url>
+				<releases>
+					<enabled>true</enabled>
+					<updatePolicy>never</updatePolicy>
+				</releases>
+				<snapshots>
+					<enabled>false</enabled>
+				</snapshots>
+			</repository>
+			<repository>
+				<id>openecomp-snapshot</id>
+				<name>openecomp-repository-snapshots</name>
+				<url>${openecomp.nexus.snapshot-url}</url>
+				<releases>
+					<enabled>false</enabled>
+				</releases>
+				<snapshots>
+					<enabled>true</enabled>
+				</snapshots>
+			</repository>
+			<repository>
+				<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>
+			</repository>
+			<repository>
+				<id>opendaylight-snapshot</id>
+				<name>opendaylight-snapshot</name>
+				<url>${opendaylight.nexus.snapshot-url}</url>
+				<releases>
+					<enabled>false</enabled>
+				</releases>
+				<snapshots>
+					<enabled>true</enabled>
+				</snapshots>
+			</repository>
+
+		</repositories>
+
+		<distributionManagement>
+			<site>
+				<id>ecomp-site</id>
+				<url>dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/${project.version}</url>
+			</site>
+			<repository>
+				<id>ecomp-releases</id>
+				<name>openecomp-repository-releases</name>
+				<url>${openecomp.nexus.release-url}</url>
+			</repository>
+			<snapshotRepository>
+				<id>ecomp-snapshots</id>
+				<name>openecomp-repository-snapshots</name>
+				<url>${openecomp.nexus.snapshot-url}</url>
+			</snapshotRepository>
+		</distributionManagement>
+
+		<build>
+			<pluginManagement>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-site-plugin</artifactId>
+						<version>3.6</version>
+						<dependencies>
+							<dependency><!-- add support for ssh/scp -->
+								<groupId>org.apache.maven.wagon</groupId>
+								<artifactId>wagon-ssh</artifactId>
+								<version>1.0</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.maven.wagon</groupId>
+								<artifactId>wagon-webdav-jackrabbit</artifactId>
+								<version>2.10</version>
+							</dependency>
+						</dependencies>
+						<executions>
+							<execution>
+								<id>attach-descriptor</id>
+								<goals>
+									<goal>attach-descriptor</goal>
+								</goals>
+							</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.codehaus.mojo</groupId>
+						<artifactId>sonar-maven-plugin</artifactId>
+						<version>3.2</version>
+					</plugin>
+					<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.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>org.apache.httpcomponents</groupId>
+									<artifactId>httpclient-osgi</artifactId>
+									<version>${apache.httpcomponents.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>com.fasterxml.jackson.core</groupId>
+									<artifactId>jackson-databind</artifactId>
+									<version>${jackson.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>com.fasterxml.jackson.core</groupId>
+									<artifactId>jackson-annotations</artifactId>
+									<version>${jackson.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>com.fasterxml.jackson.core</groupId>
+									<artifactId>jackson-core</artifactId>
+									<version>${jackson.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>commons-lang</groupId>
+									<artifactId>commons-lang</artifactId>
+									<version>${commons.lang.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>org.opendaylight.mdsal</groupId>
+									<artifactId>yang-binding</artifactId>
+									<version>${odl.mdsal.yang.binding.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>org.opendaylight.yangtools</groupId>
+									<artifactId>yang-common</artifactId>
+									<version>${odl.yangtools.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>org.opendaylight.mdsal.model</groupId>
+									<artifactId>ietf-inet-types</artifactId>
+									<version>${odl.ietf-inet-types.version}</version>
+								</additionalDependency>
+								<additionalDependency>
+									<groupId>org.opendaylight.mdsal.model</groupId>
+									<artifactId>ietf-yang-types</artifactId>
+									<version>${odl.ietf-yang-types.version}</version>
+								</additionalDependency>
+							</additionalDependencies>
+						</configuration>
 
-		</pluginManagement>
+						<executions>
+							<execution>
+								<id>aggregate</id>
+								<goals>
+									<goal>aggregate</goal>
+								</goals>
+								<phase>site</phase>
+
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>2.1.1</version>
+						<executions>
+							<execution>
+								<id>bundle-sources</id>
+								<phase>package</phase>
+								<goals>
+									<!-- produce source artifact for main project sources -->
+									<goal>jar-no-fork</goal>
+
+									<!-- produce source artifact for project test sources -->
+									<goal>test-jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+
+				</plugins>
+
+			</pluginManagement>
 
-		<plugins>
-			<!-- license plugin -->
+			<plugins>
+				<!-- license plugin -->
 
-			<plugin>
+				<plugin>
 
-				<groupId>org.codehaus.mojo</groupId>
+					<groupId>org.codehaus.mojo</groupId>
 
-				<artifactId>license-maven-plugin</artifactId>
+					<artifactId>license-maven-plugin</artifactId>
 
-				<version>1.10</version>
+					<version>1.10</version>
 
-				<configuration>
+					<configuration>
 
-					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
 
-					<processStartTag>============LICENSE_START=======================================================</processStartTag>
+						<processStartTag>============LICENSE_START=======================================================</processStartTag>
 
-					<processEndTag>============LICENSE_END=========================================================</processEndTag>
+						<processEndTag>============LICENSE_END=========================================================</processEndTag>
 
-					<sectionDelimiter>================================================================================</sectionDelimiter>
+						<sectionDelimiter>================================================================================</sectionDelimiter>
 
-					<licenseName>apache_v2</licenseName>
+						<licenseName>apache_v2</licenseName>
 
-					<inceptionYear>2017</inceptionYear>
+						<inceptionYear>2017</inceptionYear>
 
-					<organizationName>AT&amp;T Intellectual Property. All rights
-						reserved.</organizationName>
+						<organizationName>AT&amp;T Intellectual Property. All rights
+							reserved.</organizationName>
 
-					<projectName>openECOMP : SDN-C</projectName>
+						<projectName>openECOMP : SDN-C</projectName>
 
-					<canUpdateCopyright>true</canUpdateCopyright>
+						<canUpdateCopyright>true</canUpdateCopyright>
 
-					<canUpdateDescription>true</canUpdateDescription>
+						<canUpdateDescription>true</canUpdateDescription>
 
-					<canUpdateLicense>true</canUpdateLicense>
+						<canUpdateLicense>true</canUpdateLicense>
 
-					<emptyLineAfterHeader>true</emptyLineAfterHeader>
-					<excludes>
-						<exclude>**/*.png</exclude>
-						<exclude>**/*.json</exclude>
-					</excludes>
+						<emptyLineAfterHeader>true</emptyLineAfterHeader>
+						<excludes>
+							<exclude>**/*.png</exclude>
+							<exclude>**/*.json</exclude>
+						</excludes>
 
-				</configuration>
+					</configuration>
 
-				<executions>
+					<executions>
 
-					<execution>
+						<execution>
 
-						<id>first</id>
+							<id>first</id>
 
-						<goals>
+							<goals>
 
-							<goal>update-file-header</goal>
+								<goal>update-file-header</goal>
 
-						</goals>
+							</goals>
 
-						<phase>process-sources</phase>
+							<phase>process-sources</phase>
 
-					</execution>
+						</execution>
 
-				</executions>
+					</executions>
 
-			</plugin>
+				</plugin>
 
-			<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.3</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-scm-plugin</artifactId>
-				<version>1.8.1</version>
-				<configuration>
-					<tag>${project.artifactId}-${project.version}</tag>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
-					<stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
-					<serverId>${openecomp.nexus.staging.server-id}</serverId>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<organization>
-		<name>OpenECOMP</name>
-	</organization>
+				<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.3</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.8.1</version>
+					<configuration>
+						<tag>${project.artifactId}-${project.version}</tag>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
+						<stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
+						<serverId>${openecomp.nexus.staging.server-id}</serverId>
+					</configuration>
+				</plugin>
+			</plugins>
+		</build>
+		<organization>
+			<name>OpenECOMP</name>
+		</organization>
 </project>
diff --git a/rootpom/src/site/site.xml b/rootpom/src/site/site.xml
index cd1f1c9..497b146 100644
--- a/rootpom/src/site/site.xml
+++ b/rootpom/src/site/site.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
+  							reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/rootpom/src/site/site_en.xml b/rootpom/src/site/site_en.xml
index cd1f1c9..497b146 100644
--- a/rootpom/src/site/site_en.xml
+++ b/rootpom/src/site/site_en.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
+  							reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.