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

front50-core/front50-core.gradle

@@ -24,10 +24,10 @@ dependencies {
   implementation "org.springframework.security:spring-security-web"
   implementation "io.spinnaker.kork:kork-web"
   implementation "io.spinnaker.kork:kork-retrofit"
-  implementation "io.reactivex:rxjava"
+  implementation "io.reactivex.rxjava3:rxjava"
   implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "com.squareup.retrofit:converter-jackson"
-  implementation "javax.validation:validation-api"
+  implementation "jakarta.validation:jakarta.validation-api"
   implementation "org.hibernate.validator:hibernate-validator"
   api "com.github.ben-manes.caffeine:guava"
 

front50-core/src/main/java/com/netflix/spinnaker/front50/config/CommonStorageServiceDAOConfig.java

@@ -47,12 +47,12 @@
 import com.netflix.spinnaker.front50.model.tag.DefaultEntityTagsDAO;
 import com.netflix.spinnaker.front50.model.tag.EntityTagsDAO;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.util.concurrent.Executors;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import rx.schedulers.Schedulers;
 
 @Configuration
 @ConditionalOnProperty(

front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageServiceSupport.java

@@ -32,6 +32,9 @@
 import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
 import io.github.resilience4j.core.SupplierUtils;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -49,11 +52,8 @@
 import java.util.function.Supplier;
 import java.util.function.ToDoubleFunction;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import rx.Observable;
-import rx.Scheduler;
 
 public abstract class StorageServiceSupport<T extends Timestamped> {
   private final Logger log = LoggerFactory.getLogger(getClass());
@@ -329,11 +329,11 @@ public void bulkImport(Collection<T> items) {
       return;
     }
 
-    Observable.from(items)
+    Observable.fromIterable(items)
         .buffer(10)
         .flatMap(
             itemSet ->
-                Observable.from(itemSet)
+                Observable.fromIterable(itemSet)
                     .flatMap(
                         item -> {
                           try {
@@ -352,8 +352,7 @@ public void bulkImport(Collection<T> items) {
                     .subscribeOn(scheduler))
         .subscribeOn(scheduler)
         .toList()
-        .toBlocking()
-        .single();
+        .blockingGet();
   }
 
   public void bulkDelete(Collection<String> ids) {
@@ -468,11 +467,11 @@ private Set<T> fetchAllItems(Set<T> existingItems) {
         }
       }
     } catch (UnsupportedOperationException e) {
-      Observable.from(modifiedKeys)
+      Observable.fromIterable(modifiedKeys)
           .buffer(10)
           .flatMap(
               ids ->
-                  Observable.from(ids)
+                  Observable.fromIterable(ids)
                       .flatMap(
                           entry -> {
                             try {
@@ -501,8 +500,7 @@ private Set<T> fetchAllItems(Set<T> existingItems) {
                       .subscribeOn(scheduler))
           .subscribeOn(scheduler)
           .toList()
-          .toBlocking()
-          .single()
+          .blockingGet()
           .forEach(item -> resultMap.put(buildObjectKey(item), item));
     }
 

front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationDAO.java

@@ -24,9 +24,9 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Collection;
 import java.util.Map;
-import rx.Scheduler;
 
 public class DefaultApplicationDAO extends StorageServiceSupport<Application>
     implements ApplicationDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationPermissionDAO.java

@@ -23,7 +23,7 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
-import rx.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 public class DefaultApplicationPermissionDAO extends StorageServiceSupport<Application.Permission>
     implements ApplicationPermissionDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/delivery/DefaultDeliveryRepository.java

@@ -7,11 +7,11 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.springframework.util.Assert;
-import rx.Scheduler;
 
 public class DefaultDeliveryRepository extends StorageServiceSupport<Delivery>
     implements DeliveryRepository {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/notification/DefaultNotificationDAO.java

@@ -24,7 +24,7 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
-import rx.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 public class DefaultNotificationDAO extends StorageServiceSupport<Notification>
     implements NotificationDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineDAO.java

@@ -25,14 +25,14 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
-import rx.Scheduler;
 
 public class DefaultPipelineDAO extends StorageServiceSupport<Pipeline> implements PipelineDAO {
   private static final Logger log = LoggerFactory.getLogger(DefaultPipelineDAO.class);

front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineStrategyDAO.java

@@ -25,10 +25,10 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import rx.Scheduler;
 
 public class DefaultPipelineStrategyDAO extends StorageServiceSupport<Pipeline>
     implements PipelineStrategyDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineTemplateDAO.java

@@ -22,8 +22,8 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import org.springframework.util.Assert;
-import rx.Scheduler;
 
 public class DefaultPipelineTemplateDAO extends StorageServiceSupport<PipelineTemplate>
     implements PipelineTemplateDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/DefaultPluginInfoRepository.java

@@ -24,13 +24,13 @@
 import com.netflix.spinnaker.kork.exceptions.IntegrationException;
 import com.netflix.spinnaker.kork.exceptions.UserException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.time.Instant;
 import java.time.format.DateTimeParseException;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
-import rx.Scheduler;
 
 public class DefaultPluginInfoRepository extends StorageServiceSupport<PluginInfo>
     implements PluginInfoRepository {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/DefaultPluginVersionPinningRepository.java

@@ -23,8 +23,8 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.exceptions.IntegrationException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Objects;
-import rx.Scheduler;
 
 public class DefaultPluginVersionPinningRepository
     extends StorageServiceSupport<ServerGroupPluginVersions>

front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginInfo.java

@@ -19,6 +19,7 @@
 import com.google.common.base.Splitter;
 import com.netflix.spinnaker.front50.api.model.Timestamped;
 import com.netflix.spinnaker.kork.api.plugins.remote.RemoteExtensionConfig;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +29,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
-import javax.validation.Valid;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.validator.constraints.URL;
@@ -105,7 +105,7 @@ public static class Release {
      *
      * @link https://semver.org/
      */
-    @javax.validation.constraints.Pattern(regexp = VERSION_PATTERN)
+    @jakarta.validation.constraints.Pattern(regexp = VERSION_PATTERN)
     private String version;
 
     /** The date of the plugin release. */

front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginVersionCleanupAgent.java

@@ -19,11 +19,11 @@
 
 import com.netflix.spinnaker.front50.config.PluginVersionCleanupProperties;
 import com.netflix.spinnaker.moniker.Namer;
+import jakarta.annotation.PostConstruct;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.TaskScheduler;

front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/DefaultProjectDAO.java

@@ -24,8 +24,8 @@
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.UUID;
-import rx.Scheduler;
 
 public class DefaultProjectDAO extends StorageServiceSupport<Project> implements ProjectDAO {
   public DefaultProjectDAO(

front50-core/src/main/java/com/netflix/spinnaker/front50/model/serviceaccount/DefaultServiceAccountDAO.java

@@ -23,7 +23,7 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
-import rx.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 public class DefaultServiceAccountDAO extends StorageServiceSupport<ServiceAccount>
     implements ServiceAccountDAO {

front50-core/src/main/java/com/netflix/spinnaker/front50/model/snapshot/DefaultSnapshotDAO.java

@@ -23,8 +23,8 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import org.springframework.util.Assert;
-import rx.Scheduler;
 
 public class DefaultSnapshotDAO extends StorageServiceSupport<Snapshot> implements SnapshotDAO {
   public DefaultSnapshotDAO(

front50-core/src/main/java/com/netflix/spinnaker/front50/model/tag/DefaultEntityTagsDAO.java

@@ -23,9 +23,9 @@
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import rx.Scheduler;
 
 public class DefaultEntityTagsDAO extends StorageServiceSupport<EntityTags>
     implements EntityTagsDAO {

front50-core/src/test/java/com/netflix/spinnaker/front50/model/StorageServiceSupportTest.java

@@ -27,13 +27,13 @@
 import com.netflix.spinnaker.front50.api.model.pipeline.Pipeline;
 import com.netflix.spinnaker.front50.config.StorageServiceConfigurationProperties;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
-import rx.Scheduler;
 
 class StorageServiceSupportTest {
 

front50-gcs/front50-gcs.gradle

@@ -28,7 +28,7 @@ dependencies {
   implementation "com.netflix.spectator:spectator-api"
   implementation "io.spinnaker.kork:kork-exceptions"
   implementation "io.github.resilience4j:resilience4j-circuitbreaker"
-  implementation "io.reactivex:rxjava"
+  implementation "io.reactivex.rxjava3:rxjava"
   implementation "net.logstash.logback:logstash-logback-encoder"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework:spring-beans"

front50-gcs/src/main/java/com/netflix/spinnaker/front50/config/GcsConfig.java

@@ -37,6 +37,7 @@
 import com.netflix.spinnaker.front50.model.application.ApplicationPermissionDAO;
 import com.netflix.spinnaker.front50.model.application.DefaultApplicationPermissionDAO;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Collections;
@@ -50,7 +51,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
-import rx.schedulers.Schedulers;
 
 @Configuration
 @ConditionalOnExpression("${spinnaker.gcs.enabled:false}")

front50-gcs/src/main/kotlin/com/netflix/spinnaker/front50/model/GcsStorageService.kt

@@ -39,7 +39,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Future
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
-import javax.annotation.PostConstruct
+import jakarta.annotation.PostConstruct
 
 class GcsStorageService(
   private val storage: Storage,

front50-s3/src/main/java/com/netflix/spinnaker/front50/model/EventingS3ObjectKeyLoader.java

@@ -30,6 +30,7 @@
 import com.netflix.spinnaker.front50.config.S3MetadataStorageProperties;
 import com.netflix.spinnaker.front50.model.events.S3Event;
 import com.netflix.spinnaker.front50.model.events.S3EventWrapper;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -42,7 +43,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PreDestroy;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

front50-s3/src/main/java/com/netflix/spinnaker/front50/model/TemporarySQSQueue.java

@@ -33,10 +33,10 @@
 import com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
+import jakarta.annotation.PreDestroy;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import javax.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

front50-sql/src/test/resources/application.yml

@@ -1,5 +1,7 @@
 spring:
-  profiles: default
+  config:
+    activate:
+      on-profile: default
 
 spinnaker:
   migration:

front50-test/front50-test.gradle

@@ -24,7 +24,7 @@ dependencies {
   implementation "org.spockframework:spock-core"
   implementation "com.amazonaws:aws-java-sdk-s3"
   implementation "io.spinnaker.kork:kork-sql-test"
-  implementation "io.reactivex:rxjava"
+  implementation "io.reactivex.rxjava3:rxjava"
 }
 
 tasks.compileGroovy.enabled = true

front50-test/src/main/java/com/netflix/spinnaker/front50/pipeline/SqlPipelineDAOTestConfiguration.java

@@ -27,10 +27,10 @@
 import com.netflix.spinnaker.kork.sql.config.SqlRetryProperties;
 import com.netflix.spinnaker.kork.sql.test.SqlTestUtil;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.time.Clock;
 import java.util.concurrent.Executors;
-import rx.Scheduler;
-import rx.schedulers.Schedulers;
 
 public class SqlPipelineDAOTestConfiguration {