X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-widget-ms%2Fwidget-ms%2Fpom.xml;h=d0849df6ec92fc9aa431484e42292419f256fd38;hb=a738f3360784e22b7631fb241668aba552e1877e;hp=45da5d57bcfce63947d3156c28f2d4cc8ff104ce;hpb=23634dba70b166ad3c79b5eadfbd32b5375d44be;p=portal.git

diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 45da5d57..d0849df6 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -1,13 +1,9 @@
 <?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>
-	<groupId>org.openecomp.portal</groupId>
-	<artifactId>widget-ms</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-	<name>widget-microservice</name>
+		<modelVersion>4.0.0</modelVersion>
 
+	<!-- This project must name Spring as parent; cannot name Portal -->
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
@@ -15,19 +11,27 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
+	<groupId>org.onap.portal</groupId>
+	<artifactId>widget-ms</artifactId>
+	<version>2.6.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>widget-microservice</name>
+
 	<properties>
 		<docker.imagename>widget-ms</docker.imagename>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
-		<skipTests>true</skipTests>
+		<skipTests>false</skipTests>
+		<!-- Replicate this from OParent -->
+		<jacocoVersion>0.7.6.201602180812</jacocoVersion>
 	</properties>
 
 	<dependencies>
 		<!-- This pom pulls in artifacts -->
 		<dependency>
-			<groupId>org.openecomp.portal</groupId>
+			<groupId>org.onap.portal</groupId>
 			<artifactId>common-widgets</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
@@ -40,16 +44,22 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+    				<artifactId>spring-security-web</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -88,6 +98,11 @@
 			<artifactId>jasypt-spring-boot-starter</artifactId>
 			<version>1.9</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.12.1</version>
+       </dependency>
 		<!-- hibernate-core depends on dom4j, which has optional dependencies. 
 			On jenkins, contrary to doc, mvn 3.0.5 packages the optional dependencies 
 			in the war. Workaround: exclude them explicitly. -->
@@ -126,6 +141,53 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- Jacoco offline instrumentation agent -->
+		<dependency>
+			<groupId>org.jacoco</groupId>
+			<artifactId>org.jacoco.agent</artifactId>
+			<version>${jacocoVersion}</version>
+			<classifier>runtime</classifier>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.tomcat.embed</groupId>
+    		<artifactId>tomcat-embed-core</artifactId>
+    		<version>8.5.28</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.8.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.10</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.springframework.security</groupId>
+    		<artifactId>spring-security-web</artifactId>
+    		<version>4.1.4.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -133,18 +195,36 @@
 		<finalName>${project.artifactId}</finalName>
 
 		<!-- To add resources, must name all including usual src/main/resources -->
-                <resources>
+		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-                        <resource>
-                                <directory>../common-widgets/target</directory>
-                                <includes>
-                                        <include>**/*.zip</include>
-                                </includes>
-                        </resource>
-                </resources>
+			<resource>
+				<directory>../common-widgets/target</directory>
+				<includes>
+					<include>**/*.zip</include>
+				</includes>
+			</resource>
+		</resources>
+
+		<pluginManagement>
+			<plugins>
+				<!-- replicated from OParent -->
+				<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>
+			</plugins>
+		</pluginManagement>
 
 		<plugins>
 
@@ -157,38 +237,63 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8</version>
+				<!-- version set by spring <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>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-				<inherited>True</inherited>
+				<version>${jacocoVersion}</version>
 				<executions>
-					<!-- Unit-Tests -->
+					<!-- disable jacoco executions from oparent -->
+					<execution>
+						<id>pre-unit-test</id>
+						<phase>none</phase>
+					</execution>
 					<execution>
-						<id>prepare-agent</id>
+						<id>post-unit-test</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>post-integration-test</id>
+						<phase>none</phase>
+					</execution>
+					<!-- Order matters -->
+					<execution>
+						<id>portal-prepare-agent</id>
 						<goals>
 							<goal>prepare-agent</goal>
 						</goals>
-						<phase>test</phase>
 						<configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
 						</configuration>
 					</execution>
+					<!-- offline instrumentation for PowerMock -->
 					<execution>
-						<id>report</id>
+						<id>portal-offline-instrument</id>
 						<goals>
-							<goal>report</goal>
+							<goal>instrument</goal>
 						</goals>
+					</execution>
+					<execution>
+						<id>portal-restore-instrumented-classes</id>
+						<phase>test</phase>
+						<goals>
+							<goal>restore-instrumented-classes</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>portal-post-unit-test</id>
 						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
 						<configuration>
 							<dataFile>${sonar.jacoco.reportPath}</dataFile>
 							<outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
@@ -197,8 +302,25 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<systemPropertyVariables>
+						<jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 		</plugins>
 
 	</build>
 
+	<!-- This POM cannot inherit from OParent -->
+	<distributionManagement>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:https://nexus.onap.org/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
+		</site>
+	</distributionManagement>
+
 </project>