X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=5fe1cb5b8d764ab64dc7577ea941b49b4150f3ea;hb=ef3165222d153feec6168a0544d75951c982dcad;hp=3af9e1fccc2b3ca851b78584728f05b7bbb412cc;hpb=f70e2b5f66493822b512767d504ae26275cb16a2;p=sdc.git

diff --git a/pom.xml b/pom.xml
index 3af9e1fccc..5fe1cb5b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@ Modifications copyright (c) 2018-2019 Nokia
 ================================================================================
 -->
 <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">
+         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.sdc</groupId>
   <artifactId>sdc-main</artifactId>
-  <version>1.6.1-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>sdc</name>
 
@@ -57,7 +57,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <ecomp.version>2.6.0</ecomp.version>
     <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
     <cadi.version>2.1.8</cadi.version>
-    <lombok.version>1.18.2</lombok.version>
+    <lombok.version>1.18.12</lombok.version>
     <commons-beanutils>1.9.3</commons-beanutils>
     <commons-configuration>2.3</commons-configuration>
     <apache-poi.version>4.1.0</apache-poi.version>
@@ -113,8 +113,10 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <!--TESTING-->
     <mockito.version>2.18.3</mockito.version>
+    <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
     <jmockit.version>1.33</jmockit.version>
     <junit.version>4.12</junit.version>
+    <junitJupiter.version>5.6.0</junitJupiter.version>
     <assertj.version>3.10.0</assertj.version>
     <testng.version>6.14.3</testng.version>
     <extentreports.version>3.0.3</extentreports.version>
@@ -122,17 +124,16 @@ Modifications copyright (c) 2018-2019 Nokia
     <bean-matchers.version>0.11</bean-matchers.version>
     <hamcrest.version>2.1</hamcrest.version>
     <hamcrest-all.version>1.3</hamcrest-all.version>
-    <junit-jupiter.version>5.4.0</junit-jupiter.version>
-    <junit-vintage.version>5.4.0</junit-vintage.version>
-    <junit-platform.version>1.1.0</junit-platform.version>
-    <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
     <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
 
     <!-- parser-->
     <sdc-tosca-parser.version>1.6.5</sdc-tosca-parser.version>
 
     <!-- sonar -->
-    <sonar.language>java</sonar.language>
+    <sonar.coverage.jacoco.xmlReportPaths>
+      ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
     <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
     <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
     <sonar.branch>${project.version}</sonar.branch>
@@ -161,7 +162,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <!--sdc-security-utils-->
     <security.util.lib.version>1.6.0</security.util.lib.version>
     <!--jacoco-->
-    <jacoco.version>0.8.1</jacoco.version>
+    <jacoco.version>0.8.5</jacoco.version>
 
   </properties>
 
@@ -243,21 +244,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <artifactId>netty-handler</artifactId>
         <version>${netty.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-launcher</artifactId>
-        <version>${junit-platform.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit-jupiter.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit-vintage.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -298,12 +284,15 @@ Modifications copyright (c) 2018-2019 Nokia
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.1</version>
+          <version>${jacoco.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>3.1.0</version>
+          <configuration>
+            <tarLongFileMode>posix</tarLongFileMode>
+          </configuration>
         </plugin>
 
         <plugin>
@@ -314,7 +303,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.4.1.1168</version>
+          <version>3.7.0.1746</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -384,7 +373,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <plugin>
           <groupId>pl.project13.maven</groupId>
           <artifactId>git-commit-id-plugin</artifactId>
-          <version>2.2.6</version>
+          <version>4.0.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -470,12 +459,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <configuration>
               <source>
                 pom.properties['deploy.url'] =
-                  pom.version.contains('-SNAPSHOT') ?
-                    project.distributionManagement.snapshotRepository.url :
-                    project.distributionManagement.repository.url;
+                        pom.version.contains('-SNAPSHOT') ?
+                                project.distributionManagement.snapshotRepository.url :
+                                project.distributionManagement.repository.url;
                 pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                  project.distributionManagement.snapshotRepository.id :
-                  project.distributionManagement.repository.id;
+                        project.distributionManagement.snapshotRepository.id :
+                        project.distributionManagement.repository.id;
               </source>
             </configuration>
           </execution>
@@ -628,3 +617,4 @@ Modifications copyright (c) 2018-2019 Nokia
     </site>
   </distributionManagement>
 </project>
+