X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a17a0e14618b98b8acf7038f6c73a0c181b89b88;hb=ce3e2816ec3aa034bdef323c1a33b71485e87eb0;hp=e0d54945d4e46f6ef4437e347802f0fef2a67697;hpb=5a59bf1544c7c9d1eee0cdddcbedc8c0d1d1bb8c;p=sdc.git

diff --git a/pom.xml b/pom.xml
index e0d54945d4..a17a0e1461 100644
--- 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.10.0-SNAPSHOT</version>
+    <version>1.11.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
 
@@ -47,15 +47,16 @@ 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.3.9</spring.version>
+        <spring.version>5.3.18</spring.version>
+        <spring.boot.version>2.2.13.RELEASE</spring.boot.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>
+        <netty.version>4.1.77.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.20</lombok.version>
+        <lombok.version>1.18.24</lombok.version>
         <commons-beanutils>1.9.4</commons-beanutils>
         <commons.io.version>2.8.0</commons.io.version>
         <commons-configuration>2.7</commons-configuration>
@@ -68,19 +69,22 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
+        <org.json.version>20220320</org.json.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>${servlet-api.version}</javax.servlet.version>
 
-        <jetty.version>9.4.41.v20210516</jetty.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>
 
-        <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version>
+        <org.owasp.esapi.version>2.4.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.version>2.12.7</jackson.version>
         <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
 
         <clearspring.version>2.1.1</clearspring.version>
@@ -90,7 +94,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
+        <httpcore.version>4.4.15</httpcore.version>
         <json-simple.version>1.1</json-simple.version>
 
         <!-- PM Dictionary validation -->
@@ -99,7 +103,7 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <!-- 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.15</commons-codec>
         <commons-logging>1.2</commons-logging>
@@ -119,7 +123,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>
@@ -137,7 +141,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <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 -->
@@ -174,16 +177,24 @@ Modifications copyright (c) 2018-2019 Nokia
         <!--jacoco-->
         <jacoco.version>0.8.7</jacoco.version>
 
-        <java.driver.core.version>4.5.1</java.driver.core.version>
+        <java.driver.core.version>4.14.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>
 
+        <!--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>
 
@@ -295,6 +306,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>
@@ -382,12 +399,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>
@@ -597,6 +619,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>
@@ -620,6 +643,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>
@@ -648,6 +672,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>
@@ -669,13 +694,13 @@ Modifications copyright (c) 2018-2019 Nokia
             </activation>
             <properties>
                 <checkstyle.skip>true</checkstyle.skip>
-                <maven.test.skip>true</maven.test.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>
@@ -705,6 +730,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>
@@ -764,7 +790,6 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>integration-tests</module>
             </modules>
         </profile>
-
     </profiles>
 
     <repositories>
@@ -793,14 +818,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>