File tree Expand file tree Collapse file tree 13 files changed +22
-22
lines changed
main/java/com/netflix/spinnaker/fiat/shared
test/groovy/com/netflix/spinnaker/fiat/shared
src/main/java/com/netflix/spinnaker/fiat/roles/github
fiat-sql/src/main/kotlin/com/netflix/spinnaker/fiat/permissions
main/java/com/netflix/spinnaker/fiat/controllers
test/groovy/com/netflix/spinnaker/fiat/controllers Expand file tree Collapse file tree 13 files changed +22
-22
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ dependencies {
33
33
implementation " com.squareup.retrofit2:converter-jackson"
34
34
implementation " org.apache.commons:commons-lang3"
35
35
36
- compileOnly " javax .servlet:javax .servlet-api"
36
+ compileOnly " jakarta .servlet:jakarta .servlet-api"
37
37
38
38
implementation " com.github.ben-manes.caffeine:caffeine"
39
39
Original file line number Diff line number Diff line change 17
17
package com .netflix .spinnaker .fiat .shared ;
18
18
19
19
import com .netflix .spinnaker .security .AuthenticatedRequest ;
20
+ import jakarta .servlet .http .HttpServletRequest ;
20
21
import java .util .List ;
21
- import javax .servlet .http .HttpServletRequest ;
22
22
import org .springframework .security .authentication .AnonymousAuthenticationToken ;
23
23
import org .springframework .security .core .Authentication ;
24
24
import org .springframework .security .core .authority .AuthorityUtils ;
Original file line number Diff line number Diff line change 18
18
19
19
import com .netflix .spinnaker .kork .api .exceptions .AccessDeniedDetails ;
20
20
import com .netflix .spinnaker .kork .web .exceptions .ExceptionMessageDecorator ;
21
+ import jakarta .servlet .http .HttpServletRequest ;
22
+ import jakarta .servlet .http .HttpServletResponse ;
21
23
import java .io .IOException ;
22
24
import java .util .Map ;
23
25
import java .util .StringJoiner ;
24
- import javax .servlet .http .HttpServletRequest ;
25
- import javax .servlet .http .HttpServletResponse ;
26
26
import org .slf4j .Logger ;
27
27
import org .slf4j .LoggerFactory ;
28
28
import org .springframework .boot .web .servlet .error .DefaultErrorAttributes ;
Original file line number Diff line number Diff line change 19
19
import com .netflix .spinnaker .fiat .model .SpinnakerAuthorities ;
20
20
import com .netflix .spinnaker .fiat .model .UserPermission ;
21
21
import com .netflix .spinnaker .kork .common .Header ;
22
+ import jakarta .servlet .http .HttpServletRequest ;
22
23
import java .util .List ;
23
- import javax .servlet .http .HttpServletRequest ;
24
24
import lombok .RequiredArgsConstructor ;
25
25
import org .springframework .security .authentication .AnonymousAuthenticationToken ;
26
26
import org .springframework .security .core .Authentication ;
Original file line number Diff line number Diff line change 16
16
17
17
package com .netflix .spinnaker .fiat .shared ;
18
18
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 ;
19
24
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 ;
25
25
import lombok .extern .slf4j .Slf4j ;
26
26
import org .springframework .security .core .Authentication ;
27
27
import org .springframework .security .core .context .SecurityContext ;
Original file line number Diff line number Diff line change 16
16
17
17
package com .netflix .spinnaker .fiat .shared ;
18
18
19
+ import jakarta .servlet .http .HttpServletRequest ;
19
20
import java .util .Enumeration ;
20
21
import java .util .HashMap ;
21
22
import java .util .Map ;
22
- import javax .servlet .http .HttpServletRequest ;
23
23
24
24
class HeadersRedactor {
25
25
Original file line number Diff line number Diff line change @@ -32,8 +32,8 @@ import spock.lang.Subject
32
32
import org.springframework.security.access.AccessDeniedException
33
33
import spock.lang.Unroll
34
34
35
- import javax .servlet.http.HttpServletRequest
36
- import javax .servlet.http.HttpServletResponse
35
+ import jakarta .servlet.http.HttpServletRequest
36
+ import jakarta .servlet.http.HttpServletResponse
37
37
38
38
class FiatAccessDeniedExceptionHandlerSpec extends FiatSharedSpecification {
39
39
Original file line number Diff line number Diff line change @@ -8,5 +8,5 @@ dependencies {
8
8
implementation " com.squareup.retrofit2:converter-jackson"
9
9
implementation " io.spinnaker.kork:kork-web"
10
10
implementation " io.spinnaker.kork:kork-retrofit"
11
- implementation " javax .validation:validation-api"
11
+ implementation " jakarta .validation:jakarta. validation-api"
12
12
}
Original file line number Diff line number Diff line change 1
1
package com .netflix .spinnaker .fiat .roles .github ;
2
2
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 ;
7
7
import lombok .Data ;
8
8
import org .springframework .boot .autoconfigure .condition .ConditionalOnProperty ;
9
9
import org .springframework .boot .context .properties .ConfigurationProperties ;
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ import java.time.Clock
46
46
import java.time.Duration
47
47
import java.util.*
48
48
import java.util.concurrent.atomic.AtomicReference
49
- import javax .annotation.PreDestroy
49
+ import jakarta .annotation.PreDestroy
50
50
import kotlin.contracts.ExperimentalContracts
51
51
import kotlin.contracts.contract
52
52
import kotlin.coroutines.CoroutineContext
Original file line number Diff line number Diff line change 31
31
import com .netflix .spinnaker .kork .web .exceptions .NotFoundException ;
32
32
import com .netflix .spinnaker .security .AuthenticatedRequest ;
33
33
import io .swagger .v3 .oas .annotations .Operation ;
34
+ import jakarta .servlet .http .HttpServletResponse ;
34
35
import java .io .IOException ;
35
36
import java .util .*;
36
37
import java .util .function .Supplier ;
37
38
import java .util .stream .Collectors ;
38
39
import javax .annotation .Nonnull ;
39
- import javax .servlet .http .HttpServletResponse ;
40
40
import lombok .extern .slf4j .Slf4j ;
41
41
import lombok .val ;
42
42
import org .springframework .beans .factory .annotation .Autowired ;
Original file line number Diff line number Diff line change 23
23
import com .netflix .spinnaker .fiat .permissions .PermissionsRepository ;
24
24
import com .netflix .spinnaker .fiat .permissions .PermissionsResolver ;
25
25
import com .netflix .spinnaker .fiat .roles .UserRolesSyncer ;
26
+ import jakarta .servlet .http .HttpServletResponse ;
26
27
import java .io .IOException ;
27
28
import java .util .List ;
28
29
import java .util .stream .Collectors ;
29
- import javax .servlet .http .HttpServletResponse ;
30
30
import lombok .NonNull ;
31
31
import lombok .Setter ;
32
32
import lombok .extern .slf4j .Slf4j ;
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ import spock.lang.Shared
49
49
import spock.lang.Specification
50
50
import spock.lang.Unroll
51
51
52
- import javax .servlet.http.HttpServletResponse
52
+ import jakarta .servlet.http.HttpServletResponse
53
53
54
54
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
55
55
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
You can’t perform that action at this time.
0 commit comments