See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
-Modifications copyright (c) 2018 Nokia
+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="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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.7.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdc</name>
+
+ <parent>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>2.0.0</version>
+ <relativePath/>
+ </parent>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tosca.datatype.version>${project.version}</tosca.datatype.version>
+
<!-- 3rd parties versions -->
- <lang3.version>3.3.2</lang3.version>
+ <bean-matcher.version>0.11</bean-matcher.version>
+ <lang3.version>3.10</lang3.version>
<guava.version>18.0</guava.version>
- <titan.version>1.0.0</titan.version>
- <sdc.titan.version>1.2.0</sdc.titan.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.48.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>
+ <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.4</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>
- <!-- 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.11.v20180605</jetty.version>
+ <commons.collections.version>4.1</commons.collections.version>
+ <ws.rs.version>2.1</ws.rs.version>
- <!-- JSON and YAML Parsing -->
- <jackson.version>2.8.10</jackson.version>
- <jackson-annotations.version>2.8.0</jackson-annotations.version>
+ <jetty.version>9.4.18.v20190429</jetty.version>
+
+ <!-- JSON and YAML Parsing -->
+ <jackson.version>2.11.0</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.14</snakeyaml.version>
<commons-codec>1.10</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>
<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>
- <testng.version>6.9.10</testng.version>
- <extentreports.version>3.0.3</extentreports.version>
- <cucumber.version>2.4.0</cucumber.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>7.2.0</testng.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.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>
+ <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://registry.npmjs.org/</npm.registry>
- <!-- https://nexus.onap.org/content/repositories/npm/ -->
<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>
<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.6.1.Final</togglz.version>
+ <joda.time.version>2.9.9</joda.time.version>
- </properties>
+ <!--sdc-security-utils-->
+ <security.util.lib.version>1.6.0</security.util.lib.version>
+ <!--jacoco-->
+ <jacoco.version>0.8.5</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>
+ </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>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <version>${jmockit.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
- </dependency>
-
<dependency>
<groupId>com.github.tomakehurst</groupId>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.45.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.0.45.Final</version>
+ <version>${netty.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>
<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>
<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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>0.31.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.6</version>
+ <version>1.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.8</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
</plugin>
<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>4.0.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
-
- <!-- Staging Plugin -->
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <extensions>true</extensions>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
<configuration>
- <nexusUrl>${nexus.proxy}</nexusUrl>
- <stagingProfileId>${staging.profile.id}</stagingProfileId>
- <serverId>ecomp-staging</serverId>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ <skip>${checkstyle.skip}</skip>
</configuration>
</plugin>
-
<!-- plugin for parsing the project version -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
- <id>default-prepare-agent</id>
+ <id>default-instrument</id>
<goals>
- <goal>prepare-agent</goal>
+ <goal>instrument</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-restore-instrumented-classes</id>
+ <goals>
+ <goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
<goals>
<goal>report</goal>
</goals>
+ <configuration>
+ <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+ </configuration>
</execution>
</executions>
</plugin>
<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>
<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>
+ <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ <forkCount>${surefire.forkCount}</forkCount>
+ <reuseForks>${surefire.reuseForks}</reuseForks>
+ <parallel>methods</parallel>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties
+ </generateGitPropertiesFilename>
+ <failOnNoGitDirectory>true</failOnNoGitDirectory>
+ <verbose>false</verbose>
+ <includeOnlyProperties>
+ <includeOnlyProperty>git.build.version</includeOnlyProperty>
+ <includeOnlyProperty>git.build.time</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.id</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.time</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.user.name</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.user.email</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.message.short</includeOnlyProperty>
+ <includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
+ </includeOnlyProperties>
+ <gitDescribe>
+ <skip>true</skip>
+ </gitDescribe>
+ <useNativeGit>false</useNativeGit>
</configuration>
</plugin>
</plugins>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
<modules>
<module>onboarding</module>
- <module>security-utils</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>test-apis-ci</module>
- <module>ui-ci</module>
<module>sdc-os-chef</module>
<module>utils/webseal-simulator</module>
+ <module>integration-tests</module>
</modules>
-
</profile>
-
<profile>
- <id>catalog</id>
+ <id>skip-integration-tests</id>
+ <activation>
+ <property>
+ <name>skipITs</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <checkstyle.skip>true</checkstyle.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>asdctool</module>
+ <module>catalog-ui</module>
+ <module>catalog-fe</module>
+ <module>sdc-os-chef</module>
+ <module>utils/webseal-simulator</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>security-utils</module>
+ <module>onboarding</module>
+ <module>common-app-logging</module>
<module>common-app-api</module>
<module>common-be</module>
+ <module>catalog-be-plugins</module>
<module>catalog-dao</module>
<module>catalog-model</module>
<module>catalog-be</module>
<module>asdctool</module>
<module>catalog-ui</module>
<module>catalog-fe</module>
- <module>test-apis-ci</module>
- <module>ui-ci</module>
+ <module>sdc-os-chef</module>
+ <module>utils/webseal-simulator</module>
</modules>
-
+ </profile>
+ <profile>
+ <id>start-sdc</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<properties>
- <ecomp.version>1.2.7</ecomp.version>
- <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
+ <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>onboarding</id>
+ <id>stop-sdc</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>
+ <docker.skip.run>true</docker.skip.run>
+ </properties>
<modules>
- <module>onboarding</module>
+ <module>integration-tests</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>run-integration-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipYamlJsonValidator>true</skipYamlJsonValidator>
+ <checkstyle.skip>true</checkstyle.skip>
+ <docker.skip>true</docker.skip>
+ </properties>
+ <modules>
+ <module>integration-tests</module>
</modules>
</profile>
-
</profiles>
<repositories>
</site>
</distributionManagement>
</project>
+