From 05b52a98e26f79d20c9921921d3aebe0f9b49f60 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Thu, 27 Jun 2024 14:12:01 +0200
Subject: Update Janusgraph to 0.5.0 in traversal

- update Janusgraph to 0.5.0 + tinkerpop to 3.4.13
- do not use pagination methods from HttpEntry [1]
- introduce WebTestClient as a way to more elegantly declare http requests and assertions

[1] pagination is still done on the client-side in this service.
This change just removes the usage of methods of HttpEntry that effectively do a List.subList
and that will be removed from HttpEntry shortly after

Issue-ID: AAI-3902
Change-Id: I446f092048b9e2be7314ed32ab3de5d5e1e1689d
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-traversal/pom.xml | 64 ++++++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 44 deletions(-)

(limited to 'aai-traversal/pom.xml')

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 59527d0..99e5c2d 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.aai.traversal</groupId>
 		<artifactId>traversal</artifactId>
-		<version>1.14.2-SNAPSHOT</version>
+		<version>1.14.3-SNAPSHOT</version>
 	</parent>
 	<groupId>org.onap.aai.traversal</groupId>
 	<artifactId>aai-traversal</artifactId>
@@ -94,18 +94,17 @@
 
 		<!-- versions -->
 		<spring.boot.version>2.4.13</spring.boot.version>
-		<spring.version>5.3.13</spring.version>
+		<janusgraph.version>0.5.0</janusgraph.version>
+		<gremlin.version>3.4.13</gremlin.version>
+
 		<spring-cloud.version>2020.0.2</spring-cloud.version>
-		<spring.test.version>${spring.version}</spring.test.version>
-		<spring.jms.version>${spring.version}</spring.jms.version>
+
 		<javax.servlet.version>4.0.1</javax.servlet.version>
 		<antlr.version>4.9.3</antlr.version>
 		<keycloak.version>11.0.2</keycloak.version>
-		<micrometer-spring-legacy.version>1.3.19</micrometer-spring-legacy.version>
-		<micrometer-core.version>1.6.6</micrometer-core.version>
-		<micrometer-jersey2>1.6.6</micrometer-jersey2>
+
+		<micrometer.version>1.6.6</micrometer.version>
 		<mockito.core.version>3.4.0</mockito.core.version>
-		<powermock.version>2.0.9</powermock.version>
 		<testcontainers.version>1.6.1</testcontainers.version>
 		<netty.handler.version>4.1.63.Final</netty.handler.version>
 		<netty.version>4.1.63.Final</netty.version>
@@ -322,25 +321,20 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-hateoas</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-spring-legacy</artifactId>
-			<version>${micrometer-spring-legacy.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>
-			<version>${micrometer-core.version}</version>
+			<version>${micrometer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
-			<!-- <version>${micrometer-registry-prometheus.version}</version> -->
+			<version>${micrometer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-jersey2</artifactId>
-			<version>${micrometer-jersey2}</version>
+			<version>${micrometer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
@@ -471,6 +465,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.janusgraph</groupId>
+			<artifactId>janusgraph-inmemory</artifactId>
+			<version>${janusgraph.version}</version>
+	</dependency>
 		<dependency>
 			<groupId>com.github.jnr</groupId>
 			<artifactId>jnr-ffi</artifactId>
@@ -493,34 +492,6 @@
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito2</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4-rule-agent</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.beust</groupId>
-			<artifactId>jcommander</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
@@ -680,6 +651,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jetty</artifactId>
-- 
cgit 1.2.3-korg