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

Upgrading spring boot 2.7.18 to 3.0.13 and spring cloud 2021.0.8 to 2022.0.5.
Spring cloud release 2022.0.x is compatible with spring boot 3.0.x.
https://github.com/spring-cloud/spring-cloud-release/wiki/Supported-Versions#supported-releases

======================================================
refactor(dependency): replace javax with jakarta, javax.inject with jakarta.inject, rxjava with rxjava3 and add resilience4j-vavr during upgrade of spring boot 3.0.x

Spring Boot 3.0 has migrated from Java EE to Jakarta EE APIs for all dependencies.
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes#third-party-library-upgrades
So, replacing the imports with `javax` to `jakarta`.

Spring boot 3.x deprecated and removed rxjava, and rxjava3 has been added. So, update the dependency.
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Migration-Guide#rxjava

`io.vavr` dependency has been removed from resilience4j:2.0.2.
https://github.com/resilience4j/resilience4j/releases/tag/v2.0.0
Resilience4j comes as transitive dependency of spring-cloud-dependencies.
https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies/2022.0.5
So, adding explicit dependency of `resilience4j-vavr`

`javax.inject` that has been moved from present coordinate to `jakarta.inject`. So, updating the coordinates in igor-web module.
google/guice#1463
google/guice#1383
https://docs.openrewrite.org/recipes/java/migrate/jakarta/javaxinjectmigrationtojakartainject

Author: j-sandy

igor-core/igor-core.gradle

@@ -3,7 +3,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-core"
   implementation "io.spinnaker.kork:kork-jedis"
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
-  implementation "javax.validation:validation-api"
+  implementation "jakarta.validation:jakarta.validation-api"
 
   // TODO(rz): Get rid of this dependency!
   implementation "com.squareup.retrofit:retrofit"

igor-core/src/main/java/com/netflix/spinnaker/igor/artifacts/JinjaTemplateService.java

@@ -17,8 +17,8 @@
 package com.netflix.spinnaker.igor.artifacts;
 
 import com.netflix.spinnaker.igor.config.ArtifactTemplateProperties;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

igor-core/src/main/java/com/netflix/spinnaker/igor/config/ArtifactDecorationProperties.java

@@ -16,9 +16,9 @@
 
 package com.netflix.spinnaker.igor.config;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

igor-core/src/main/java/com/netflix/spinnaker/igor/config/ArtifactTemplateProperties.java

@@ -17,12 +17,12 @@
 package com.netflix.spinnaker.igor.config;
 
 import com.netflix.spinnaker.igor.artifacts.CustomJinjaTemplate;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;

igor-core/src/main/java/com/netflix/spinnaker/igor/polling/CommonPollingMonitor.java

@@ -23,6 +23,7 @@
 import com.netflix.spinnaker.kork.discovery.DiscoveryStatusListener;
 import com.netflix.spinnaker.kork.discovery.RemoteStatusChangedEvent;
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService;
+import jakarta.annotation.PreDestroy;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -32,7 +33,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nullable;
-import javax.annotation.PreDestroy;
 import net.logstash.logback.argument.StructuredArguments;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

igor-core/src/main/java/com/netflix/spinnaker/igor/service/ArtifactDecorator.java

@@ -21,12 +21,12 @@
 import com.netflix.spinnaker.igor.build.model.GenericArtifact;
 import com.netflix.spinnaker.igor.build.model.GenericBuild;
 import com.netflix.spinnaker.igor.config.ArtifactDecorationProperties;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

igor-monitor-travis/igor-monitor-travis.gradle

@@ -31,8 +31,9 @@ dependencies {
   implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "com.squareup.retrofit:converter-jackson"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "io.reactivex:rxjava" // TODO(jervi): get rid of this dependency
-  implementation "javax.validation:validation-api"
+  implementation "io.github.resilience4j:resilience4j-vavr"
+  implementation "io.reactivex.rxjava3:rxjava" // TODO(jervi): get rid of this dependency
+  implementation "jakarta.validation:jakarta.validation-api"
   implementation "javax.xml.bind:jaxb-api"
 
   testImplementation "com.squareup.okhttp3:mockwebserver"

igor-monitor-travis/src/main/java/com/netflix/spinnaker/igor/travis/config/TravisConfig.java

@@ -29,13 +29,13 @@
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

igor-monitor-travis/src/main/java/com/netflix/spinnaker/igor/travis/config/TravisProperties.java

@@ -19,11 +19,11 @@
 
 import com.netflix.spinnaker.fiat.model.resources.Permissions;
 import com.netflix.spinnaker.igor.config.BuildServerProperties;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;

igor-web/igor-web.gradle

@@ -71,8 +71,8 @@ dependencies {
     implementation "io.projectreactor:reactor-core"
     implementation "com.google.code.gson:gson"
     implementation "com.google.guava:guava"
-    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"
 
     runtimeOnly "io.spinnaker.kork:kork-runtime"
 
@@ -83,5 +83,6 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api"
     testImplementation "org.assertj:assertj-core"
 
-    testImplementation "com.github.tomakehurst:wiremock-jre8"
+    testImplementation "com.github.tomakehurst:wiremock-jre8-standalone"
+    testImplementation "com.netflix.spectator:spectator-reg-micrometer"
 }

igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy

@@ -49,7 +49,7 @@ import org.springframework.web.servlet.HandlerMapping
 import retrofit.http.Query
 
 import javax.annotation.Nullable
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequest
 
 import static net.logstash.logback.argument.StructuredArguments.kv
 import static org.springframework.http.HttpStatus.NOT_FOUND

igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/InfoController.groovy

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.servlet.HandlerMapping
 
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletRequest
 
 /**
  * A controller that provides jenkins information

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/BitBucketConfig.groovy

@@ -32,7 +32,7 @@ import retrofit.Endpoints
 import retrofit.RequestInterceptor
 import retrofit.RestAdapter
 import retrofit.converter.JacksonConverter
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 /**
  * Converts the list of BitBucket Configuration properties a collection of clients to access the BitBucket hosts

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/BitBucketProperties.groovy

@@ -20,7 +20,7 @@ import groovy.transform.CompileStatic
 import org.hibernate.validator.constraints.NotEmpty
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 /**
  * Helper class to map masters in properties file into a validated property map

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitHubConfig.groovy

@@ -33,7 +33,7 @@ import retrofit.RequestInterceptor
 import retrofit.RestAdapter
 import retrofit.converter.JacksonConverter
 
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 /**
  * Converts the list of GitHub Configuration properties a collection of clients to access the GitHub hosts

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitHubProperties.groovy

@@ -21,7 +21,7 @@ import org.hibernate.validator.constraints.NotEmpty
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 /**
  * Helper class to map masters in properties file into a validated property map

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitLabConfig.java

@@ -20,7 +20,7 @@
 import com.netflix.spinnaker.igor.scm.gitlab.client.GitLabClient;
 import com.netflix.spinnaker.igor.scm.gitlab.client.GitLabMaster;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitLabProperties.java

@@ -16,7 +16,7 @@
 
 package com.netflix.spinnaker.igor.config;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitlabCiProperties.java

@@ -16,9 +16,9 @@
 package com.netflix.spinnaker.igor.config;
 
 import com.netflix.spinnaker.fiat.model.resources.Permissions;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.Valid;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/JenkinsConfig.groovy

@@ -53,7 +53,7 @@ import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
-import javax.validation.Valid
+import jakarta.validation.Valid
 import java.security.KeyStore
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/JenkinsProperties.groovy

@@ -22,7 +22,7 @@ import org.hibernate.validator.constraints.NotEmpty
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.validation.annotation.Validated
 
-import javax.validation.Valid
+import jakarta.validation.Valid
 import java.security.KeyStore
 
 /**

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/StashConfig.groovy

@@ -33,7 +33,7 @@ import retrofit.RestAdapter
 import retrofit.converter.JacksonConverter
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 /**
  * Converts the list of Stash Configuration properties a collection of clients to access the Stash hosts

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/WerckerConfig.groovy

@@ -32,7 +32,7 @@ import retrofit.converter.JacksonConverter
 
 import java.util.concurrent.TimeUnit
 
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 import retrofit.Endpoints
 import retrofit.RestAdapter

igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/WerckerProperties.groovy

@@ -13,7 +13,7 @@ import groovy.transform.CompileStatic
 import org.hibernate.validator.constraints.NotEmpty
 import org.springframework.boot.context.properties.ConfigurationProperties
 
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 /**
  * Helper class to map masters in properties file into a validated property map

igor-web/src/main/groovy/com/netflix/spinnaker/igor/filters/IgorCorsFilter.groovy

@@ -19,13 +19,13 @@ package com.netflix.spinnaker.igor.filters
 import groovy.transform.CompileStatic
 import org.springframework.stereotype.Component
 
-import javax.servlet.Filter
-import javax.servlet.FilterChain
-import javax.servlet.FilterConfig
-import javax.servlet.ServletException
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.Filter
+import jakarta.servlet.FilterChain
+import jakarta.servlet.FilterConfig
+import jakarta.servlet.ServletException
+import jakarta.servlet.ServletRequest
+import jakarta.servlet.ServletResponse
+import jakarta.servlet.http.HttpServletResponse
 
 /**
  * A filter to enable CORS access

igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/bitbucket/client/BitBucketMaster.groovy

@@ -27,7 +27,7 @@ import retrofit.Endpoints
 import retrofit.RequestInterceptor
 import retrofit.RestAdapter
 import retrofit.converter.JacksonConverter
-import javax.validation.Valid
+import jakarta.validation.Valid
 
 /**
  * Wrapper class for a collection of BitBucket clients

igor-web/src/main/java/com/netflix/spinnaker/igor/config/ConcourseConfig.java

@@ -5,13 +5,13 @@
 import com.netflix.spinnaker.igor.concourse.service.ConcourseService;
 import com.netflix.spinnaker.igor.service.ArtifactDecorator;
 import com.netflix.spinnaker.igor.service.BuildServices;
+import jakarta.validation.Valid;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.validation.Valid;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;