Skip to content

Commit 0f831b1

Browse files
jgrandjajgrandja
committed
Update packages from javax to jakarta
Issue spring-projectsgh-838
1 parent d67b8d5 commit 0f831b1

File tree

47 files changed

+140
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+140
-140
lines changed

‎docs/src/docs/asciidoc/examples/src/main/java/sample/jpa/entity/authorization/Authorization.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
1717

1818
import java.time.Instant;
1919

20-
import javax.persistence.Column;
21-
import javax.persistence.Entity;
22-
import javax.persistence.Id;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.Entity;
22+
import jakarta.persistence.Id;
23+
import jakarta.persistence.Table;
2424

2525
@Entity
2626
@Table(name = "`authorization`")

‎docs/src/docs/asciidoc/examples/src/main/java/sample/jpa/entity/authorizationConsent/AuthorizationConsent.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
1818
import java.io.Serializable;
1919
import java.util.Objects;
2020

21-
import javax.persistence.Column;
22-
import javax.persistence.Entity;
23-
import javax.persistence.Id;
24-
import javax.persistence.IdClass;
25-
import javax.persistence.Table;
21+
import jakarta.persistence.Column;
22+
import jakarta.persistence.Entity;
23+
import jakarta.persistence.Id;
24+
import jakarta.persistence.IdClass;
25+
import jakarta.persistence.Table;
2626

2727
@Entity
2828
@Table(name = "`authorizationConsent`")

‎docs/src/docs/asciidoc/examples/src/main/java/sample/jpa/entity/client/Client.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
1717

1818
import java.time.Instant;
1919

20-
import javax.persistence.Column;
21-
import javax.persistence.Entity;
22-
import javax.persistence.Id;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.Entity;
22+
import jakarta.persistence.Id;
23+
import jakarta.persistence.Table;
2424

2525
@Entity
2626
@Table(name = "`client`")

‎docs/src/docs/asciidoc/examples/src/test/java/sample/test/SpringTestContext.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import javax.servlet.Filter;
23-
import javax.servlet.FilterChain;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.Filter;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
2828
import org.springframework.mock.web.MockServletConfig;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.ArrayList;
1919
import java.util.List;
2020

21-
import javax.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletRequest;
2222

2323
import org.springframework.http.HttpMethod;
2424
import org.springframework.security.authentication.AuthenticationManager;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientAuthenticationConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.ArrayList;
1919
import java.util.List;
2020

21-
import javax.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletRequest;
2222

2323
import org.springframework.http.HttpMethod;
2424
import org.springframework.security.authentication.AuthenticationManager;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenEndpointConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.LinkedList;
2020
import java.util.List;
2121

22-
import javax.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
2323

2424
import org.springframework.http.HttpMethod;
2525
import org.springframework.security.authentication.AuthenticationManager;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionEndpointConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.LinkedList;
2020
import java.util.List;
2121

22-
import javax.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
2323

2424
import org.springframework.http.HttpMethod;
2525
import org.springframework.security.authentication.AuthenticationManager;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationEndpointConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.LinkedList;
2020
import java.util.List;
2121

22-
import javax.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
2323

2424
import org.springframework.http.HttpMethod;
2525
import org.springframework.security.authentication.AuthenticationManager;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import java.io.IOException;
1919

20-
import javax.servlet.FilterChain;
21-
import javax.servlet.ServletException;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
2424

2525
import org.springframework.http.HttpMethod;
2626
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import java.util.List;
2020
import java.util.function.Consumer;
2121

22-
import javax.servlet.FilterChain;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.springframework.http.HttpMethod;
2828
import org.springframework.http.MediaType;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import java.io.IOException;
1919

20-
import javax.servlet.FilterChain;
21-
import javax.servlet.ServletException;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
2424

2525
import org.springframework.http.HttpMethod;
2626
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
1818
import java.io.IOException;
1919
import java.io.Writer;
2020

21-
import javax.servlet.FilterChain;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.http.HttpServletRequest;
24-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.FilterChain;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.http.HttpServletRequest;
24+
import jakarta.servlet.http.HttpServletResponse;
2525

2626
import com.nimbusds.jose.jwk.JWKMatcher;
2727
import com.nimbusds.jose.jwk.JWKSelector;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import java.util.HashSet;
2121
import java.util.Set;
2222

23-
import javax.servlet.FilterChain;
24-
import javax.servlet.ServletException;
25-
import javax.servlet.http.HttpServletRequest;
26-
import javax.servlet.http.HttpServletResponse;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.ServletException;
25+
import jakarta.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
import org.springframework.http.HttpMethod;
2929
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import java.util.List;
2020
import java.util.function.Consumer;
2121

22-
import javax.servlet.FilterChain;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.springframework.http.HttpMethod;
2828
import org.springframework.http.MediaType;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import java.io.IOException;
1919
import java.util.Arrays;
2020

21-
import javax.servlet.FilterChain;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.http.HttpServletRequest;
24-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.FilterChain;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.http.HttpServletRequest;
24+
import jakarta.servlet.http.HttpServletResponse;
2525

2626
import org.springframework.http.HttpStatus;
2727
import org.springframework.http.converter.HttpMessageConverter;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2EndpointUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717

1818
import java.util.Map;
1919

20-
import javax.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletRequest;
2121

2222
import org.springframework.util.LinkedMultiValueMap;
2323
import org.springframework.util.MultiValueMap;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import java.util.Arrays;
2121
import java.util.Map;
2222

23-
import javax.servlet.FilterChain;
24-
import javax.servlet.ServletException;
25-
import javax.servlet.http.HttpServletRequest;
26-
import javax.servlet.http.HttpServletResponse;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.ServletException;
25+
import jakarta.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
import org.springframework.http.HttpMethod;
2929
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22-
import javax.servlet.FilterChain;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.springframework.http.HttpMethod;
2828
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import java.io.IOException;
1919

20-
import javax.servlet.FilterChain;
21-
import javax.servlet.ServletException;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
2424

2525
import org.springframework.http.HttpMethod;
2626
import org.springframework.http.HttpStatus;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/ProviderContextFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import java.io.IOException;
1919

20-
import javax.servlet.FilterChain;
21-
import javax.servlet.ServletException;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
2424

2525
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
2626
import org.springframework.security.oauth2.server.authorization.context.ProviderContextHolder;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretBasicAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import java.nio.charset.StandardCharsets;
2020
import java.util.Base64;
2121

22-
import javax.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
2323

2424
import org.springframework.http.HttpHeaders;
2525
import org.springframework.lang.Nullable;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretPostAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717

1818
import java.util.Map;
1919

20-
import javax.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletRequest;
2121

2222
import org.springframework.lang.Nullable;
2323
import org.springframework.security.core.Authentication;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/DelegatingAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import java.util.LinkedList;
2020
import java.util.List;
2121

22-
import javax.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
2323

2424
import org.springframework.lang.Nullable;
2525
import org.springframework.security.core.Authentication;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/JwtClientAssertionAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717

1818
import java.util.Map;
1919

20-
import javax.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletRequest;
2121

2222
import org.springframework.lang.Nullable;
2323
import org.springframework.security.core.Authentication;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
1818
import java.util.HashMap;
1919
import java.util.Map;
2020

21-
import javax.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletRequest;
2222

2323
import org.springframework.lang.Nullable;
2424
import org.springframework.security.core.Authentication;

0 commit comments

Comments
 (0)