From e838147fdcb4915c6529d65326999706da59f717 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Thu, 6 Feb 2025 08:51:24 +0100
Subject: [PATCH] Use 1.15.5 aai-common release version

- release version is required to stage schema-service release
- fully remove junit 4

Issue-ID: AAI-4125
Change-Id: I79ec06fb32ee6375d431659eb6af5054f4bd3d9c
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-queries/pom.xml                                              | 2 +-
 aai-schema-gen/pom.xml                                           | 8 +-------
 aai-schema-service/pom.xml                                       | 9 +++++++++
 .../test/java/org/onap/aai/schemaservice/SchemaServiceTest.java  | 2 +-
 .../java/org/onap/aai/schemaservice/WebClientConfiguration.java  | 2 +-
 .../interceptors/post/InvalidResponseStatusTest.java             | 3 ++-
 .../interceptors/post/ResponseHeaderManipulationTest.java        | 4 ++--
 .../validation/DefaultVersionValidationModuleTest.java           | 2 +-
 .../schemaservice/nodeschema/validation/NodeValidatorTest.java   | 3 ++-
 .../nodeschema/validation/VersionValidatorTest.java              | 3 ++-
 pom.xml                                                          | 2 +-
 11 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index ff5fb70..5db11c0 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.4.0</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 4cad027..806a717 100644
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -696,12 +696,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -712,7 +706,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.4.0</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index a531f63..f4ec45e 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -330,6 +330,10 @@
                     <groupId>org.onap.aai.aai-common</groupId>
                     <artifactId>aai-schema-ingest</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -363,6 +367,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
index 7450d14..2188a15 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
@@ -34,7 +34,7 @@ import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.util.AAIConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/WebClientConfiguration.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/WebClientConfiguration.java
index 48f0a01..965d116 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/WebClientConfiguration.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/WebClientConfiguration.java
@@ -3,7 +3,7 @@ package org.onap.aai.schemaservice;
 import java.time.Duration;
 import java.util.Collections;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/InvalidResponseStatusTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/InvalidResponseStatusTest.java
index 2bc7e34..7810fe8 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/InvalidResponseStatusTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/InvalidResponseStatusTest.java
@@ -28,7 +28,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulationTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulationTest.java
index a01660c..9238254 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulationTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulationTest.java
@@ -30,8 +30,8 @@ import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/DefaultVersionValidationModuleTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/DefaultVersionValidationModuleTest.java
index 324bdee..0e30beb 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/DefaultVersionValidationModuleTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/DefaultVersionValidationModuleTest.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class DefaultVersionValidationModuleTest {
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/NodeValidatorTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/NodeValidatorTest.java
index 2e2b48b..5252928 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/NodeValidatorTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/NodeValidatorTest.java
@@ -21,7 +21,8 @@ package org.onap.aai.schemaservice.nodeschema.validation;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.*;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.onap.aai.schemaservice.config.ConfigTranslator;
 import org.onap.aai.schemaservice.nodeschema.SchemaVersion;
 import java.util.*;
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/VersionValidatorTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/VersionValidatorTest.java
index 5db1a26..fa93dc1 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/VersionValidatorTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/nodeschema/validation/VersionValidatorTest.java
@@ -21,7 +21,8 @@ package org.onap.aai.schemaservice.nodeschema.validation;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.*;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import static org.mockito.Mockito.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/pom.xml b/pom.xml
index 5e14ba2..8ca6ee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
         <checkstyle.skip>false</checkstyle.skip>
-        <aai.common.version>1.15.5-SNAPSHOT</aai.common.version>
+        <aai.common.version>1.15.5</aai.common.version>
         <spring-cloud.version>2021.0.9</spring-cloud.version>
     </properties>
     <dependencyManagement>
-- 
2.16.6