From 7edf3d37320c593aa92d62338fe7fe2acb35b606 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Wed, 18 Aug 2021 13:54:08 +0100
Subject: [PATCH] Align all SDC dependencies versions

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Iba19bd39ba5a136436ac1e9ca0a7dcc164d6f7bf
Issue-ID: SDC-2875
---
 .../etsi-nfv-nsd-csar-plugin/pom.xml               |  8 +++++++
 catalog-be/pom.xml                                 |  4 ++--
 catalog-fe/pom.xml                                 |  4 ++--
 catalog-model/pom.xml                              | 27 ++++++++++++++++++++++
 integration-tests/pom.xml                          |  2 +-
 onboarding/pom.xml                                 | 10 +-------
 .../notifications-fe/pom.xml                       |  6 ++---
 .../backend/openecomp-sdc-security-util/pom.xml    |  2 +-
 openecomp-be/tools/swagger-ui/pom.xml              |  8 +++++++
 pom.xml                                            | 20 ++++++++--------
 10 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
index b39a0bd3b6..6f7cbb64b5 100644
--- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
+++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
@@ -66,6 +66,14 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-webmvc</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 2e1d45432e..841c8fb6a3 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1093,12 +1093,12 @@
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.9.2</version>
+            <version>${aspectj.version}</version>
           </dependency>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.9.2</version>
+            <version>${aspectj.version}</version>
           </dependency>
         </dependencies>
         <executions>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 05473627ab..0b986244f8 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -450,12 +450,12 @@
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.9.2</version>
+            <version>${aspectj.version}</version>
           </dependency>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.9.2</version>
+            <version>${aspectj.version}</version>
           </dependency>
         </dependencies>
         <executions>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 5c74421893..588396d75f 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -23,6 +23,11 @@
       <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
 
     <!-- Common of SDC -->
     <dependency>
@@ -48,6 +53,10 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -82,6 +91,14 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -264,6 +281,12 @@
       <artifactId>cassandra-driver-core</artifactId>
       <version>${cassandra.driver.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
@@ -423,6 +446,10 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1656e28bce..33958d4715 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -55,7 +55,7 @@ limitations under the License.
         <it.helm-validator.version>1.2.2</it.helm-validator.version>
 
         <!-- parser-->
-        <sdc-tosca-parser.version>1.6.5</sdc-tosca-parser.version>
+        <sdc-tosca-parser.version>1.6.6</sdc-tosca-parser.version>
     </properties>
 
     <dependencies>
diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 6b760c872d..c301907ec7 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -45,17 +45,9 @@
     <mvn.clean.version>2.5</mvn.clean.version>
     <mvn.resource.version>3.1.0</mvn.resource.version>
     <mvn.deploy.version>2.4</mvn.deploy.version>
-    <mvn.hub.version>1.4.0</mvn.hub.version>
     <mvn.install.version>2.4</mvn.install.version>
     <mvn.jar.version>2.4</mvn.jar.version>
-    <mvn.jaxb2.version>0.13.3</mvn.jaxb2.version>
-    <mvn.license.version>1.10</mvn.license.version>
-    <mvn.shade.version>2.3</mvn.shade.version>
-    <maven.dependency.version>2.8</maven.dependency.version>
     <mvn.war.version>2.1.1</mvn.war.version>
-    <maven-core.version>3.5.3</maven-core.version>
-    <maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
-    <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version>
 
     <!-- Onboarding 3rd party versions -->
     <aspectjrt.version>${aspectj.version}</aspectjrt.version>
@@ -81,7 +73,7 @@
     <jersey.core.version>1.19.1</jersey.core.version>
     <jersey.multipart.version>1.18.1</jersey.multipart.version>
     <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version>
-    <slf4j.version>1.7.21</slf4j.version>
+    <slf4j.version>${slf4j-api.version}</slf4j.version>
     <spring.framework.version>${spring.version}</spring.framework.version>
     <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
     <woodstox.version>4.4.1</woodstox.version>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
index 282276d0c3..12fe599d33 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
@@ -162,17 +162,17 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.8.9</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.8.9</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.8.9</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
index 1c2a6b510a..012784f5c1 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.functionaljava</groupId>
       <artifactId>functionaljava</artifactId>
-      <version>4.7</version>
+      <version>${functionaljava.version}</version>
     </dependency>
 
     <dependency>
diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index 4e09c7fe04..8bacc05693 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -26,6 +26,14 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-servlets</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index abf1ce7aaa..70572e593c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@ 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.8</spring.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>
@@ -55,7 +55,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <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.18</lombok.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>
@@ -80,15 +80,15 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
+        <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>
@@ -108,7 +108,7 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <!-- 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>
 
@@ -129,12 +129,12 @@ Modifications copyright (c) 2018-2019 Nokia
         <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.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>
@@ -172,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>
 
-- 
2.16.6