From 109f5f03539b10121ead67320c333e06eda126f6 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Wed, 3 Jan 2024 14:49:42 +0100
Subject: Update spring-boot to 2.4

- update spring-boot to 2.4
- add junit vintage engine dependency to keep supporting junit 4 tests
- update mockito to version 3.4.0

Issue-ID: AAI-3681
Change-Id: I8b40529418f9d03179970edf1ab12992db1cb5e8
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-traversal/pom.xml | 107 ++++++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 51 deletions(-)

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

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index a09d14f..125edea 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -32,8 +32,6 @@
 	<artifactId>aai-traversal</artifactId>
 
 	<properties>
-		<mockito.core.version>2.4.0</mockito.core.version>
-		<powermock.version>1.7.0RC2</powermock.version>
 		<java.version>1.8</java.version>
 		<start-class>org.onap.aai.TraversalApp</start-class>
 
@@ -96,15 +94,17 @@
 		<schema.uri.base.path>/aai</schema.uri.base.path>
 		
 		<!-- versions -->
-		<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
-		<spring.version>5.2.15.RELEASE</spring.version>
+		<spring.boot.version>2.4.13</spring.boot.version>
+		<spring.version>5.3.13</spring.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>
 		<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-registry-prometheus.version>1.6.6</micrometer-registry-prometheus.version>
 		<micrometer-jersey2>1.6.6</micrometer-jersey2>
+		<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>
@@ -312,9 +312,6 @@
 		</profile>
 	</profiles>
 
-	<!-- <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> 
-		<artifactId>spring-boot-starter-parent</artifactId> <type>pom</type> <scope>import</scope> 
-		</dependency> </dependencies> </dependencyManagement> -->
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -337,7 +334,7 @@
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${micrometer-registry-prometheus.version}</version>
+			<!-- <version>${micrometer-registry-prometheus.version}</version> -->
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
@@ -459,15 +456,6 @@
 			<groupId>org.codehaus.janino</groupId>
 			<artifactId>janino</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -540,10 +528,6 @@
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
@@ -588,35 +572,39 @@
 		<dependency>
 			<groupId>org.onap.aai.aai-common</groupId>
 			<artifactId>aai-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.onap.aai.aai-common</groupId>
-					<artifactId>aai-aaf-auth</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.codehaus.jackson</groupId>
-					<artifactId>jackson-mapper-asl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>jetty-http</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>jetty-server</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.aai</groupId>
-					<artifactId>aai-logging</artifactId>
-				</exclusion>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.onap.aai.aai-common</groupId>
+                    <artifactId>aai-aaf-auth</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aai</groupId>
+                    <artifactId>aai-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -696,6 +684,23 @@
 			<artifactId>spring-boot-starter-jetty</artifactId>
 		</dependency>
 		<dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+		<!-- TODO: Migrate tests to junit 5 and remove this dependency -->
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+			<exclusions>
+					<exclusion>
+							<groupId>org.hamcrest</groupId>
+							<artifactId>hamcrest-core</artifactId>
+					</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
 			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
-- 
cgit 1.2.3-korg