chore(dependency): upgrade spring boot from 2.7.x to 3.0.x and spring cloud from 2021.0.x to 2022.0.x

cats/cats-redis/src/main/java/com/netflix/spinnaker/cats/redis/cache/AbstractRedisCache.java

@@ -27,8 +27,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.Response;
-import redis.clients.jedis.ScanParams;
-import redis.clients.jedis.ScanResult;
+import redis.clients.jedis.params.ScanParams;
+import redis.clients.jedis.resps.ScanResult;
 
 public abstract class AbstractRedisCache implements WriteableCache {
 

cats/cats-redis/src/main/java/com/netflix/spinnaker/cats/redis/cluster/ClusteredSortAgentScheduler.java

@@ -393,7 +393,7 @@ void saturatePool() {
       }
 
       // First cull threads in the WORKING set that have been there too long (TIMEOUT time).
-      Set<String> oldKeys = jedis.zrangeByScore(WORKING_SET, "-inf", score(jedis, NOW));
+      Set<String> oldKeys = Set.copyOf(jedis.zrangeByScore(WORKING_SET, "-inf", score(jedis, NOW)));
       for (String key : oldKeys) {
         // Ignore result, since if this agent was released between now and the above jedis call, our
         // work was done

cats/cats-redis/src/test/java/com/netflix/spinnaker/cats/redis/cluster/ClusteredSortAgentSchedulerTest.java

@@ -30,11 +30,10 @@
 import com.netflix.spinnaker.cats.agent.ExecutionInstrumentation;
 import com.netflix.spinnaker.cats.cluster.DefaultAgentIntervalProvider;
 import com.netflix.spinnaker.cats.test.TestAgent;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -74,9 +73,9 @@ public void setUp() throws IllegalAccessException {
   @Test
   public void testRunningAgentsSemaphore() {
     when(jedis.zrangeByScore(eq(ClusteredSortAgentScheduler.WORKING_SET), anyString(), anyString()))
-        .thenReturn(new HashSet<>());
+        .thenReturn(new ArrayList<>());
     when(jedis.zrangeByScore(eq(ClusteredSortAgentScheduler.WAITING_SET), anyString(), anyString()))
-        .thenReturn(Set.of("testAgentType"));
+        .thenReturn(List.of("testAgentType"));
 
     clusteredSortAgentScheduler.saturatePool();
 
@@ -92,9 +91,9 @@ public void testRunningAgentsSemaphoreWithException() throws InterruptedExceptio
     CountDownLatch latch = new CountDownLatch(1);
 
     when(jedis.zrangeByScore(eq(ClusteredSortAgentScheduler.WORKING_SET), anyString(), anyString()))
-        .thenReturn(new HashSet<>());
+        .thenReturn(new ArrayList<>());
     when(jedis.zrangeByScore(eq(ClusteredSortAgentScheduler.WAITING_SET), anyString(), anyString()))
-        .thenReturn(Set.of(agent1.getAgentType(), agent2.getAgentType()));
+        .thenReturn(List.of(agent1.getAgentType(), agent2.getAgentType()));
     when(jedis.scriptExists(anyString())).thenReturn(true);
     clusteredSortAgentScheduler.schedule(agent1, agentExecution, executionInstrumentation);
     clusteredSortAgentScheduler.schedule(agent2, agentExecution, executionInstrumentation);

cats/cats-sql/src/main/kotlin/com/netflix/spinnaker/cats/sql/cache/SqlCache.kt

@@ -26,7 +26,7 @@ import java.time.Duration
 import java.util.Arrays
 import java.util.concurrent.ConcurrentSkipListSet
 import java.util.concurrent.atomic.AtomicInteger
-import javax.annotation.PreDestroy
+import jakarta.annotation.PreDestroy
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.coroutines.CoroutineContext

clouddriver-alicloud/src/main/java/com/netflix/spinnaker/clouddriver/alicloud/controllers/AliCloudImageController.java

@@ -25,7 +25,7 @@
 import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException;
 import groovy.util.logging.Slf4j;
 import java.util.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

clouddriver-alicloud/src/test/java/com/netflix/spinnaker/clouddriver/alicloud/controllers/AliCloudImageControllerTest.java

@@ -27,7 +27,7 @@
 import com.netflix.spinnaker.clouddriver.alicloud.controllers.AliCloudImageController.Image;
 import com.netflix.spinnaker.clouddriver.alicloud.controllers.AliCloudImageController.LookupOptions;
 import java.util.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;

clouddriver-aws/clouddriver-aws.gradle

@@ -24,7 +24,7 @@ dependencies {
   implementation project(":clouddriver-security")
   implementation project(":clouddriver-saga")
 
-  implementation "javax.inject:javax.inject:1"
+  implementation "jakarta.inject:jakarta.inject-api:2.0.1"
   implementation "com.amazonaws:aws-java-sdk"
   implementation "com.github.ben-manes.caffeine:guava"
   implementation "com.netflix.awsobjectmapper:awsobjectmapper"
@@ -42,7 +42,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-web"
   implementation "com.squareup.retrofit2:converter-jackson"
-  implementation "io.reactivex:rxjava"
+  implementation "io.reactivex.rxjava3:rxjava"
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
   implementation "org.apache.groovy:groovy"

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/controllers/AmazonNamedImageLookupController.groovy

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
 
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequest
 
 import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.IMAGES
 import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.NAMED_IMAGES

clouddriver-aws/src/main/java/com/netflix/spinnaker/clouddriver/aws/controllers/CloudFormationController.java

@@ -19,8 +19,8 @@
 import com.netflix.spinnaker.clouddriver.aws.model.AmazonCloudFormationStack;
 import com.netflix.spinnaker.clouddriver.aws.provider.view.AmazonCloudFormationProvider;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.AntPathMatcher;

clouddriver-aws/src/main/java/com/netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleWorker.java

@@ -45,6 +45,7 @@
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerNetworkException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
+import jakarta.inject.Provider;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
@@ -55,7 +56,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.inject.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

clouddriver-aws/src/main/java/com/netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleWorkerProvider.java

@@ -22,12 +22,12 @@
 import com.netflix.spinnaker.clouddriver.aws.security.AmazonClientProvider;
 import com.netflix.spinnaker.clouddriver.aws.security.NetflixAmazonCredentials;
 import com.netflix.spinnaker.credentials.CredentialsRepository;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Provider;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.regex.Pattern;
-import javax.annotation.PostConstruct;
-import javax.inject.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/controllers/AmazonNamedImageLookupControllerSpec.groovy

@@ -27,7 +27,7 @@ import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequest
 
 import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.IMAGES
 import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.NAMED_IMAGES

clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleWorkerSpec.groovy

@@ -36,7 +36,7 @@ import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Subject
 
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 class InstanceTerminationLifecycleWorkerSpec extends Specification {
 

clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle

@@ -39,6 +39,7 @@ dependencies {
   implementation "com.squareup.retrofit2:converter-protobuf:2.8.1"
   implementation "commons-io:commons-io"
   implementation "io.github.resilience4j:resilience4j-retry"
+  implementation "io.github.resilience4j:resilience4j-vavr"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.cloud:spring-cloud-context"

clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/retry/RetryInterceptor.java

@@ -18,7 +18,7 @@
 package com.netflix.spinnaker.clouddriver.cloudfoundry.client.retry;
 
 import groovy.util.logging.Slf4j;
-import io.github.resilience4j.retry.IntervalFunction;
+import io.github.resilience4j.core.IntervalFunction;
 import io.github.resilience4j.retry.Retry;
 import io.github.resilience4j.retry.RetryConfig;
 import java.io.IOException;

clouddriver-configserver/src/main/java/com/netflix/spinnaker/clouddriver/config/ModifiableFilePropertySources.java

@@ -17,12 +17,12 @@
 package com.netflix.spinnaker.clouddriver.config;
 
 import com.netflix.spinnaker.kork.annotations.Alpha;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;

clouddriver-core/clouddriver-core.gradle

@@ -15,8 +15,8 @@ dependencies {
   // which appears to require consumers to have core groovy on the classpath
   api "org.apache.groovy:groovy"
 
-  implementation "javax.inject:javax.inject:1"
-  implementation "javax.validation:validation-api"
+  implementation "jakarta.inject:jakarta.inject-api:2.0.1"
+  implementation "jakarta.validation:jakarta.validation-api"
   implementation "net.logstash.logback:logstash-logback-encoder"
   implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
   implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda"
@@ -35,7 +35,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "io.spinnaker.kork:kork-secrets"
   implementation "com.squareup.retrofit2:converter-jackson"
-  implementation "io.reactivex:rxjava"
+  implementation "io.reactivex.rxjava3:rxjava"
   implementation "net.jodah:failsafe:1.0.4"
   implementation "org.apache.groovy:groovy"
   implementation "org.apache.groovy:groovy-templates"

clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/cache/CatsSearchProvider.groovy

@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.context.SecurityContextHolder
 
-import javax.annotation.PostConstruct
+import jakarta.annotation.PostConstruct
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/config/CloudDriverConfig.java

@@ -107,11 +107,11 @@
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService;
 import com.netflix.spinnaker.kork.jackson.ObjectMapperSubtypeConfigurer;
 import com.netflix.spinnaker.kork.jedis.RedisClientDelegate;
+import jakarta.inject.Provider;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.inject.Provider;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/core/ProjectClustersService.java

@@ -24,11 +24,11 @@
 import com.netflix.spinnaker.clouddriver.model.ClusterProvider;
 import com.netflix.spinnaker.clouddriver.model.ServerGroup;
 import com.netflix.spinnaker.kork.retrofit.Retrofit2SyncCall;
+import jakarta.inject.Provider;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/core/agent/CleanupPendingOnDemandCachesAgent.java

@@ -38,8 +38,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import redis.clients.jedis.Response;
-import redis.clients.jedis.ScanParams;
-import redis.clients.jedis.ScanResult;
+import redis.clients.jedis.params.ScanParams;
+import redis.clients.jedis.resps.ScanResult;
 
 public class CleanupPendingOnDemandCachesAgent implements RunnableAgent, CustomScheduledAgent {
   private static final Logger log =

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/requestqueue/pooled/PooledRequestQueue.java

@@ -21,6 +21,7 @@
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.clouddriver.requestqueue.RequestQueue;
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService;
+import jakarta.annotation.PreDestroy;
 import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
@@ -32,7 +33,6 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/security/AbstractAtomicOperationsCredentialsConverter.java

@@ -23,8 +23,8 @@
 import com.netflix.spinnaker.clouddriver.orchestration.AtomicOperationConverter;
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException;
+import jakarta.validation.constraints.NotNull;
 import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;

clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/core/ProjectClustersServiceSpec.groovy

@@ -25,7 +25,7 @@ import retrofit2.mock.Calls
 import spock.lang.Shared
 import spock.lang.Specification
 
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 import static com.netflix.spinnaker.clouddriver.core.ProjectClustersService.ClusterModel
 

clouddriver-docker/clouddriver-docker.gradle

@@ -34,7 +34,7 @@ dependencies {
   testImplementation "org.springframework:spring-test"
   testImplementation "org.springframework.boot:spring-boot-starter-test"
   testImplementation "org.springframework.security:spring-security-test"
-  testImplementation "com.github.tomakehurst:wiremock-jre8"
+  testImplementation "com.github.tomakehurst:wiremock-jre8-standalone"
   testImplementation "io.spinnaker.kork:kork-core"
   implementation "io.spinnaker.kork:kork-retrofit2"
   implementation "io.spinnaker.kork:kork-web"

clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/controllers/EcsImagesController.java

@@ -18,9 +18,9 @@
 
 import com.netflix.spinnaker.clouddriver.ecs.model.EcsDockerImage;
 import com.netflix.spinnaker.clouddriver.ecs.provider.view.ImageRepositoryProvider;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

clouddriver-elasticsearch/clouddriver-elasticsearch.gradle

@@ -11,7 +11,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-security"
   implementation "com.squareup.retrofit2:converter-jackson"
   implementation "org.apache.groovy:groovy"
-  implementation "org.elasticsearch:elasticsearch"
+  implementation "org.elasticsearch:elasticsearch:8.5.3"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "org.testcontainers:elasticsearch"

clouddriver-event/clouddriver-event.gradle

@@ -26,7 +26,7 @@ dependencies {
   implementation "com.google.code.findbugs:jsr305"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
-  implementation "javax.validation:validation-api"
+  implementation "jakarta.validation:jakarta.validation-api"
   implementation "org.hibernate.validator:hibernate-validator"
 
   testImplementation "cglib:cglib-nodep"

clouddriver-event/src/main/kotlin/com/netflix/spinnaker/clouddriver/event/config/MemoryEventRepositoryConfig.kt

@@ -19,10 +19,10 @@ import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.clouddriver.event.persistence.EventRepository
 import com.netflix.spinnaker.clouddriver.event.persistence.InMemoryEventRepository
 import java.time.Duration
-import javax.validation.Constraint
-import javax.validation.ConstraintValidator
-import javax.validation.ConstraintValidatorContext
-import javax.validation.constraints.Min
+import jakarta.validation.Constraint
+import jakarta.validation.ConstraintValidator
+import jakarta.validation.ConstraintValidatorContext
+import jakarta.validation.constraints.Min
 import kotlin.reflect.KClass
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean

clouddriver-event/src/main/kotlin/com/netflix/spinnaker/clouddriver/event/persistence/EventRepository.kt

@@ -17,8 +17,8 @@ package com.netflix.spinnaker.clouddriver.event.persistence
 
 import com.netflix.spinnaker.clouddriver.event.Aggregate
 import com.netflix.spinnaker.clouddriver.event.SpinnakerEvent
-import javax.validation.constraints.Max
-import javax.validation.constraints.Positive
+import jakarta.validation.constraints.Max
+import jakarta.validation.constraints.Positive
 
 /**
  * The [EventRepository] is responsible for reading and writing immutable event logs from a persistent store.

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/GoogleExecutor.groovy

@@ -23,7 +23,7 @@ import com.netflix.spinnaker.clouddriver.google.batch.GoogleBatchRequest
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
-import javax.annotation.PostConstruct
+import jakarta.annotation.PostConstruct
 import java.util.concurrent.TimeUnit
 
 /**

clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java

@@ -30,6 +30,7 @@
 import com.netflix.spinnaker.clouddriver.google.GoogleCloudProvider;
 import com.netflix.spinnaker.clouddriver.google.cache.Keys;
 import groovy.util.logging.Slf4j;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupControllerSpec.groovy

@@ -20,7 +20,7 @@ import com.google.api.services.compute.model.Image
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequest
 
 class GoogleNamedImageLookupControllerSpec extends Specification {
   void "should extract tags from query parameters"() {