Merge "Spring-boot 3 update"

diff --cc aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
index d26829a,83e0ddf..f24cd00
--- 1/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
--- 2/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
@@@ -20,11 -20,12 +20,10 @@@
  
  package org.onap.aai.restclient;
  
- import javax.annotation.PostConstruct;
- 
- import org.apache.http.client.HttpClient;
- import org.apache.http.impl.client.HttpClients;
+ import jakarta.annotation.PostConstruct;
+ import org.apache.hc.client5.http.classic.HttpClient;
+ import org.apache.hc.client5.http.impl.classic.HttpClients;
  import org.onap.aai.aailog.filter.RestClientLoggingInterceptor;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
  import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
  import org.springframework.web.client.RestTemplate;