X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3ea8ba418fc2e14a9613d23886a5a4ca9a90cf23;hb=f1714713e6abcdf8551b5fa30e6191f4abe0feb0;hp=b70ce3e1c4369e2fb0de7200df55e3a556070b0d;hpb=423f5f8baa977346ae990411ab4707777fd97a20;p=portal.git

diff --git a/pom.xml b/pom.xml
index b70ce3e1..3ea8ba41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,16 @@
 	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>0.1.1</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>
 
-
 	<groupId>org.onap.portal</groupId>
 	<artifactId>onap-portal-parent</artifactId>
-	<version>1.3.0</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>portal</name>
 
@@ -27,19 +25,20 @@
 	</modules>
 
 	<properties>
-		<!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
+		<!-- Jenkins should invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
 		<build.number>0</build.number>
-		<epsdk.version>1.3.1</epsdk.version>
-		<springframework.version>4.2.0.RELEASE</springframework.version>
+		<epsdk.version>2.6.0-SNAPSHOT</epsdk.version>
+		<springframework.version>4.2.3.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
-		<fasterxml.version>2.7.4</fasterxml.version>
+		<fasterxml.version>2.8.10</fasterxml.version>
 		<eelf.version>1.0.0</eelf.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>
 
 	<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
@@ -237,6 +236,11 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.0.2</version>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -247,5 +251,4 @@
 			<url>dav:https://nexus.onap.org/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
 		</site>
 	</distributionManagement>
-
 </project>