Depedency upgrades

Latest dependency versions upgraded.

Issue-ID: NONRTRIC-1080
Change-Id: I423e7e32464dd815ba7591debb296603cdc6e587
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/participants/participant-impl-dme/pom.xml b/participants/participant-impl-dme/pom.xml
index ab356db..31c7d5d 100755 (executable)
--- a/participants/participant-impl-dme/pom.xml
+++ b/participants/participant-impl-dme/pom.xml
@@ -70,8 +70,8 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java b/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
index f35cc11..30456c3 100755 (executable)
--- a/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
+++ b/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2023 Nordix Foundation.
- *  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ *  Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.Getter;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi;
 import org.onap.policy.clamp.acm.participant.intermediary.api.impl.AcElementListenerV1;
 import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy;

diff --git a/participants/participant-impl-dme/src/test/java/org/oransc/participant/dme/restclient/AcA1PmsClientTest.java b/participants/participant-impl-dme/src/test/java/org/oransc/participant/dme/restclient/AcA1PmsClientTest.java
index f7489d9..819c1a7 100755 (executable)
--- a/participants/participant-impl-dme/src/test/java/org/oransc/participant/dme/restclient/AcA1PmsClientTest.java
+++ b/participants/participant-impl-dme/src/test/java/org/oransc/participant/dme/restclient/AcA1PmsClientTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2023 Nordix Foundation.
+ *  Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,20 +41,20 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.oransc.participant.dme.exception.DmeException;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
 class AcA1PmsClientTest {
 
-    @MockBean
+    @MockitoBean
     DataProducerRegistrationApiClient dataProducerRegistrationApiClient;
 
-    @MockBean
+    @MockitoBean
     DataConsumerApiClient dataConsumerApiClient;
 
-    @MockBean
+    @MockitoBean
     AcDmeClient acDmeClient;
 
     ObjectMapper objectMapper = new ObjectMapper();
@@ -159,6 +160,7 @@ class AcA1PmsClientTest {
     private static Stream<Arguments> getDeleteDataConsumers() {
         return Stream.of(Arguments.of(Set.of("consumer1")), Arguments.of(Set.of()));
     }
+
     private static Stream<Arguments> getInfoTypes() {
         return Stream.of(Arguments.of(Map.of("infotype1", "{}")), Arguments.of(Map.of()));
     }

diff --git a/participants/pom.xml b/participants/pom.xml
index 6853b53..dab68d5 100755 (executable)
--- a/participants/pom.xml
+++ b/participants/pom.xml
@@ -4,7 +4,7 @@
 * O-RAN-SC
 * %%
 * Copyright (C) 2023 Nordix Foundation
-* Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
+* Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.5.3</version>
         <relativePath/>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -51,9 +51,9 @@
     </repositories>
     <properties>
         <java.version>17</java.version>
-        <openapi.maven.version>7.3.0</openapi.maven.version>
-        <docker-maven-plugin>0.45.0</docker-maven-plugin>
-        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <openapi.maven.version>7.14.0</openapi.maven.version>
+        <docker-maven-plugin>0.46.0</docker-maven-plugin>
+        <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <onap.acm.models.version>8.0.1</onap.acm.models.version> 
         <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
     </properties>

diff --git a/pom.xml b/pom.xml
index 1ee95e0..d9922d9 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 * O-RAN-SC
 * %%
 * Copyright (C) 2023 Nordix Foundation
-* Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved
+* Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.5.3</version>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>rappmanager</artifactId>
@@ -49,23 +49,23 @@
     </repositories>
     <properties>
         <java.version>17</java.version>
-        <openapi.maven.version>7.3.0</openapi.maven.version>
-        <docker-maven-plugin>0.45.0</docker-maven-plugin>
-        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <openapi.maven.version>7.14.0</openapi.maven.version>
+        <docker-maven-plugin>0.46.0</docker-maven-plugin>
+        <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <onap.acm.models.version>8.0.0</onap.acm.models.version>
         <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
-        <spring.statemachine.version>4.0.0</spring.statemachine.version>
-        <spring.context.version>6.1.14</spring.context.version>
-        <javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
-        <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
-        <javax.servlet.api.version>3.0-alpha-1</javax.servlet.api.version>
-        <io.swagger.version>2.2.23</io.swagger.version>
+        <spring.statemachine.version>4.0.1</spring.statemachine.version>
+        <spring.context.version>6.2.8</spring.context.version>
+        <jakarta.validation.api.version>3.1.1</jakarta.validation.api.version>
+        <jakarta.annotation.api.version>3.0.0</jakarta.annotation.api.version>
+        <jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
+        <io.swagger.version>2.2.34</io.swagger.version>
         <slf4j.version>2.1.0-alpha1</slf4j.version>
-        <apache.httpcore.version>4.4.16</apache.httpcore.version>
-        <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
+        <apache.httpcore.version>5.3.4</apache.httpcore.version>
+        <exec-maven-plugin.version>3.5.1</exec-maven-plugin.version>
         <copy-resources-maven-plugin.version>3.3.1</copy-resources-maven-plugin.version>
         <apache.compress.version>1.27.1</apache.compress.version>
-        <guava.version>33.3.0-jre</guava.version>
+        <guava.version>33.4.8-jre</guava.version>
     </properties>
     <build>
         <plugins>

diff --git a/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java
index f176c7b..99f9302 100644 (file)
--- a/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java
+++ b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java
@@ -70,10 +70,10 @@ import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.web.client.ExpectedCount;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
@@ -87,13 +87,13 @@ import org.springframework.web.client.RestTemplate;
 class AcmDeployerTest {
 
     MockRestServiceServer mockServer;
-    @SpyBean
+    @MockitoSpyBean
     AcmDeployer acmDeployer;
     @Autowired
     RestTemplate restTemplate;
     @Autowired
     ACMConfiguration acmConfiguration;
-    @SpyBean
+    @MockitoSpyBean
     RappInstanceStateMachine rappInstanceStateMachine;
     @Autowired
     RappCsarConfigurationHandler rappCsarConfigurationHandler;

diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml
index 24111c5..09ee2b5 100755 (executable)
--- a/rapp-manager-application/pom.xml
+++ b/rapp-manager-application/pom.xml
@@ -131,14 +131,14 @@
         </dependency>
         <!-- Bean Validation API support -->
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>${javax.validation.api.version}</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${jakarta.validation.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation.api.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation.api.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -151,9 +151,9 @@
             <version>${io.swagger.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${javax.servlet.api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet.api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java
index 01d9749..530f17c 100644 (file)
--- a/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java
+++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,9 +45,9 @@ import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -61,13 +61,13 @@ class RappControllerTest {
     @Autowired
     private RappCacheService rappCacheService;
 
-    @MockBean
+    @MockitoBean
     AcmDeployer acmDeployer;
 
-    @MockBean
+    @MockitoBean
     DmeDeployer dmeDeployer;
 
-    @MockBean
+    @MockitoBean
     SmeLifecycleManager smeLifecycleManager;
 
     private final String validRappFile = "valid-rapp-package.csar";

diff --git a/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java
index 21b865b..35e1c39 100644 (file)
--- a/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java
+++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,8 @@ import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -62,16 +62,16 @@ class RappInstanceControllerTest {
     @Autowired
     private RappInstanceStateMachine rappInstanceStateMachine;
 
-    @MockBean
+    @MockitoBean
     AcmDeployer acmDeployer;
 
-    @MockBean
+    @MockitoBean
     SmeDeployer smeDeployer;
 
-    @MockBean
+    @MockitoBean
     DmeDeployer dmeDeployer;
 
-    @MockBean
+    @MockitoBean
     SmeLifecycleManager smeLifecycleManager;
 
     private final String validRappFile = "valid-rapp-package.csar";

diff --git a/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
index d1978b2..b1f8066 100644 (file)
--- a/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
+++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
@@ -45,10 +45,10 @@ import org.oransc.rappmanager.models.rapp.RappState;
 import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.web.client.ExpectedCount;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
@@ -56,13 +56,13 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class DeploymentArtifactsServiceTest {
 
-    @SpyBean
+    @MockitoSpyBean
     DeploymentArtifactsService deploymentArtifactsService;
     @Autowired
     RestTemplate restTemplate;
     @Autowired
     RappCsarConfigurationHandler rappCsarConfigurationHandler;
-    @MockBean
+    @MockitoBean
     SmeLifecycleManager smeLifecycleManager;
 
     MockRestServiceServer mockServer;

diff --git a/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java
index 7ba82d1..bf682e2 100644 (file)
--- a/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java
+++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@ import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
@@ -53,19 +53,19 @@ class RappServiceTest {
     @Autowired
     RappService rappService;
 
-    @MockBean
+    @MockitoBean
     AcmDeployer acmDeployer;
 
-    @MockBean
+    @MockitoBean
     SmeDeployer smeDeployer;
 
-    @MockBean
+    @MockitoBean
     DmeDeployer dmeDeployer;
 
-    @MockBean
+    @MockitoBean
     DeploymentArtifactsService deploymentArtifactsService;
 
-    @MockBean
+    @MockitoBean
     SmeLifecycleManager smeLifecycleManager;
 
     @Autowired

diff --git a/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java
index 01bb422..dda3ba0 100644 (file)
--- a/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java
+++ b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java
@@ -57,10 +57,10 @@ import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.web.client.ExpectedCount;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
@@ -73,7 +73,7 @@ import org.springframework.web.client.RestTemplate;
 class DmeDeployerTest {
 
     MockRestServiceServer mockServer;
-    @SpyBean
+    @MockitoSpyBean
     DmeDeployer dmeDeployer;
     @Autowired
     RestTemplate restTemplate;

diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml
index 61ef555..20c5f53 100755 (executable)
--- a/rapp-manager-models/pom.xml
+++ b/rapp-manager-models/pom.xml
@@ -99,8 +99,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
             <version>${apache.httpcore.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java
index 13bc2f8..d2f95e2 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ import org.oransc.rappmanager.models.rappinstance.RappSMEInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 @SpringBootTest
 @EnableConfigurationProperties
@@ -63,7 +63,7 @@ import org.springframework.test.context.ContextConfiguration;
         classes = {ObjectMapper.class, RappsEnvironmentConfiguration.class, RappCsarConfigurationHandler.class})
 class RappCsarConfigurationHandlerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     RappCsarConfigurationHandler rappCsarConfigurationHandler;
     @Autowired
     RappsEnvironmentConfiguration rappsEnvironmentConfiguration;

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
index 8c02988..530bf42 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullSource;
@@ -41,10 +41,10 @@ import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
 import org.oransc.rappmanager.models.exception.RappValidationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.web.multipart.MultipartFile;
 
 @SpringBootTest
@@ -54,7 +54,7 @@ class ArtifactDefinitionValidatorTest {
 
     @Autowired
     ArtifactDefinitionValidator artifactDefinitionValidator;
-    @SpyBean
+    @MockitoSpyBean
     RappValidationUtils rappValidationUtils;
     String validCsarFileLocation = "src/test/resources/";
     String validRappFile = "valid-rapp-package.csar";

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java
index e01138c..c21de3b 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.UUID;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullSource;
@@ -46,11 +46,11 @@ import org.oransc.rappmanager.models.exception.RappValidationException;
 import org.oransc.rappmanager.models.rapp.Rapp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cache.CacheManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.web.multipart.MultipartFile;
 
 @SpringBootTest
@@ -61,7 +61,7 @@ class AsdDescriptorValidatorTest {
 
     @Autowired
     AsdDescriptorValidator asdDescriptorValidator;
-    @SpyBean
+    @MockitoSpyBean
     RappValidationUtils rappValidationUtils;
     @Autowired
     RappCacheService rappCacheService;

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java
index 15d9a4e..a88cf1d 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
 import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java
index b1fd091..91de51c 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.oransc.rappmanager.models.exception.RappValidationException;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java
index cd4486f..7325747 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.stream.Stream;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;

diff --git a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java
index 13bcb2f..7c0d6e4 100644 (file)
--- a/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java
+++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
 import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;

diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml
index 4495e29..f90b69d 100755 (executable)
--- a/rapp-manager-sme/pom.xml
+++ b/rapp-manager-sme/pom.xml
@@ -64,8 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
             <version>${apache.httpcore.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java
index 2c58653..c3815c5 100644 (file)
--- a/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java
+++ b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java
@@ -55,10 +55,10 @@ import org.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.web.client.ExpectedCount;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
@@ -72,7 +72,7 @@ class SmeDeployerTest {
 
     MockRestServiceServer mockServer;
     @Autowired
-    @SpyBean
+    @MockitoSpyBean
     SmeDeployer smeDeployer;
     @Autowired
     RestTemplate restTemplate;

diff --git a/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java
index e29faa4..995423f 100644 (file)
--- a/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java
+++ b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,18 +30,18 @@ import org.junit.jupiter.api.Test;
 import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 @SpringBootTest(classes = SmeLifecycleManager.class)
 class SmeLifecycleManagerTest {
 
     @Autowired
-    @MockBean
+    @MockitoBean
     SmeDeployer smeDeployer;
 
     @Autowired
-    @SpyBean
+    @MockitoSpyBean
     SmeLifecycleManager smeLifecycleManager;
 
     @Test