X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fpom.xml;h=0a45000f97034f5836a12485b337f698c4f837e7;hb=1b29c0944a7eba1c88cfd25c94e4dd7ed0f82dc7;hp=45927490becadfc3bd298c3c45f637fd87c837e9;hpb=335773f2cb017ee1ce0dbe173a2da1819c083bfd;p=portal.git

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 45927490..0a45000f 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -1,70 +1,56 @@
 <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>
+	<groupId>org.onap.portal</groupId>
 	<artifactId>ecompportal-be-os</artifactId>
 	<packaging>war</packaging>
-	<!-- Jenkins is not used to build the o/s version -->
 	<version>1.1</version>
 
 	<properties>
+		<portal.version>1.3.0-SNAPSHOT</portal.version>
+		<epsdk.version>1.3.0</epsdk.version>
+		<!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
+		<build.number>0</build.number>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<eelf.version>1.0.0</eelf.version>
-		<epsdk.version>1.1.0</epsdk.version>
-		<portal.version>1.1.0</portal.version>
 		<encoding>UTF-8</encoding>
-		<!-- Tests usually require some setup that maven cannot do, so skip. -->
-		<skiptests>false</skiptests>
-		<!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
-		<build.number>0</build.number>
+		<!-- If skipTests is false use this command to generate the report:
+			mvn clean jacoco:prepare-agent install jacoco:report  -->
+		<skipTests>false</skipTests>
+		<skipCoverage>false</skipCoverage>		
+		<jacoco.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.data.file>
+		<sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version>
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
 		<sonar.exclusions>**.js</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
 		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
 	</properties>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<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>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<distributionManagement>
-		<site>
-			<id>nexus</id>
-			<url>dav:https://ecomp-nexus:8443/repository/portal-javadoc/${epsdk.version}</url>
-		</site>
-	</distributionManagement>
 	<repositories>
 		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP - Release Repository</name>
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
 			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP - Snapshot Repository</name>
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>${nexusproxy}/${stagingNexusPath}</url>
+		</repository>
+		<repository>
+			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 		<repository>
-			<id>ecomp-public</id>
-			<name>ecomp onap public Repository</name>
-			<url>https://nexus.onap.org/content/groups/public</url>
+			<id>onap-public</id>
+			<url>${nexusproxy}/content/groups/public</url>
 		</repository>
 	</repositories>
 
@@ -99,6 +85,94 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+						<plugin>
+			    <groupId>org.jacoco</groupId>
+			    <artifactId>jacoco-maven-plugin</artifactId>
+			    <version>0.7.6.201602180812</version>
+			    <executions>
+			        <execution>
+			            <id>prepare-agent</id>
+			            <goals>
+			                <goal>prepare-agent</goal>
+			            </goals>
+			            <phase>test</phase>
+			            <configuration>
+			                <destFile>${sonar.jacoco.reportPath}</destFile>
+			                <skip>${skipCoverage}</skip>
+			            </configuration>
+			        </execution>
+			        <execution>
+			            <id>report</id>
+			            <goals>
+			                <goal>report</goal>
+			            </goals>
+			            <phase>test</phase>
+			            <configuration>
+			                <dataFile>${sonar.jacoco.reportPath}</dataFile>
+			                <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
+			                <skip>${skipCoverage}</skip>
+			            </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>
+			                <skip>${skipCoverage}</skip>
+			            </configuration>
+			        </execution>
+			        <!-- Will see build errors while running the test cases because of dual 
+									instrumentation -->
+			        <execution>
+			            <id>default-instrument</id>
+			            <goals>
+			                <goal>instrument</goal>
+			            </goals>
+			            <configuration>
+			                <skip>${skipCoverage}</skip>
+			            </configuration>
+			        </execution>
+			        <execution>
+			            <id>default-restore-instrumented-classes</id>
+			            <goals>
+			                <goal>restore-instrumented-classes</goal>
+			            </goals>
+			            <configuration>
+			                <skip>${skipCoverage}</skip>
+			            </configuration>
+			        </execution>
+			    </executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<skipTests>${skipTests}</skipTests>
+					<includes>
+						<include>**/*Test.java</include>
+						<include>**/*TestCase.java</include>
+						<inlcude>**/*TestSuite.java</inlcude>
+					</includes>
+					<!-- Intentionally Excluding TestFromSuite -->
+					<excludes>
+						<exclude>**/*TestFromSuite.java</exclude>
+					</excludes>
+					<additionalClasspathElements>
+						<additionalClasspathElement>${basedir}/src/main/webapp</additionalClasspathElement>
+						<additionalClasspathElement>../ecomp-portal-BE-common/src/main/webapp</additionalClasspathElement>
+						<additionalClasspathElement>../ecomp-portal-BE-common</additionalClasspathElement>
+					</additionalClasspathElements>
+					<systemPropertyVariables>
+						<container.classpath>classpath:</container.classpath>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
@@ -116,23 +190,32 @@
 						</manifestEntries>
 					</archive>
 					<overlays>
-						<!-- specify the order in which these should be applied -->
+						<!-- specify the order in which these should be applied -->						
 						<overlay>
-							<groupId>org.openecomp.ecompsdkos</groupId>
-							<artifactId>epsdk-app-overlay</artifactId>
-						</overlay>
-						<overlay>
-							<groupId>org.openecomp.portal</groupId>
+							<groupId>org.onap.portal</groupId>
 							<artifactId>ecompportal-be-common</artifactId>
 						</overlay>
+						<overlay>
+							<groupId>org.onap.portal.sdk</groupId>
+							<artifactId>epsdk-app-overlay</artifactId>
+						</overlay>						
 					</overlays>
 				</configuration>
 			</plugin>
 
+			<!-- 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>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.0.2</version>
 				<!-- Your own property files can be placed in ecomp-portal-be/../../overrides 
 					directory and they will override the generic source controlled versions at 
 					build time allowing you to test locally with your own settings. -->
@@ -196,50 +279,25 @@
 							</resources>
 						</configuration>
 					</execution>
+<!-- 					<execution> -->
+<!-- 						<id>copy-src</id> -->
+<!-- 						<phase>generate-resources</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>copy-resources</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<outputDirectory>${basedir}/target/classes</outputDirectory> -->
+<!-- 							<overwrite>false</overwrite> -->
+<!-- 							<skip>${skipTests}</skip> -->
+<!-- 							<resources> -->
+<!-- 								<resource> -->
+<!-- 									<directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> -->
+<!-- 								</resource> -->
+<!-- 							</resources> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
 				</executions>
 			</plugin>
-			<!-- 
-			<plugin>
-			    <groupId>org.codehaus.mojo</groupId>
-			    <artifactId>license-maven-plugin</artifactId>
-			    <version>1.10</version>
-			    <configuration>
-		              <encoding>UTF-8</encoding>
-			        <licenseName>my_license</licenseName>
-			        <licenseResolver>${project.baseUri}/license</licenseResolver>
-			        <inceptionYear>2017</inceptionYear>
-				<organizationName>AT&amp;T Intellectual Property</organizationName>
-				<projectName>ECOMP Portal</projectName> 
-				<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> 
-     				<processStartTag>================================================================================</processStartTag>
-     				<sectionDelimiter>================================================================================</sectionDelimiter>
-     				<processEndTag>================================================================================</processEndTag> 
-			    	<roots>
-					<root>src/main</root>
-					<root>src/test</root>
-				</roots>
-				<excludes>
-					<exclude>*.png</exclude>
-					<exclude>*.drl</exclude>
-					<exclude>*.gif</exclude>
-					<exclude>*.jpeg</exclude>
-					<exclude>*.jpg</exclude>
-					<exclude>*.bmp</exclude>
-					<exclude>*.ico</exclude>
-					<exclude>*.svg</exclude>
-				</excludes>
-			    </configuration>
-			    <executions>
-			        <execution>
-			            <id>first</id>
-			            <goals>
-			                <goal>update-file-header</goal>
-			            </goals>
-			            <phase>process-sources</phase>
-			        </execution>
-			    </executions>
-			</plugin>
-			 -->
 		</plugins>
 
 		<testResources>
@@ -282,17 +340,29 @@
 	</build>
 
 	<dependencies>
+	<!--  
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
 			<version>${eelf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-module-junit4</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+	
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.5</version>
 		</dependency>
-
+	-->
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -416,13 +486,14 @@
 			<artifactId>classmate</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
+	
+		<!-- Use Mariadb connector/j for failover -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.22</version>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>1.5.8</version>
 		</dependency>
-
+		
 		<!-- Elastic Search -->
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
@@ -445,7 +516,6 @@
 					<artifactId>*</artifactId>
 				</exclusion>
 			</exclusions>
-			<!-- -->
 		</dependency>
 
 		<dependency>
@@ -573,14 +643,14 @@
 
 		<!-- SDK overlay war -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-overlay</artifactId>
 			<version>${epsdk.version}</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-common</artifactId>
 			<version>${epsdk.version}</version>
 			<type>jar</type>
@@ -588,14 +658,14 @@
 
 		<!-- EcompPortal common overlay -->
 		<dependency>
-			<groupId>org.openecomp.portal</groupId>
+			<groupId>org.onap.portal</groupId>
 			<artifactId>ecompportal-be-common</artifactId>
 			<version>${portal.version}</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.portal</groupId>
+			<groupId>org.onap.portal</groupId>
 			<artifactId>ecompportal-be-common</artifactId>
 			<version>${portal.version}</version>
 			<type>jar</type>
@@ -603,7 +673,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-fw</artifactId>
 			<version>${epsdk.version}</version>
 			<exclusions>
@@ -627,13 +697,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-workflow</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
@@ -641,7 +711,7 @@
 		<!-- Raptor required Libraries -->
 		<!-- for static charts -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-analytics</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
@@ -661,13 +731,35 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-core</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.8.5</version>
+			<scope>test</scope>
+		</dependency>
+        <dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
 			<version>1.9.2</version>
 		</dependency>
-
+         
+         
+		
 		<!-- OpenID Connect Dependencies -->
 		<dependency>
 			<groupId>org.mitre</groupId>
@@ -705,4 +797,34 @@
 		</dependency>
 
 	</dependencies>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<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>
+				</configuration>
+			</plugin>
+			
+		</plugins>
+	</reporting>
+
+	<distributionManagement>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}/content/sites/site/org/onap/portal/${project.version}</url>
+		</site>
+	</distributionManagement>
+
 </project>