Remove all thrift's dependencies

[sdc.git] / catalog-dao / pom.xml

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index c15a585..7f37fdf 100644 (file)
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -29,7 +29,7 @@ Modifications copyright (c) 2018 Nokia
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.7.0-SNAPSHOT</version>
        </parent>
 
        <dependencies>
@@ -55,24 +55,17 @@ Modifications copyright (c) 2018 Nokia
                        <scope>provided</scope>
                </dependency>
 
+               <!-- SPRING -->
                <dependency>
-                       <groupId>org.elasticsearch</groupId>
-                       <artifactId>elasticsearch</artifactId>
-                       <version>${elastic-search.version}</version>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
                        <scope>provided</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.elasticsearch.plugin</groupId>
-                       <artifactId>shield</artifactId>
-                       <version>${elastic-search.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-
-               <!-- SPRING -->
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
+                       <artifactId>spring-core</artifactId>
                        <version>${spring.version}</version>
                        <scope>provided</scope>
                </dependency>
@@ -147,7 +140,7 @@ Modifications copyright (c) 2018 Nokia
                </dependency>
 
                <dependency>
-               <groupId>org.jmockit</groupId>
+                       <groupId>org.jmockit</groupId>
                        <artifactId>jmockit</artifactId>
                        <scope>test</scope>
                </dependency>
@@ -223,6 +216,20 @@ Modifications copyright (c) 2018 Nokia
                        <scope>test</scope>
                </dependency>
 
+               <dependency>
+                       <groupId>org.junit.jupiter</groupId>
+                       <artifactId>junit-jupiter</artifactId>
+                       <version>${junitJupiter.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-junit-jupiter</artifactId>
+                       <version>${mockitoJupiter.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-jci-core</artifactId>
@@ -237,11 +244,10 @@ Modifications copyright (c) 2018 Nokia
                        <scope>test</scope>
                </dependency>
 
-               <!-- TITAN -->
                <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-core</artifactId>
-                       <version>${titan.version}</version>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-core</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -252,13 +258,21 @@ Modifications copyright (c) 2018 Nokia
                                        <artifactId>slf4j-log4j12</artifactId>
                                        <groupId>org.slf4j</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <artifactId>commons-collections</artifactId>
+                                       <groupId>commons-collections</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>groovy</artifactId>
+                                       <groupId>org.codehaus.groovy</groupId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.sdc.sdc-titan-cassandra</groupId>
-                       <artifactId>sdc-titan-cassandra</artifactId>
-                       <version>${sdc.titan.version}</version>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-cassandra</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -274,7 +288,6 @@ Modifications copyright (c) 2018 Nokia
                        <version>${lang3.version}</version>
                        <scope>provided</scope>
                </dependency>
-               <!-- TITAN END -->
 
                <!-- CASSANDRA -->
                <dependency>
@@ -295,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>
@@ -305,6 +323,10 @@ Modifications copyright (c) 2018 Nokia
                                        <groupId>org.apache.cassandra</groupId>
                                        <artifactId>cassandra-all</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.thrift</groupId>
+                                       <artifactId>libthrift</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -314,6 +336,11 @@ Modifications copyright (c) 2018 Nokia
                        <scope>test</scope>
                </dependency>
                <!-- CASSANDRA END -->
+
+               <dependency>
+                       <groupId>org.codehaus.groovy</groupId>
+                       <artifactId>groovy</artifactId>
+               </dependency>
        </dependencies>
 
        <build>