================================================================================
-->
<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.7.0-SNAPSHOT</version>
+ <version>1.11.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdc</name>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <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>18.0</guava.version>
- <janusgraph.version>0.3.1</janusgraph.version>
- <spring.version>4.3.18.RELEASE</spring.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>
+ <guava.version>30.1-jre</guava.version>
+ <janusgraph.version>0.3.3</janusgraph.version>
+ <spring.version>5.3.13</spring.version>
+ <jersey-bom.version>2.34</jersey-bom.version>
+ <netty.version>4.1.68.Final</netty.version>
+ <servlet-api.version>4.0.1</servlet-api.version>
<wire-mock.version>2.26.3</wire-mock.version>
- <ecomp.version>2.6.0</ecomp.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.12</lombok.version>
- <commons-beanutils>1.9.3</commons-beanutils>
- <commons-configuration>2.3</commons-configuration>
+ <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</ws.rs.version>
+ <ws.rs.version>2.1.1</ws.rs.version>
+ <javax.validation.version>2.0.1.Final</javax.validation.version>
+ <javax.servlet.version>${servlet-api.version}</javax.servlet.version>
+
+ <jetty.version>9.4.45.v20220203</jetty.version>
+ <jetty-distribution.version>9.4.45.v20220203</jetty-distribution.version>
+ <cxf.version>3.4.4</cxf.version>
- <jetty.version>9.4.18.v20190429</jetty.version>
+ <org.owasp.esapi.version>2.2.3.1</org.owasp.esapi.version>
+ <org.dom4j.version>2.1.3</org.dom4j.version>
<!-- JSON and YAML Parsing -->
- <jackson.version>2.10.0</jackson.version>
+ <jackson.version>2.12.4</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>
- <functionaljava.version>4.7</functionaljava.version>
- <httpclient.version>4.5.3</httpclient.version>
- <httpcore.version>4.4.1</httpcore.version>
+ <snakeyaml.version>1.29</snakeyaml.version>
+ <functionaljava.version>4.9</functionaljava.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.15</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>
+ <logback.version>1.2.10</logback.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
- <commons-codec>1.10</commons-codec>
+ <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>
- <aspectjrt.version>1.8.4</aspectjrt.version>
- <aspectj.version>1.7.4</aspectj.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 -->
<regex.version>3.0.3</regex.version>
<!--GSON-->
- <gson.version>2.3.1</gson.version>
+ <gson.version>2.8.9</gson.version>
<!--listen to file changes-->
<commons-jci-core.version>1.1</commons-jci-core.version>
<!--TESTING-->
- <mockito.version>3.3.3</mockito.version>
- <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
+ <mockito.version>3.7.7</mockito.version>
+ <mockitoJupiter.version>${mockito.version}</mockitoJupiter.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>
+ <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>6.14.3</testng.version>
- <cucumber.version>5.6.0</cucumber.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.1</hamcrest.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>
-
- <!-- parser-->
- <sdc-tosca-parser.version>1.6.5</sdc-tosca-parser.version>
+ <jMapper.version>1.6.0.1</jMapper.version>
<!-- sonar -->
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<nexus.id.snapshot>nexus</nexus.id.snapshot>
<!--nexus-->
- <npm.registry>https://nexus3.onap.org/repository/npm.public/</npm.registry>
+ <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>
- <!--maven-->
- <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>
+ <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.5</jacoco.version>
+ <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>
+
+ <bouncycastle.version>1.69</bouncycastle.version>
+
+ <!--DOCKER-->
+ <docker.api.version>1.41</docker.api.version>
+ <docker.namespace>onap</docker.namespace>
+ <docker.password>docker</docker.password>
+ <docker.username>docker</docker.username>
+ <docker.registry>nexus3.onap.org:10001</docker.registry>
+
+ <micrometer.version>1.8.4</micrometer.version>
+
+ <verbose>false</verbose>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>2.4.13</version>
+ <version>${groovy.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>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.31.0</version>
+ <version>0.38.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.2</version>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.8.0</version>
+ <version>1.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
</plugin>
<plugin>
<groupId>com.github.sylvainlaurent.maven</groupId>
<version>2.17</version>
<configuration>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ <suppressionsFileExpression>checkstyle.suppressions.file
+ </suppressionsFileExpression>
<skip>${checkstyle.skip}</skip>
</configuration>
</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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</plugin>
<plugin>
<configuration>
<printSummary>false</printSummary>
<systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
+ <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>
</plugin>
<plugin>
</executions>
<configuration>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties
+ <generateGitPropertiesFilename>
+ ${project.build.outputDirectory}/META-INF/git.properties
</generateGitPropertiesFilename>
<failOnNoGitDirectory>true</failOnNoGitDirectory>
<verbose>false</verbose>
<module>common-app-logging</module>
<module>common-app-api</module>
<module>common-be</module>
+ <module>common-be-tests-utils</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>all-for-integration-tests-only</id>
+ <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>common-be-tests-utils</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>common-app-logging</module>
<module>common-app-api</module>
<module>common-be</module>
+ <module>common-be-tests-utils</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>
+ <id>skip-tests</id>
+ <activation>
+ <property>
+ <name>skipTests</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>common-be-tests-utils</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>
<skipYamlJsonValidator>true</skipYamlJsonValidator>
<checkstyle.skip>true</checkstyle.skip>
<jacoco.skip>true</jacoco.skip>
+ <maven.antrun.skip>true</maven.antrun.skip>
+ <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>common-be-tests-utils</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>
<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>
-
</profiles>
<repositories>
<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>
- <site>
- <id>ecomp-site</id>
- <url>dav:${nexus.proxy}${sitePath}</url>
- </site>
</distributionManagement>
-</project>
+</project>
Code Review / sdc.git / blobdiff