Skip to content

Commit eafc626

Browse files
committed
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 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`.
1 parent 0aa2c9b commit eafc626

File tree

13 files changed

+22
-22
lines changed

13 files changed

+22
-22
lines changed

fiat-api/fiat-api.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation "com.squareup.retrofit2:converter-jackson"
3434
implementation "org.apache.commons:commons-lang3"
3535

36-
compileOnly "javax.servlet:javax.servlet-api"
36+
compileOnly "jakarta.servlet:jakarta.servlet-api"
3737

3838
implementation "com.github.ben-manes.caffeine:caffeine"
3939

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/AuthenticatedRequestAuthenticationConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.netflix.spinnaker.fiat.shared;
1818

1919
import com.netflix.spinnaker.security.AuthenticatedRequest;
20+
import jakarta.servlet.http.HttpServletRequest;
2021
import java.util.List;
21-
import javax.servlet.http.HttpServletRequest;
2222
import org.springframework.security.authentication.AnonymousAuthenticationToken;
2323
import org.springframework.security.core.Authentication;
2424
import org.springframework.security.core.authority.AuthorityUtils;

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAccessDeniedExceptionHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
import com.netflix.spinnaker.kork.api.exceptions.AccessDeniedDetails;
2020
import com.netflix.spinnaker.kork.web.exceptions.ExceptionMessageDecorator;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2123
import java.io.IOException;
2224
import java.util.Map;
2325
import java.util.StringJoiner;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828
import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAuthenticationConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.netflix.spinnaker.fiat.model.SpinnakerAuthorities;
2020
import com.netflix.spinnaker.fiat.model.UserPermission;
2121
import com.netflix.spinnaker.kork.common.Header;
22+
import jakarta.servlet.http.HttpServletRequest;
2223
import java.util.List;
23-
import javax.servlet.http.HttpServletRequest;
2424
import lombok.RequiredArgsConstructor;
2525
import org.springframework.security.authentication.AnonymousAuthenticationToken;
2626
import org.springframework.security.core.Authentication;

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAuthenticationFilter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package com.netflix.spinnaker.fiat.shared;
1818

19+
import jakarta.servlet.FilterChain;
20+
import jakarta.servlet.ServletException;
21+
import jakarta.servlet.http.HttpFilter;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
1924
import java.io.IOException;
20-
import javax.servlet.FilterChain;
21-
import javax.servlet.ServletException;
22-
import javax.servlet.http.HttpFilter;
23-
import javax.servlet.http.HttpServletRequest;
24-
import javax.servlet.http.HttpServletResponse;
2525
import lombok.extern.slf4j.Slf4j;
2626
import org.springframework.security.core.Authentication;
2727
import org.springframework.security.core.context.SecurityContext;

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/HeadersRedactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package com.netflix.spinnaker.fiat.shared;
1818

19+
import jakarta.servlet.http.HttpServletRequest;
1920
import java.util.Enumeration;
2021
import java.util.HashMap;
2122
import java.util.Map;
22-
import javax.servlet.http.HttpServletRequest;
2323

2424
class HeadersRedactor {
2525

fiat-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatAccessDeniedExceptionHandlerSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import spock.lang.Subject
3232
import org.springframework.security.access.AccessDeniedException
3333
import spock.lang.Unroll
3434

35-
import javax.servlet.http.HttpServletRequest
36-
import javax.servlet.http.HttpServletResponse
35+
import jakarta.servlet.http.HttpServletRequest
36+
import jakarta.servlet.http.HttpServletResponse
3737

3838
class FiatAccessDeniedExceptionHandlerSpec extends FiatSharedSpecification {
3939

fiat-github/fiat-github.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ dependencies {
88
implementation "com.squareup.retrofit2:converter-jackson"
99
implementation "io.spinnaker.kork:kork-web"
1010
implementation "io.spinnaker.kork:kork-retrofit"
11-
implementation "javax.validation:validation-api"
11+
implementation "jakarta.validation:jakarta.validation-api"
1212
}

fiat-github/src/main/java/com/netflix/spinnaker/fiat/roles/github/GitHubProperties.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.netflix.spinnaker.fiat.roles.github;
22

3-
import javax.validation.constraints.Max;
4-
import javax.validation.constraints.Min;
5-
import javax.validation.constraints.NotEmpty;
6-
import javax.validation.constraints.NotNull;
3+
import jakarta.validation.constraints.Max;
4+
import jakarta.validation.constraints.Min;
5+
import jakarta.validation.constraints.NotEmpty;
6+
import jakarta.validation.constraints.NotNull;
77
import lombok.Data;
88
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
99
import org.springframework.boot.context.properties.ConfigurationProperties;

fiat-sql/src/main/kotlin/com/netflix/spinnaker/fiat/permissions/SqlPermissionsRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import java.time.Clock
4646
import java.time.Duration
4747
import java.util.*
4848
import java.util.concurrent.atomic.AtomicReference
49-
import javax.annotation.PreDestroy
49+
import jakarta.annotation.PreDestroy
5050
import kotlin.contracts.ExperimentalContracts
5151
import kotlin.contracts.contract
5252
import kotlin.coroutines.CoroutineContext

fiat-web/src/main/java/com/netflix/spinnaker/fiat/controllers/AuthorizeController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
3232
import com.netflix.spinnaker.security.AuthenticatedRequest;
3333
import io.swagger.v3.oas.annotations.Operation;
34+
import jakarta.servlet.http.HttpServletResponse;
3435
import java.io.IOException;
3536
import java.util.*;
3637
import java.util.function.Supplier;
3738
import java.util.stream.Collectors;
3839
import javax.annotation.Nonnull;
39-
import javax.servlet.http.HttpServletResponse;
4040
import lombok.extern.slf4j.Slf4j;
4141
import lombok.val;
4242
import org.springframework.beans.factory.annotation.Autowired;

fiat-web/src/main/java/com/netflix/spinnaker/fiat/controllers/RolesController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import com.netflix.spinnaker.fiat.permissions.PermissionsRepository;
2424
import com.netflix.spinnaker.fiat.permissions.PermissionsResolver;
2525
import com.netflix.spinnaker.fiat.roles.UserRolesSyncer;
26+
import jakarta.servlet.http.HttpServletResponse;
2627
import java.io.IOException;
2728
import java.util.List;
2829
import java.util.stream.Collectors;
29-
import javax.servlet.http.HttpServletResponse;
3030
import lombok.NonNull;
3131
import lombok.Setter;
3232
import lombok.extern.slf4j.Slf4j;

fiat-web/src/test/groovy/com/netflix/spinnaker/fiat/controllers/AuthorizeControllerSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import spock.lang.Shared
4949
import spock.lang.Specification
5050
import spock.lang.Unroll
5151

52-
import javax.servlet.http.HttpServletResponse
52+
import jakarta.servlet.http.HttpServletResponse
5353

5454
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
5555
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content

0 commit comments

Comments
 (0)