Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Refactor ToscaTypeTest
[sdc.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 5fe1cb5..d29852d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@ 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>
@@ -44,18 +44,16 @@ 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.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>
+    <wire-mock.version>2.26.3</wire-mock.version>
     <ecomp.version>2.6.0</ecomp.version>
-    <cassandra.unit.version>3.5.0.1</cassandra.unit.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>
@@ -64,17 +62,13 @@ Modifications copyright (c) 2018-2019 Nokia
     <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>
 
@@ -112,35 +106,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>
+    <mockito.version>3.3.3</mockito.version>
     <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
-    <jmockit.version>1.33</jmockit.version>
+    <jmockit.version>1.35</jmockit.version>
     <junit.version>4.12</junit.version>
+    <junit.platform.version>1.6.0</junit.platform.version>
     <junitJupiter.version>5.6.0</junitJupiter.version>
-    <assertj.version>3.10.0</assertj.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>
-    <maven-surefire-plugin.version>2.19.1</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.6.5</sdc-tosca-parser.version>
 
     <!-- sonar -->
+    <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.6.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>
@@ -164,6 +162,8 @@ Modifications copyright (c) 2018-2019 Nokia
     <!--jacoco-->
     <jacoco.version>0.8.5</jacoco.version>
 
+    <java.driver.core.version>4.5.1</java.driver.core.version>
+
   </properties>
 
 
@@ -205,7 +205,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <version>${jmockit.version}</version>
       </dependency>
 
-
       <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock-standalone</artifactId>
@@ -360,6 +359,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>
@@ -459,12 +463,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>
@@ -481,6 +485,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>
@@ -568,6 +579,21 @@ Modifications copyright (c) 2018-2019 Nokia
       </modules>
     </profile>
 
+    <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>
       <id>onboarding</id>
       <activation>
SDC Parent Project Catalog FE and BE