Fix test cases failing incorrectly
https://gerrit.onap.org/r/c/sdc/+/124980
Change-Id: I9fbd8a0b5b83d04928feea7624e593b45441ac9b
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3757
diff --git a/pom.xml b/pom.xml
index 9a038bd..a430ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,405 +19,111 @@
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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
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.10.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>sdc</name>
-
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>3.2.0</version>
- <relativePath/>
- </parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
- <tosca.datatype.version>${project.version}</tosca.datatype.version>
- <!-- 3rd parties versions -->
- <bean-matcher.version>0.11</bean-matcher.version>
- <lang3.version>3.10</lang3.version>
- <guava.version>30.1-jre</guava.version>
- <janusgraph.version>0.3.3</janusgraph.version>
- <spring.version>5.3.9</spring.version>
- <jersey-bom.version>2.34</jersey-bom.version>
- <netty.version>4.1.66.Final</netty.version>
- <servlet-api.version>3.1.0</servlet-api.version>
- <wire-mock.version>2.26.3</wire-mock.version>
- <ecomp.version>3.4.0</ecomp.version>
- <cassandra.unit.version>4.3.1.0</cassandra.unit.version>
- <cadi.version>2.1.8</cadi.version>
- <lombok.version>1.18.20</lombok.version>
- <commons-beanutils>1.9.4</commons-beanutils>
- <commons.io.version>2.8.0</commons.io.version>
- <commons-configuration>2.7</commons-configuration>
- <apache-poi.version>4.1.0</apache-poi.version>
- <onap.logging.version>1.6.1</onap.logging.version>
- <apache-commons-text.version>1.9</apache-commons-text.version>
- <jaxb-api.version>2.3.1</jaxb-api.version>
- <io.vavr.version>0.10.3</io.vavr.version>
- <groovy.version>3.0.7</groovy.version>
- <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
- <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
- <hibernate.validator.version>6.1.6.Final</hibernate.validator.version>
-
- <commons.collections.version>4.1</commons.collections.version>
- <ws.rs.version>2.1.1</ws.rs.version>
- <javax.validation.version>2.0.1.Final</javax.validation.version>
- <javax.servlet.version>4.0.1</javax.servlet.version>
-
- <jetty.version>9.4.41.v20210516</jetty.version>
- <cxf.version>3.4.4</cxf.version>
-
- <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version>
- <org.dom4j.version>2.1.3</org.dom4j.version>
-
- <!-- JSON and YAML Parsing -->
- <jackson.version>2.12.4</jackson.version>
- <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
-
- <clearspring.version>2.1.1</clearspring.version>
- <skipYamlJsonValidator>false</skipYamlJsonValidator>
-
- <!-- Yaml for properties -->
- <snakeyaml.version>1.29</snakeyaml.version>
- <functionaljava.version>4.9</functionaljava.version>
- <httpclient.version>4.5.13</httpclient.version>
- <httpcore.version>4.4.1</httpcore.version>
- <json-simple.version>1.1</json-simple.version>
-
- <!-- PM Dictionary validation -->
- <onap.vnfsdk.validation.pmdictionary.version>1.2.15
- </onap.vnfsdk.validation.pmdictionary.version>
-
- <!-- Logging start -->
- <!-- logback -->
- <logback.version>1.2.3</logback.version>
- <slf4j-api.version>1.7.25</slf4j-api.version>
- <commons-codec>1.15</commons-codec>
- <commons-logging>1.2</commons-logging>
- <janino.version>3.0.6</janino.version>
- <log4j.version>2.13.1</log4j.version>
-
- <!-- aspects -->
- <jcabi.version>0.20.1</jcabi.version>
- <aspectj.version>1.9.7</aspectj.version>
- <aspectjrt.version>${aspectj.version}</aspectjrt.version>
- <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
-
- <!-- Logging end -->
- <!-- System Metrics -->
- <sigar.version>1.6.4</sigar.version>
-
- <regex.version>3.0.3</regex.version>
-
- <!--GSON-->
- <gson.version>2.3.1</gson.version>
-
- <!--listen to file changes-->
- <commons-jci-core.version>1.1</commons-jci-core.version>
-
- <!--TESTING-->
- <mockito.version>3.7.7</mockito.version>
- <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
- <jmockit.version>1.35</jmockit.version>
- <junit.platform.version>1.7.1</junit.platform.version>
- <junitJupiter.version>5.7.2</junitJupiter.version>
- <assertj.version>3.16.0</assertj.version>
- <testng.version>7.4.0</testng.version>
- <cucumber.version>6.8.1</cucumber.version>
- <bean-matchers.version>0.11</bean-matchers.version>
- <hamcrest.version>2.2</hamcrest.version>
- <hamcrest-all.version>1.3</hamcrest-all.version>
- <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
- <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
- <jMapper.version>1.6.0.1</jMapper.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.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions>
- <!--cassandra -->
- <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>
-
- <!--nexus-->
- <npm.registry>https://nexus3.onap.org/repository/npm.public/npm/-/</npm.registry>
- <nexus.proxy>https://nexus.onap.org</nexus.proxy>
- <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
- <staging.profile.id>176c31dfe190a</staging.profile.id>
- <!--togglz version-->
- <togglz.version>2.6.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.7</jacoco.version>
-
- <java.driver.core.version>4.5.1</java.driver.core.version>
-
- <!-- Surefire parameters -->
- <surefire.forkCount>1C</surefire.forkCount>
- <surefire.reuseForks>true</surefire.reuseForks>
- <surefire.skip.tests>false</surefire.skip.tests>
-
- <docker.api.version>1.35</docker.api.version>
- <bouncycastle.version>1.69</bouncycastle.version>
-
- <verbose>false</verbose>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>${jersey-bom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
- <version>2.4.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.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>
- <version>${wire-mock.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${lang3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-maven-plugin</artifactId>
- <version>${swagger-core-mvn-plugin.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <!-- must be on the classpath -->
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.agent</artifactId>
- <classifier>runtime</classifier>
- <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>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
- <configuration>
- <failOnError>false</failOnError>
- <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>org.umlgraph</groupId>
- <artifactId>umlgraph</artifactId>
- <version>5.6</version>
- </docletArtifact>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
+ <groupId>org.jacoco</groupId>
<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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>3.1.0</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
<version>1.6.0</version>
</plugin>
<plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
+ <groupId>org.sonarsource.scanner.maven</groupId>
<version>3.7.0.1746</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>3.1.0</version>
</plugin>
<plugin>
- <groupId>ru.yaal.maven</groupId>
<artifactId>write-text-files-maven-plugin</artifactId>
+ <groupId>ru.yaal.maven</groupId>
<version>1.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
<version>1.5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
<version>3.2.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>2.8.2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>3.1.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>3.2.0</version>
</plugin>
<plugin>
- <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
+ <groupId>io.fabric8</groupId>
<version>0.31.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>3.2.2</version>
</plugin>
<plugin>
- <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
+ <groupId>com.github.eirslett</groupId>
<version>1.12.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>3.8.1</version>
</plugin>
<plugin>
- <groupId>com.github.sylvainlaurent.maven</groupId>
<artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
<version>1.0.2</version>
</plugin>
<plugin>
- <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
+ <groupId>pl.project13.maven</groupId>
<version>4.0.0</version>
</plugin>
</plugins>
@@ -426,83 +132,77 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
<configuration>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <skip>${checkstyle.skip}</skip>
<suppressionsFileExpression>checkstyle.suppressions.file
</suppressionsFileExpression>
- <skip>${checkstyle.skip}</skip>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
+ <version>2.17</version>
</plugin>
<!-- plugin for parsing the project version -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>parse-version</id>
- <phase>pre-clean</phase>
<goals>
<goal>parse-version</goal>
</goals>
+ <id>parse-version</id>
+ <phase>pre-clean</phase>
</execution>
</executions>
+ <groupId>org.codehaus.mojo</groupId>
</plugin>
<!-- Java Code Coverage -->
<plugin>
- <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <inherited>false</inherited>
<executions>
<execution>
- <id>default-instrument</id>
<goals>
<goal>instrument</goal>
</goals>
+ <id>default-instrument</id>
</execution>
<execution>
- <id>default-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
+ <id>default-restore-instrumented-classes</id>
</execution>
<execution>
- <id>default-report</id>
- <goals>
- <goal>report</goal>
- </goals>
<configuration>
<dataFile>${project.build.directory}/jacoco.exec</dataFile>
</configuration>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <id>default-report</id>
</execution>
</executions>
+ <groupId>org.jacoco</groupId>
+ <inherited>false</inherited>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7.1</version>
<dependencies>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
+ <groupId>org.apache.maven.wagon</groupId>
<version>3.0.0</version>
</dependency>
</dependencies>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>3.7.1</version>
</plugin>
<!-- Set the deployment repositories properties. -->
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<executions>
<execution>
- <inherited>false</inherited>
- <phase>integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
<configuration>
<source>
pom.properties['deploy.url'] =
@@ -514,57 +214,57 @@
project.distributionManagement.repository.id;
</source>
</configuration>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <inherited>false</inherited>
+ <phase>integration-test</phase>
</execution>
</executions>
+ <groupId>org.codehaus.gmaven</groupId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
<source>11</source>
<target>11</target>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
+ <groupId>org.apache.maven.plugins</groupId>
</plugin>
<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>
+ <forkCount>${surefire.forkCount}</forkCount>
+ <parallel>methods</parallel>
<printSummary>false</printSummary>
+ <reuseForks>${surefire.reuseForks}</reuseForks>
+ <skip>${surefire.skip.tests}</skip>
<systemPropertyVariables>
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec
</jacoco-agent.destfile>
</systemPropertyVariables>
- <forkCount>${surefire.forkCount}</forkCount>
- <reuseForks>${surefire.reuseForks}</reuseForks>
- <parallel>methods</parallel>
- <skip>${surefire.skip.tests}</skip>
</configuration>
+ <dependencies>
+ <dependency>
+ <artifactId>surefire-junit-platform</artifactId>
+ <groupId>org.apache.maven.surefire</groupId>
+ <version>${maven-surefire-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <groupId>org.apache.maven.plugins</groupId>
</plugin>
<plugin>
- <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
<configuration>
+ <failOnNoGitDirectory>true</failOnNoGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>
${project.build.outputDirectory}/META-INF/git.properties
</generateGitPropertiesFilename>
- <failOnNoGitDirectory>true</failOnNoGitDirectory>
- <verbose>false</verbose>
+ <gitDescribe>
+ <skip>true</skip>
+ </gitDescribe>
<includeOnlyProperties>
<includeOnlyProperty>git.build.version</includeOnlyProperty>
<includeOnlyProperty>git.build.time</includeOnlyProperty>
@@ -575,24 +275,165 @@
<includeOnlyProperty>git.commit.message.short</includeOnlyProperty>
<includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
</includeOnlyProperties>
- <gitDescribe>
- <skip>true</skip>
- </gitDescribe>
<useNativeGit>false</useNativeGit>
+ <verbose>false</verbose>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <groupId>pl.project13.maven</groupId>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <!-- must be on the classpath -->
+ <artifactId>org.jacoco.agent</artifactId>
+ <classifier>runtime</classifier>
+ <groupId>org.jacoco</groupId>
+ <scope>test</scope>
+ <version>${jacoco.version}</version>
+ </dependency>
+ <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
+ <dependency>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <scope>test</scope>
+ <version>${junitJupiter.version}</version>
+ </dependency>
+ <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API -->
+ <dependency>
+ <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <scope>test</scope>
+ <version>${junitJupiter.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>mockito-core</artifactId>
+ <groupId>org.mockito</groupId>
+ <scope>test</scope>
+ <version>${mockito.version}</version>
+ </dependency>
+ </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>jersey-bean-validation</artifactId>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <version>${jersey-bom.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <version>2.4.0</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>assertj-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <version>${assertj.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>jmockit</artifactId>
+ <groupId>org.jmockit</groupId>
+ <version>${jmockit.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>wiremock-standalone</artifactId>
+ <groupId>com.github.tomakehurst</groupId>
+ <version>${wire-mock.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>cucumber-java</artifactId>
+ <groupId>io.cucumber</groupId>
+ <version>${cucumber.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>cucumber-junit</artifactId>
+ <groupId>io.cucumber</groupId>
+ <version>${cucumber.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <version>${lang3.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>groovy</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>netty-all</artifactId>
+ <groupId>io.netty</groupId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>netty-handler</artifactId>
+ <groupId>io.netty</groupId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <groupId>io.swagger.core.v3</groupId>
+ <version>${swagger-core-mvn-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexus.proxy}${sitePath}</url>
+ </site>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshot Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <groupId>org.openecomp.sdc</groupId>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>sdc</name>
+
+ <packaging>pom</packaging>
+
+ <parent>
+ <artifactId>oparent</artifactId>
+ <groupId>org.onap.oparent</groupId>
+ <relativePath/>
+ <version>3.2.0</version>
+ </parent>
<profiles>
<profile>
- <id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <properties>
- <checkstyle.skip>true</checkstyle.skip>
- </properties>
+ <id>all</id>
<modules>
<module>onboarding</module>
<module>common-app-logging</module>
@@ -609,41 +450,41 @@
<module>utils/webseal-simulator</module>
<module>integration-tests</module>
</modules>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
</profile>
<profile>
<id>all-for-integration-tests-only</id>
+ <modules>
+ <module>onboarding</module>
+ <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>
+ <module>catalog-be-plugins</module>
+ <module>asdctool</module>
+ <module>catalog-ui</module>
+ <module>catalog-fe</module>
+ <module>sdc-os-chef</module>
+ <module>utils/webseal-simulator</module>
+ <module>integration-tests</module>
+ </modules>
<properties>
<checkstyle.skip>true</checkstyle.skip>
<surefire.skip.tests>true</surefire.skip.tests>
</properties>
- <modules>
- <module>onboarding</module>
- <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>
- <module>catalog-be-plugins</module>
- <module>asdctool</module>
- <module>catalog-ui</module>
- <module>catalog-fe</module>
- <module>sdc-os-chef</module>
- <module>utils/webseal-simulator</module>
- <module>integration-tests</module>
- </modules>
</profile>
<profile>
- <id>skip-integration-tests</id>
<activation>
<property>
<name>skipITs</name>
<value>true</value>
</property>
</activation>
- <properties>
- <checkstyle.skip>true</checkstyle.skip>
- </properties>
+ <id>skip-integration-tests</id>
<modules>
<module>onboarding</module>
<module>common-app-logging</module>
@@ -659,19 +500,18 @@
<module>sdc-os-chef</module>
<module>utils/webseal-simulator</module>
</modules>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
</profile>
<profile>
- <id>skip-tests</id>
<activation>
<property>
<name>skipTests</name>
<value>true</value>
</property>
</activation>
- <properties>
- <checkstyle.skip>true</checkstyle.skip>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <id>skip-tests</id>
<modules>
<module>onboarding</module>
<module>common-app-logging</module>
@@ -687,87 +527,262 @@
<module>sdc-os-chef</module>
<module>utils/webseal-simulator</module>
</modules>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
</profile>
<profile>
- <id>fast-build</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+ <id>fast-build</id>
+ <modules>
+ <module>onboarding</module>
+ <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>
+ <module>catalog-be-plugins</module>
+ <module>asdctool</module>
+ <module>catalog-ui</module>
+ <module>catalog-fe</module>
+ <module>sdc-os-chef</module>
+ <module>utils/webseal-simulator</module>
+ </modules>
<properties>
- <maven.test.skip>true</maven.test.skip>
- <skipYamlJsonValidator>true</skipYamlJsonValidator>
<checkstyle.skip>true</checkstyle.skip>
<jacoco.skip>true</jacoco.skip>
<maven.antrun.skip>true</maven.antrun.skip>
+ <maven.test.skip>true</maven.test.skip>
+ <skipYamlJsonValidator>true</skipYamlJsonValidator>
<swagger.skip>true</swagger.skip>
</properties>
- <modules>
- <module>onboarding</module>
- <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>
- <module>catalog-be-plugins</module>
- <module>asdctool</module>
- <module>catalog-ui</module>
- <module>catalog-fe</module>
- <module>sdc-os-chef</module>
- <module>utils/webseal-simulator</module>
- </modules>
</profile>
<profile>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<id>start-sdc</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <modules>
+ <module>integration-tests</module>
+ </modules>
<properties>
- <maven.test.skip>true</maven.test.skip>
- <skipYamlJsonValidator>true</skipYamlJsonValidator>
<checkstyle.skip>true</checkstyle.skip>
- <jacoco.skip>true</jacoco.skip>
<docker.keepRunning>true</docker.keepRunning>
- </properties>
- <modules>
- <module>integration-tests</module>
- </modules>
- </profile>
- <profile>
- <id>stop-sdc</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
+ <jacoco.skip>true</jacoco.skip>
<maven.test.skip>true</maven.test.skip>
<skipYamlJsonValidator>true</skipYamlJsonValidator>
- <checkstyle.skip>true</checkstyle.skip>
- <jacoco.skip>true</jacoco.skip>
-
-
- <docker.skip.run>true</docker.skip.run>
</properties>
- <modules>
- <module>integration-tests</module>
- </modules>
</profile>
<profile>
- <id>run-integration-tests</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+ <id>stop-sdc</id>
+ <modules>
+ <module>integration-tests</module>
+ </modules>
<properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ <docker.skip.run>true</docker.skip.run>
+ <jacoco.skip>true</jacoco.skip>
+ <maven.test.skip>true</maven.test.skip>
+
+
<skipYamlJsonValidator>true</skipYamlJsonValidator>
+ </properties>
+ </profile>
+ <profile>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <id>run-integration-tests</id>
+ <modules>
+ <module>integration-tests</module>
+ </modules>
+ <properties>
<checkstyle.skip>true</checkstyle.skip>
<docker.skip>true</docker.skip>
+ <skipYamlJsonValidator>true</skipYamlJsonValidator>
</properties>
- <modules>
- <module>integration-tests</module>
- </modules>
</profile>
</profiles>
+ <properties>
+ <apache-commons-text.version>1.9</apache-commons-text.version>
+ <apache-poi.version>4.1.0</apache-poi.version>
+
+ <aspectj.version>1.9.7</aspectj.version>
+ <!-- 3rd parties versions -->
+ <aspectjrt.version>${aspectj.version}</aspectjrt.version>
+ <assertj.version>3.16.0</assertj.version>
+ <bean-matcher.version>0.11</bean-matcher.version>
+ <bean-matchers.version>0.11</bean-matchers.version>
+ <bouncycastle.version>1.69</bouncycastle.version>
+ <cadi.version>2.1.8</cadi.version>
+ <cassandra.driver.version>3.8.0</cassandra.driver.version>
+ <cassandra.unit.version>4.3.1.0</cassandra.unit.version>
+ <clearspring.version>2.1.1</clearspring.version>
+ <commons-beanutils>1.9.4</commons-beanutils>
+ <commons-codec>1.15</commons-codec>
+ <commons-configuration>2.7</commons-configuration>
+ <commons-jci-core.version>1.1</commons-jci-core.version>
+ <commons-logging>1.2</commons-logging>
+ <commons.collections.version>4.1</commons.collections.version>
+ <commons.io.version>2.8.0</commons.io.version>
+ <cucumber.version>6.8.1</cucumber.version>
+ <cxf.version>3.4.4</cxf.version>
+ <docker.api.version>1.35</docker.api.version>
+ <ecomp.version>3.4.0</ecomp.version>
+ <functionaljava.version>4.9</functionaljava.version>
+ <groovy.version>3.0.7</groovy.version>
+ <gson.version>2.3.1</gson.version>
+ <guava.version>30.1-jre</guava.version>
+ <hamcrest-all.version>1.3</hamcrest-all.version>
+
+ <hamcrest.version>2.2</hamcrest.version>
+ <hibernate.validator.version>6.1.6.Final</hibernate.validator.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.1</httpcore.version>
+
+ <io.vavr.version>0.10.3</io.vavr.version>
+ <jMapper.version>1.6.0.1</jMapper.version>
+
+ <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
+ <jackson.version>2.12.4</jackson.version>
+
+ <!-- JSON and YAML Parsing -->
+ <jacoco.version>0.8.7</jacoco.version>
+ <janino.version>3.0.6</janino.version>
+
+ <janusgraph.version>0.3.3</janusgraph.version>
+ <java.driver.core.version>4.5.1</java.driver.core.version>
+
+ <!-- Yaml for properties -->
+ <javax.servlet.version>4.0.1</javax.servlet.version>
+ <javax.validation.version>2.0.1.Final</javax.validation.version>
+ <jaxb-api.version>2.3.1</jaxb-api.version>
+ <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
+ <jcabi.version>0.20.1</jcabi.version>
+
+ <!-- PM Dictionary validation -->
+ <jersey-bom.version>2.34</jersey-bom.version>
+
+ <!-- Logging start -->
+ <!-- logback -->
+ <jetty.version>9.4.41.v20210516</jetty.version>
+ <jmockit.version>1.35</jmockit.version>
+ <joda.time.version>2.9.9</joda.time.version>
+ <json-simple.version>1.1</json-simple.version>
+ <junit.platform.version>1.7.1</junit.platform.version>
+ <junitJupiter.version>5.7.2</junitJupiter.version>
+
+ <!-- aspects -->
+ <lang3.version>3.10</lang3.version>
+ <log4j.version>2.13.1</log4j.version>
+ <logback.version>1.2.3</logback.version>
+ <lombok.version>1.18.20</lombok.version>
+
+ <!-- Logging end -->
+ <!-- System Metrics -->
+ <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+
+ <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
+
+ <!--GSON-->
+ <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+
+ <!--listen to file changes-->
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
+ <!--TESTING-->
+ <mockito.version>3.7.7</mockito.version>
+ <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
+ <netty.version>4.1.66.Final</netty.version>
+ <nexus.id.release>nexus</nexus.id.release>
+ <nexus.id.snapshot>nexus</nexus.id.snapshot>
+ <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+ <npm.registry>https://nexus3.onap.org/repository/npm.public/npm/-/</npm.registry>
+ <onap.logging.version>1.6.1</onap.logging.version>
+ <onap.vnfsdk.validation.pmdictionary.version>1.2.15
+ </onap.vnfsdk.validation.pmdictionary.version>
+ <org.dom4j.version>2.1.3</org.dom4j.version>
+ <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <regex.version>3.0.3</regex.version>
+ <security.util.lib.version>1.6.0</security.util.lib.version>
+
+ <!-- sonar -->
+ <servlet-api.version>4.0.1</servlet-api.version>
+ <sigar.version>1.6.4</sigar.version>
+ <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
+ <skipYamlJsonValidator>false</skipYamlJsonValidator>
+ <slf4j-api.version>1.7.25</slf4j-api.version>
+ <snakeyaml.version>1.29</snakeyaml.version>
+ <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions>
+ <sonar.coverage.jacoco.xmlReportPaths>
+ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+ </sonar.coverage.jacoco.xmlReportPaths>
+ <!--cassandra -->
+ <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info
+ </sonar.javascript.lcov.reportPaths>
+ <!-- maven central (Nexus) -->
+ <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
+ <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+
+ <!--nexus-->
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
+ <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports
+ </sonar.surefire.reportsPath>
+ <spring.version>5.3.9</spring.version>
+ <!--togglz version-->
+ <staging.profile.id>176c31dfe190a</staging.profile.id>
+
+ <surefire.forkCount>1C</surefire.forkCount>
+
+ <!--sdc-security-utils-->
+ <surefire.reuseForks>true</surefire.reuseForks>
+ <!--jacoco-->
+ <surefire.skip.tests>false</surefire.skip.tests>
+
+ <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
+
+ <!-- Surefire parameters -->
+ <testng.version>7.4.0</testng.version>
+ <togglz.version>2.6.1.Final</togglz.version>
+ <tosca.datatype.version>${project.version}</tosca.datatype.version>
+
+ <verbose>false</verbose>
+ <wire-mock.version>2.26.3</wire-mock.version>
+
+ <ws.rs.version>2.1.1</ws.rs.version>
+ </properties>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+ <docletArtifact>
+ <artifactId>umlgraph</artifactId>
+ <groupId>org.umlgraph</groupId>
+ <version>5.6</version>
+ </docletArtifact>
+ <failOnError>false</failOnError>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+ </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>3.0.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<repositories>
<!-- LF repositories -->
<repository>
@@ -788,20 +803,5 @@
<!-- LF repositories END-->
</repositories>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>Release Repository</name>
- <url>${nexus.proxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>Snapshot Repository</name>
- <url>${nexus.proxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
- <site>
- <id>ecomp-site</id>
- <url>dav:${nexus.proxy}${sitePath}</url>
- </site>
- </distributionManagement>
+ <version>1.10.0-SNAPSHOT</version>
</project>