Merge "Sonar fix in ecomp-portal-BE-common"

[portal.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 055ea26..3ea8ba4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
        <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>2.2.0</version>
+       <version>2.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>portal</name>
 
@@ -27,17 +27,18 @@
        <properties>
                <!-- Jenkins should invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
                <build.number>0</build.number>
-               <epsdk.version>2.1.0</epsdk.version>
-               <springframework.version>4.2.2.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.9.2</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