X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=asdctool%2Fpom.xml;h=c74c4d6c8afd5dc3403700d940c6cdb036198fce;hb=8b346842194edb8a9e8c4cd2764ae8ebbce988f0;hp=074d551dc4b7de351d67ef751f5366a8bb35b265;hpb=55c536e65dcbd1981de61c6c8bea318585324d22;p=sdc.git

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 074d551dc4..c74c4d6c8a 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.openecomp.sdc</groupId>
 		<artifactId>sdc-main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -210,23 +210,15 @@
 		</dependency>
 
 		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>1.6</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-collections</artifactId>
-					<groupId>commons-collections</groupId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-configuration2</artifactId>
+			<version>${commons-configuration}</version>
 		</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>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -241,6 +233,14 @@
 					<artifactId>commons-collections</artifactId>
 					<groupId>commons-collections</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>groovy</artifactId>
+					<groupId>org.codehaus.groovy</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.thrift</groupId>
+					<artifactId>libthrift</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -252,9 +252,9 @@
 		</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>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -264,27 +264,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.tinkerpop</groupId>
-			<artifactId>tinkergraph-gremlin</artifactId>
-			<version>3.0.1-incubating</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tinkerpop</groupId>
-			<artifactId>gremlin-groovy</artifactId>
-			<version>3.0.1-incubating</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>groovy</artifactId>
-					<groupId>org.codehaus.groovy</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- TITAN end -->
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -421,6 +400,11 @@
 			<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 -->
 
@@ -434,9 +418,8 @@
 
 		<dependency>
 			<groupId>org.apache.poi</groupId>
-			<artifactId>com.springsource.org.apache.poi</artifactId>
-			<version>3.9.0.FINAL</version>
-			<scope>compile</scope>
+			<artifactId>poi</artifactId>
+			<version>${apache-poi.version}</version>
 		</dependency>
 
 		<dependency>
@@ -483,12 +466,27 @@
 			<scope>test</scope>
 		</dependency>
 
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- testing end -->
+    <dependency>
+    	<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.bean-matchers</groupId>
+			<artifactId>bean-matchers</artifactId>
+			<version>${bean-matchers.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.stefanbirkner</groupId>
+			<artifactId>system-rules</artifactId>
+			<version>1.19.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- testing end -->
 
 		<dependency>
 			<groupId>io.netty</groupId>
@@ -499,6 +497,12 @@
 			<groupId>io.netty</groupId>
 			<artifactId>netty-handler</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>2.0.2</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -637,6 +641,9 @@
 										<include>src/main/resources/**/*.json</include>
 										<include>src/test/resources/**/*.json</include>
 									</includes>
+									<excludes>
+										<exclude>src/test/resources/graphError.json</exclude>
+									</excludes>
 								</validationSet>
 							</validationSets>
 						</configuration>
@@ -742,4 +749,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>