From 8394fae8e6fca37ad8f3e10ade82d8d2507585d1 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Tue, 28 Apr 2020 16:57:56 +0100
Subject: [PATCH] Remove all thrift's dependencies

Remove unused/duplicated dependencies

Change-Id: Ic2239acc5ddde1d0874b5139c228934ec1e61cd0
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2985
---
 asdctool/pom.xml                                           |  5 -----
 catalog-be/pom.xml                                         |  5 -----
 catalog-dao/pom.xml                                        | 10 +++++-----
 .../org/openecomp/sdc/be/utils/CassandraTestHelper.java    | 11 +++++------
 catalog-model/pom.xml                                      |  5 -----
 onboarding/pom.xml                                         | 10 +---------
 pom.xml                                                    | 14 ++++----------
 test-apis-ci/pom.xml                                       |  5 -----
 8 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index dac5063311..534c8811bd 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -393,11 +393,6 @@
       <version>${cassandra.driver.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>${libthrift.version}</version>
-    </dependency>
 
     <!-- CASSANDRA END -->
 
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 637dcc4004..3a9e72d972 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -432,11 +432,6 @@
             <version>${cassandra.driver.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>${libthrift.version}</version>
-        </dependency>
         <!-- CASSANDRA END -->
 
         <!-- Inserted for ECOMP Portal Integration -->
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index f89e5f7efc..7f37fdfe8b 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -308,6 +308,11 @@ Modifications copyright (c) 2018 Nokia
 			<version>${cassandra.driver.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.datastax.oss</groupId>
+			<artifactId>java-driver-core</artifactId>
+			<version>${java.driver.core.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.cassandraunit</groupId>
 			<artifactId>cassandra-unit</artifactId>
@@ -330,11 +335,6 @@ Modifications copyright (c) 2018 Nokia
 			<version>3.11.3</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<version>${libthrift.version}</version>
-		</dependency>
 		<!-- CASSANDRA END -->
 
 		<dependency>
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/CassandraTestHelper.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/CassandraTestHelper.java
index d97f7d3fa4..eec9b20fbd 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/CassandraTestHelper.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/CassandraTestHelper.java
@@ -22,23 +22,22 @@
 package org.openecomp.sdc.be.utils;
 
 import com.datastax.driver.core.Cluster;
+import java.io.IOException;
 import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.thrift.transport.TTransportException;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 
-import java.io.IOException;
-
 public class CassandraTestHelper {
+
     public static final String SERVER = "localhost";
-    public static final int BINARY_PORT = 9142;
+    private static final int BINARY_PORT = 9142;
 
-    public CassandraTestHelper() {
+    private CassandraTestHelper() {
     }
 
     public static void startServer() {
         try {
             EmbeddedCassandraServerHelper.startEmbeddedCassandra(80000);
-        } catch(TTransportException | ConfigurationException | IOException ex) {
+        } catch (ConfigurationException | IOException ex) {
             throw new RuntimeException(ex);
         }
     }
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 2b70c4dfb9..6a4d6bc317 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -190,11 +190,6 @@
 			<version>${cassandra.driver.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<version>${libthrift.version}</version>
-		</dependency>
 		<!-- CASSANDRA END -->
 
 		<dependency>
diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index dda15ea941..154f8970a8 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -71,17 +71,15 @@
         <cglib.nodep.version>3.2.4</cglib.nodep.version>
         <classmate.version>1.3.3</classmate.version>
         <commons.codec.version>1.10</commons.codec.version>
-        <commons.collections.version>4.1</commons.collections.version>
         <commons.digester.version>2.1</commons.digester.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.lang3.version>3.4</commons.lang3.version>
         <cxf.version>3.1.16</cxf.version>
-        <datastax.cassandra.version>3.4.0</datastax.cassandra.version>
+        <datastax.cassandra.version>3.8.0</datastax.cassandra.version>
         <easymock.version>3.4</easymock.version>
         <groovy.version>2.4.8</groovy.version>
         <groovy.minimal.version>1.5.8</groovy.minimal.version>
-        <gson.version>2.3.1</gson.version>
         <fop.version>2.2</fop.version>
         <freemarker.version>2.3.26-incubating</freemarker.version>
         <hibernate.validator.version>5.3.6.Final</hibernate.validator.version>
@@ -97,12 +95,10 @@
         <jackson.version>2.9.9</jackson.version>
         <jackson.annotations.version>${jackson.version}</jackson.annotations.version>
         <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version>
-        <jackson.mapper.version>1.9.13</jackson.mapper.version>
         <jcommander.version>1.58</jcommander.version>
         <jetty.servlets.version>9.4.11.v20180605</jetty.servlets.version>
         <jersey.core.version>1.19.1</jersey.core.version>
         <jersey.multipart.version>1.18.1</jersey.multipart.version>
-        <junit.version>4.12</junit.version>
         <logback.version>1.2.3</logback.version>
         <mockito.all.version>1.10.19</mockito.all.version>
         <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version>
@@ -114,17 +110,13 @@
         <snakeyaml.version>1.17</snakeyaml.version>
         <spring.framework.version>4.3.18.RELEASE</spring.framework.version>
         <swagger.version>2.0.8</swagger.version>
-        <testng.version>6.14.3</testng.version>
         <woodstox.version>4.4.1</woodstox.version>
-        <ws.rs.version>2.0.1</ws.rs.version>
         <zusammen.version>1.0.1</zusammen.version>
         <zusammen-state-store.version>1.0.2</zusammen-state-store.version>
         <zusammen-collaboration-store.version>1.0.2</zusammen-collaboration-store.version>
         <zusammen-index-store.version>1.0.0</zusammen-index-store.version>
         <build.tools.version>${project.version}</build.tools.version>
-        <togglz.version>2.4.1.Final</togglz.version>
         <bouncycastle.version>1.61</bouncycastle.version>
-        <onap.logging.version>1.6.1</onap.logging.version>
     </properties>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 1a8c9b857e..846b93ad94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,14 +48,12 @@ Modifications copyright (c) 2018-2019 Nokia
     <guava.version>18.0</guava.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.36.Final</netty.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <wire-mock.version>2.18.0</wire-mock.version>
     <ecomp.version>2.6.0</ecomp.version>
-    <cassandra.unit.version>3.5.0.1</cassandra.unit.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>
@@ -66,10 +64,6 @@ Modifications copyright (c) 2018-2019 Nokia
     <commons.collections.version>4.1</commons.collections.version>
     <ws.rs.version>2.0.1</ws.rs.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.18.v20190429</jetty.version>
 
     <!-- JSON and YAML Parsing -->
@@ -119,7 +113,6 @@ Modifications copyright (c) 2018-2019 Nokia
     <junitJupiter.version>5.6.0</junitJupiter.version>
     <assertj.version>3.10.0</assertj.version>
     <testng.version>6.14.3</testng.version>
-    <extentreports.version>3.0.3</extentreports.version>
     <cucumber.version>2.4.0</cucumber.version>
     <bean-matchers.version>0.11</bean-matchers.version>
     <hamcrest.version>2.1</hamcrest.version>
@@ -142,8 +135,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
     <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions>
     <!--cassandra -->
-    <cassandra.driver.version>3.6.0</cassandra.driver.version>
-    <libthrift.version>0.12.0</libthrift.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>
@@ -167,6 +159,8 @@ Modifications copyright (c) 2018-2019 Nokia
     <!--jacoco-->
     <jacoco.version>0.8.5</jacoco.version>
 
+    <java.driver.core.version>4.5.1</java.driver.core.version>
+
   </properties>
 
 
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 456aeae1e7..c71c666095 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -415,11 +415,6 @@
       <version>${cassandra.driver.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>${libthrift.version}</version>
-    </dependency>
     <!-- CASSANDRA END -->
 
     <dependency>
-- 
2.16.6