X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3fe2b7116530ae7f107dafc8cc6580f8f9ef507e;hb=9c65fe3d7931cb7a24d7925ee6c67c1821c4d8d6;hp=3986bf4b0dd77e067f065c3ddf977e1ddd0beb57;hpb=2797e7b247f586f8a3a452dbb6cf883b7169c8ca;p=portal.git

diff --git a/pom.xml b/pom.xml
index 3986bf4b..3fe2b711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,19 @@
 <?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>
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.2.0</version>
-		<relativePath/>
+		<version>2.0.0</version>
+		<relativePath />
 	</parent>
 
 	<groupId>org.onap.portal</groupId>
 	<artifactId>onap-portal-parent</artifactId>
-	<version>2.3.0</version>
+	<version>3.2.0</version>
+
 	<packaging>pom</packaging>
 	<name>portal</name>
 
@@ -19,23 +21,24 @@
 		<!-- This parent POM names only ONAP projects -->
 		<module>ecomp-portal-BE-common</module>
 		<module>ecomp-portal-BE-os</module>
-		<module>ecomp-portal-FE-os</module>
+		<module>portal-FE-os</module>
 		<module>ecomp-portal-widget-ms</module>
+		<module>portal-BE</module>
 	</modules>
 
 	<properties>
 		<!-- Jenkins should invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
 		<build.number>0</build.number>
-		<epsdk.version>2.3.1</epsdk.version>
-		<springframework.version>4.2.3.RELEASE</springframework.version>
+		<epsdk.version>2.6.0</epsdk.version>
+		<springframework.version>4.3.24.RELEASE</springframework.version>
+		<springframework.security.version>4.2.13.RELEASE</springframework.security.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
-		<fasterxml.version>2.8.10</fasterxml.version>
-		<eelf.version>1.0.0</eelf.version>
+		<fasterxml.version>2.8.11.4</fasterxml.version>
 		<!-- NOT provided by OParent, unfortunately -->
 		<jacocoVersion>0.7.6.201602180812</jacocoVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<encoding>UTF-8</encoding>
-		<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+		<!-- <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>  -->
 		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
 		<enforcer.skip>false</enforcer.skip>
 	</properties>
@@ -124,7 +127,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore/>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -240,6 +243,61 @@
 				<artifactId>sonar-maven-plugin</artifactId>
 				<version>3.0.2</version>
 			</plugin>
+			
+			<plugin>
+			<artifactId>maven-checkstyle-plugin</artifactId>
+			<version>2.17</version>
+			<dependencies>
+			  <dependency>
+				<groupId>org.onap.oparent</groupId>
+				<artifactId>checkstyle</artifactId>
+				<version>2.0.0</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>
+				  <failsOnViolation>false</failsOnViolation>
+				</configuration>
+			  </execution>
+			  <execution>
+				<id>onap-java-style</id>
+				<goals>
+				  <goal>check</goal>
+				</goals>
+				<phase>none</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}</sourceDirectory>
+				  <includeResources>true</includeResources>
+				  <includeTestSourceDirectory>true</includeTestSourceDirectory>
+				  <includeTestResources>true</includeTestResources>
+				  <excludes>
+				  </excludes>
+				  <consoleOutput>true</consoleOutput>
+				  <failsOnViolation>false</failsOnViolation>
+				</configuration>
+			  </execution>
+			</executions>
+		  </plugin>
+		  
 		</plugins>
 	</build>