Fix use of Optional in ToscaElementOperation

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b12ec7b..fbc49bb 100644 (file)
--- 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.9.0-SNAPSHOT</version>
+    <version>1.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
 
@@ -47,17 +47,17 @@ Modifications copyright (c) 2018-2019 Nokia
         <lang3.version>3.10</lang3.version>
         <guava.version>30.1-jre</guava.version>
         <janusgraph.version>0.3.3</janusgraph.version>
-        <spring.version>5.2.10.RELEASE</spring.version>
-        <jersey-bom.version>2.27</jersey-bom.version>
-        <netty.version>4.1.65.Final</netty.version>
-        <servlet-api.version>3.1.0</servlet-api.version>
+        <spring.version>5.3.9</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.18</lombok.version>
+        <lombok.version>1.18.20</lombok.version>
         <commons-beanutils>1.9.4</commons-beanutils>
-        <commons.io.version>2.7</commons.io.version>
+        <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>
@@ -67,24 +67,30 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>5.3.6.Final</hibernate.validator.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.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.1</jackson.version>
+        <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.28</snakeyaml.version>
-        <functionaljava.version>4.7</functionaljava.version>
-        <httpclient.version>4.5.3</httpclient.version>
+        <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>
 
@@ -94,16 +100,16 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <!-- Logging start -->
         <!-- logback -->
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.2.7</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>
-        <aspectj.version>1.8.9</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>
 
@@ -114,7 +120,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
@@ -123,17 +129,15 @@ Modifications copyright (c) 2018-2019 Nokia
         <mockito.version>3.7.7</mockito.version>
         <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
         <jmockit.version>1.35</jmockit.version>
-        <junit.version>4.13.1</junit.version>
         <junit.platform.version>1.7.1</junit.platform.version>
-        <junitJupiter.version>5.7.0</junitJupiter.version>
+        <junitJupiter.version>5.7.2</junitJupiter.version>
         <assertj.version>3.16.0</assertj.version>
-        <testng.version>7.3.0</testng.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>
         <jMapper.version>1.6.0.1</jMapper.version>
 
         <!-- sonar -->
@@ -168,7 +172,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <!--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>
 
@@ -177,8 +181,14 @@ Modifications copyright (c) 2018-2019 Nokia
         <surefire.reuseForks>true</surefire.reuseForks>
         <surefire.skip.tests>false</surefire.skip.tests>
 
-        <docker.api.version>1.35</docker.api.version>
-        <bouncycastle.version>1.68</bouncycastle.version>
+        <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>
 
         <verbose>false</verbose>
     </properties>
@@ -291,6 +301,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <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>
@@ -378,12 +394,17 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -593,6 +614,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -616,6 +638,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -644,6 +667,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -671,6 +695,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -700,6 +725,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <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>
@@ -759,7 +785,6 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>integration-tests</module>
             </modules>
         </profile>
-
     </profiles>
 
     <repositories>
@@ -788,14 +813,15 @@ Modifications copyright (c) 2018-2019 Nokia
             <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>