X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=9bbb733c71dcb7a2cfadf255b716a64020a6fdd1;hb=5e8464585f07210ad4b20ddfee2c23b1cf2d8b2a;hp=d8f3b3805b93200674100ace0c4cbd5becbdf35b;hpb=cc8f8c056b99d530d48190b67846be3705a4225f;p=sdc.git

diff --git a/pom.xml b/pom.xml
index d8f3b3805b..9bbb733c71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia
 
   <groupId>org.openecomp.sdc</groupId>
   <artifactId>sdc-main</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>sdc</name>
 
@@ -44,38 +44,34 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <!-- 3rd parties versions -->
     <bean-matcher.version>0.11</bean-matcher.version>
-    <lang3.version>3.3.2</lang3.version>
-    <lang3.version>3.3.2</lang3.version>
+    <lang3.version>3.10</lang3.version>
     <guava.version>18.0</guava.version>
     <janusgraph.version>0.3.1</janusgraph.version>
     <spring.version>4.3.18.RELEASE</spring.version>
-    <spring.security.version>3.2.3.RELEASE</spring.security.version>
-    <spring.ldap.version>2.0.1.RELEASE</spring.ldap.version>
     <jersey-bom.version>2.27</jersey-bom.version>
     <netty.version>4.1.36.Final</netty.version>
     <servlet-api.version>3.1.0</servlet-api.version>
-    <wire-mock.version>2.18.0</wire-mock.version>
-    <ecomp.version>2.4.0</ecomp.version>
-    <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
-    <lombok.version>1.18.2</lombok.version>
+    <wire-mock.version>2.26.3</wire-mock.version>
+    <ecomp.version>2.6.0</ecomp.version>
+    <cassandra.unit.version>4.3.1.0</cassandra.unit.version>
+    <cadi.version>2.1.8</cadi.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>
-        <onap.logging.version>1.6.1</onap.logging.version>
+    <onap.logging.version>1.6.1</onap.logging.version>
 
     <commons.collections.version>4.1</commons.collections.version>
-        <ws.rs.version>2.0.1</ws.rs.version>
+    <ws.rs.version>2.1</ws.rs.version>
 
-    <!-- Elastic Search mapper (reference the elastic search version actually). -->
-    <elastic-search.version>2.4.0</elastic-search.version>
-    <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
-    <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
     <jetty.version>9.4.18.v20190429</jetty.version>
 
     <!-- JSON and YAML Parsing -->
-    <jackson.version>2.9.9</jackson.version>
-    <jackson-annotations.version>2.9.9</jackson-annotations.version>
+    <jackson.version>2.10.0</jackson.version>
+    <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
     <jackson.mapper.version>1.9.13</jackson.mapper.version>
+    <clearspring.version>2.1.1</clearspring.version>
+    <skipYamlJsonValidator>false</skipYamlJsonValidator>
 
     <!-- Yaml for properties -->
     <snakeyaml.version>1.14</snakeyaml.version>
@@ -111,34 +107,39 @@ Modifications copyright (c) 2018-2019 Nokia
     <commons-jci-core.version>1.1</commons-jci-core.version>
 
     <!--TESTING-->
-    <mockito.version>2.18.3</mockito.version>
-    <jmockit.version>1.33</jmockit.version>
+    <mockito.version>3.3.3</mockito.version>
+    <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
+    <jmockit.version>1.35</jmockit.version>
     <junit.version>4.12</junit.version>
-    <assertj.version>3.10.0</assertj.version>
+    <junit.platform.version>1.6.0</junit.platform.version>
+    <junitJupiter.version>5.6.0</junitJupiter.version>
+    <assertj.version>3.16.0</assertj.version>
     <testng.version>6.14.3</testng.version>
-    <extentreports.version>3.0.3</extentreports.version>
-    <cucumber.version>2.4.0</cucumber.version>
+    <cucumber.version>5.6.0</cucumber.version>
     <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.22.2</maven-surefire-plugin.version>
     <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
 
     <!-- parser-->
-    <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version>
+    <sdc-tosca-parser.version>1.6.5</sdc-tosca-parser.version>
 
     <!-- sonar -->
-    <sonar.language>java</sonar.language>
+    <sonar.projectVersion>${project.version}</sonar.projectVersion>
+    <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
+    <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports
+    </sonar.surefire.reportsPath>
+    <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info
+    </sonar.javascript.lcov.reportPaths>
+    <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>
-
+    <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions>
     <!--cassandra -->
-    <cassandra.driver.version>3.0.0</cassandra.driver.version>
-    <libthrift.version>0.12.0</libthrift.version>
+    <cassandra.driver.version>3.8.0</cassandra.driver.version>
     <!-- maven central (Nexus) -->
     <nexus.id.release>nexus</nexus.id.release>
     <nexus.id.snapshot>nexus</nexus.id.snapshot>
@@ -152,11 +153,17 @@ Modifications copyright (c) 2018-2019 Nokia
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     <!--docker tags-->
     <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
+    <!--togglz version-->
+    <togglz.version>2.4.1.Final</togglz.version>
 
     <joda.time.version>2.9.9</joda.time.version>
 
+    <!--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>
+
+    <java.driver.core.version>4.5.1</java.driver.core.version>
 
   </properties>
 
@@ -187,19 +194,12 @@ Modifications copyright (c) 2018-2019 Nokia
         <version>${assertj.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.jmockit</groupId>
         <artifactId>jmockit</artifactId>
         <version>${jmockit.version}</version>
       </dependency>
 
-
       <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock-standalone</artifactId>
@@ -238,21 +238,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>
 
@@ -265,6 +250,27 @@ Modifications copyright (c) 2018-2019 Nokia
       <version>${jacoco.version}</version>
       <scope>test</scope>
     </dependency>
+    <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junitJupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API  -->
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junitJupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>
@@ -293,12 +299,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>
@@ -309,7 +318,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>
@@ -366,6 +375,11 @@ Modifications copyright (c) 2018-2019 Nokia
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${maven-surefire-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -374,12 +388,12 @@ Modifications copyright (c) 2018-2019 Nokia
         <plugin>
           <groupId>com.github.sylvainlaurent.maven</groupId>
           <artifactId>yaml-json-validator-maven-plugin</artifactId>
-          <version>1.0.1</version>
+          <version>1.0.2</version>
         </plugin>
         <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>
@@ -391,6 +405,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <configuration>
           <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
           <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+          <skip>${checkstyle.skip}</skip>
         </configuration>
       </plugin>
       <!-- plugin for parsing the project version -->
@@ -487,6 +502,13 @@ Modifications copyright (c) 2018-2019 Nokia
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit-platform</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <printSummary>false</printSummary>
           <systemPropertyVariables>
@@ -537,8 +559,7 @@ Modifications copyright (c) 2018-2019 Nokia
       </activation>
       <modules>
         <module>onboarding</module>
-                <module>common-app-logging</module>
-        <module>security-utils</module>
+        <module>common-app-logging</module>
         <module>common-app-api</module>
         <module>common-be</module>
         <module>catalog-dao</module>
@@ -561,8 +582,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <activeByDefault>false</activeByDefault>
       </activation>
       <modules>
-        <module>security-utils</module>
-                <module>common-app-logging</module>
+        <module>common-app-logging</module>
         <module>common-app-api</module>
         <module>common-be</module>
         <module>catalog-dao</module>
@@ -574,10 +594,21 @@ Modifications copyright (c) 2018-2019 Nokia
         <module>test-apis-ci</module>
         <module>ui-ci</module>
       </modules>
+    </profile>
 
-      <properties>
-        <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
-      </properties>
+    <profile>
+      <id>catalog-be</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <modules>
+        <module>common-app-logging</module>
+        <module>common-app-api</module>
+        <module>common-be</module>
+        <module>catalog-dao</module>
+        <module>catalog-model</module>
+        <module>catalog-be</module>
+      </modules>
     </profile>
 
     <profile>
@@ -589,6 +620,33 @@ Modifications copyright (c) 2018-2019 Nokia
         <module>onboarding</module>
       </modules>
     </profile>
+    <profile>
+      <id>fast-build</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <skipYamlJsonValidator>true</skipYamlJsonValidator>
+        <checkstyle.skip>true</checkstyle.skip>
+        <jacoco.skip>true</jacoco.skip>
+      </properties>
+      <modules>
+        <module>ui-ci</module>
+        <module>asdctool</module>
+        <module>common-be</module>
+        <module>onboarding</module>
+        <module>catalog-be</module>
+        <module>catalog-ui</module>
+        <module>catalog-fe</module>
+        <module>catalog-dao</module>
+        <module>sdc-os-chef</module>
+        <module>test-apis-ci</module>
+        <module>catalog-model</module>
+        <module>common-app-api</module>
+        <module>common-app-logging</module>
+      </modules>
+    </profile>
 
   </profiles>
 
@@ -629,3 +687,4 @@ Modifications copyright (c) 2018-2019 Nokia
     </site>
   </distributionManagement>
 </project>
+