Update license; improve coverage; add docs dir

Update licenses to match approved text; add where missing.
Improve code coverage with additional tests.
Use OParent.
Drop ecomp-portal-BE-common-test entirely; tests merged to ecomp-portal-BE-common.
All code from LF repo branch master_dev_amsterdam_1_3_0

Issue: PORTAL-42, PORTAL-50, PORTAL-90, PORTAL-96
Change-Id: I09d98bbf072411d2efed6fb34f378f7cc8d049ad
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 141 insertions, 118 deletions

diff --git a/pom.xml b/pom.xml
index 02fcc8cb..d8b727d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,132 +1,155 @@
 <?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">
+<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.openecomp.portal</groupId>
-	<artifactId>ecompportal-parent-project</artifactId>
-	<version>0</version>
+
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>0.1.1</version>
+		<relativePath />
+	</parent>
+ 	
+	<groupId>org.onap.portal</groupId>
+	<artifactId>onap-portal-parent</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>portal</name>
-	<properties>
-	<sonar.language>java</sonar.language>
-	<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-	<sonar.skipDesign>true</sonar.skipDesign>
-	<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-	<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-	<sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>
-	<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-	<sonar.projectVersion>${project.version}</sonar.projectVersion>
-    <sonar.skipDesign>true</sonar.skipDesign>
-    <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-    <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
-    <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-	 <sonar.java.binaries>.</sonar.java.binaries>	
-	</properties>
-	
-	<modules>
-		<!-- Child modules do NOT name this parent. -->
-		<!-- Defined for build convenience only! -->
 
-		<!-- This POM names only ONAP projects -->	
+	<modules>
+		<!-- This parent POM names only ONAP projects -->
 		<module>ecomp-portal-BE-common</module>
-		<module>ecomp-portal-BE-os</module>	
-<!-- 		<module>ecomp-portal-BE-common-test</module> -->
+		<module>ecomp-portal-BE-os</module>
 		<module>ecomp-portal-FE-os</module>
 		<module>ecomp-portal-widget-ms</module>
 	</modules>
 
+	<properties>
+		<!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
+		<build.number>0</build.number>
+		<epsdk.version>1.3.0</epsdk.version>
+		<springframework.version>4.2.0.RELEASE</springframework.version>
+		<hibernate.version>4.3.11.Final</hibernate.version>
+		<fasterxml.version>2.7.4</fasterxml.version>
+		<eelf.version>1.0.0</eelf.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<encoding>UTF-8</encoding>
+		<sonar.language>java</sonar.language>
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.skipDesign>true</sonar.skipDesign>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+		<sonar.skipDesign>true</sonar.skipDesign>
+		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+		<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+		<sonar.java.binaries>.</sonar.java.binaries>
+	</properties>
+
+	<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml files
+		among all developers.  Also use values (not properties) so oparent can be resolved.
+    -->
+	<repositories>
+		<repository>
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>https://nexus.onap.org/content/repositories/staging</url>
+		</repository>
+		<repository>
+			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</repository>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+		</repository>
+	</repositories>
+
+	<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml files
+		among all developers.  -->
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-plugin-release</id>
+			<url>https://nexus.onap.org/content/repositories/releases/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-plugin-staging</id>
+			<url>https://nexus.onap.org/content/repositories/staging/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-plugin-snapshots</id>
+			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<profiles>
+		<!-- disable doclint, a new feature in Java 8, when generating javadoc -->
+		<profile>
+			<id>doclint-java8-disable</id>
+			<activation>
+				<jdk>[1.8,)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.0.0-M1</version>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+
 	<build>
 		<pluginManagement>
-		    <plugins>
-		        <plugin>
-		            <artifactId>maven-compiler-plugin</artifactId>
-		            <version>3.1</version>
-		            <configuration>
-		                <source>1.8</source>
-		                <target>1.8</target>
-		            </configuration>
-		        </plugin>
-		        <plugin>
-		            <groupId>org.sonarsource.scanner.maven</groupId>
-		            <artifactId>sonar-maven-plugin</artifactId>
-		            <version>3.0.2</version>
-		        </plugin>
-		    </plugins>
+			<plugins>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
+					<configuration>
+						<source>1.8</source>
+						<target>1.8</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>3.0.2</version>
+				</plugin>
+			</plugins>
 		</pluginManagement>
 		<plugins>
-	<!-- No deployment step for this project -->
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-deploy-plugin</artifactId>
-			<version>2.8</version>
-			<configuration>
-				<skip>true</skip>
-			</configuration>
-		</plugin>
-		<plugin>
-	    <groupId>org.jacoco</groupId>
-	    <artifactId>jacoco-maven-plugin</artifactId>
-	    <version>0.7.6.201602180812</version>
-	    <inherited>True</inherited>
-	    <executions>
-	        <!-- Unit-Tests -->
-	        <execution>
-	            <id>prepare-agent</id>
-	            <goals>
-	                <goal>prepare-agent</goal>
-	            </goals>
-	            <configuration>
-	                <destFile>${sonar.jacoco.reportPath}</destFile>
-	            </configuration>
-	        </execution>
-	        <execution>
-	            <id>report</id>
-	            <goals>
-	                <goal>report</goal>
-	            </goals>
-	            <configuration>
-	                <dataFile>${sonar.jacoco.reportPath}</dataFile>
-	                <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-	            </configuration>
-	        </execution>
-	        <!-- Integration Tests (Only report goal) -->
-	        <execution>
-	            <id>report-integration</id>
-	            <goals>
-	                <goal>report-integration</goal>
-	            </goals>
-	            <configuration>
-	                <dataFile>${sonar.jacoco.itReportPath}</dataFile>
-	                <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
-	            </configuration>
-	        </execution>
-	        <execution>
-	            <id>default-instrument</id>
-	            <goals>
-	                <goal>instrument</goal>
-	            </goals>
-	            <configuration>
-	                <skip>${skipTests}</skip>
-	            </configuration>
-	        </execution>
-	        <execution>
-	            <id>default-restore-instrumented-classes</id>
-	            <goals>
-	                <goal>restore-instrumented-classes</goal>
-	            </goals>
-	            <configuration>
-	                <skip>${skipTests}</skip>
-	            </configuration>
-	        </execution>
-	    </executions>
-	</plugin>
-   </plugins>
-</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jacoco</groupId>
-			<artifactId>jacoco-maven-plugin</artifactId>
-			<version>0.7.6.201602180812</version>
-	    </dependency>
-	</dependencies>
-</project>
\ No newline at end of file
+			<!-- No deployment step for this project -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<distributionManagement>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:https://nexus.onap.org/content/sites/site/org/onap/portal/${project.version}</url>
+		</site>
+	</distributionManagement>
+
+</project>