Move Dsl files to annotation Package

Closes gh-10333
spring-projects · Nov 19, 2021 · 4f186f2 · 4f186f2
1 parent 0d8450a
commit 4f186f2
Show file tree

Hide file tree

Showing 84 changed files with 112 additions and 112 deletions.
diff --git a/.../web/servlet/AbstractRequestMatcherDsl.kt → ...notation/web/AbstractRequestMatcherDsl.kt b/.../web/servlet/AbstractRequestMatcherDsl.kt → ...notation/web/AbstractRequestMatcherDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.http.HttpMethod
 import org.springframework.security.web.util.matcher.AnyRequestMatcher

diff --git a/...curity/config/web/servlet/AnonymousDsl.kt → ...ity/config/annotation/web/AnonymousDsl.kt b/...curity/config/web/servlet/AnonymousDsl.kt → ...ity/config/annotation/web/AnonymousDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationProvider
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

diff --git a/...onfig/web/servlet/AuthorizeRequestsDsl.kt → ...ig/annotation/web/AuthorizeRequestsDsl.kt b/...onfig/web/servlet/AuthorizeRequestsDsl.kt → ...ig/annotation/web/AuthorizeRequestsDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.http.HttpMethod
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

diff --git a/...rk/security/config/web/servlet/CorsDsl.kt → ...security/config/annotation/web/CorsDsl.kt b/...rk/security/config/web/servlet/CorsDsl.kt → ...security/config/annotation/web/CorsDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.CorsConfigurer

diff --git a/...rk/security/config/web/servlet/CsrfDsl.kt → ...security/config/annotation/web/CsrfDsl.kt b/...rk/security/config/web/servlet/CsrfDsl.kt → ...security/config/annotation/web/CsrfDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer

diff --git a/...onfig/web/servlet/ExceptionHandlingDsl.kt → ...ig/annotation/web/ExceptionHandlingDsl.kt b/...onfig/web/servlet/ExceptionHandlingDsl.kt → ...ig/annotation/web/ExceptionHandlingDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.ExceptionHandlingConfigurer

diff --git a/...curity/config/web/servlet/FormLoginDsl.kt → ...ity/config/annotation/web/FormLoginDsl.kt b/...curity/config/web/servlet/FormLoginDsl.kt → ...ity/config/annotation/web/FormLoginDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationDetailsSource
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder

diff --git a/...security/config/web/servlet/HeadersDsl.kt → ...urity/config/annotation/web/HeadersDsl.kt b/...security/config/web/servlet/HeadersDsl.kt → ...urity/config/annotation/web/HeadersDsl.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer
-import org.springframework.security.config.web.servlet.headers.*
+import org.springframework.security.config.annotation.web.headers.*
 import org.springframework.security.web.header.HeaderWriter
 import org.springframework.security.web.header.writers.*
 import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter

diff --git a/...curity/config/web/servlet/HttpBasicDsl.kt → ...ity/config/annotation/web/HttpBasicDsl.kt b/...curity/config/web/servlet/HttpBasicDsl.kt → ...ity/config/annotation/web/HttpBasicDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationDetailsSource
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

diff --git a/...ity/config/web/servlet/HttpSecurityDsl.kt → .../config/annotation/web/HttpSecurityDsl.kt b/...ity/config/web/servlet/HttpSecurityDsl.kt → .../config/annotation/web/HttpSecurityDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.context.ApplicationContext
 import org.springframework.security.authentication.AuthenticationManager

diff --git a/.../security/config/web/servlet/LogoutDsl.kt → ...curity/config/annotation/web/LogoutDsl.kt b/.../security/config/web/servlet/LogoutDsl.kt → ...curity/config/annotation/web/LogoutDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.LogoutConfigurer

diff --git a/...ity/config/web/servlet/OAuth2ClientDsl.kt → .../config/annotation/web/OAuth2ClientDsl.kt b/...ity/config/web/servlet/OAuth2ClientDsl.kt → .../config/annotation/web/OAuth2ClientDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 /*
  * Copyright 2002-2020 the original author or authors.
@@ -33,8 +33,8 @@ package org.springframework.security.config.web.servlet
  */
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.web.servlet.oauth2.client.AuthorizationCodeGrantDsl
-import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl
+import org.springframework.security.config.annotation.web.oauth2.client.AuthorizationCodeGrantDsl
+import org.springframework.security.config.annotation.web.oauth2.login.AuthorizationEndpointDsl
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2ClientConfigurer
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository

diff --git a/...rity/config/web/servlet/OAuth2LoginDsl.kt → ...y/config/annotation/web/OAuth2LoginDsl.kt b/...rity/config/web/servlet/OAuth2LoginDsl.kt → ...y/config/annotation/web/OAuth2LoginDsl.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationDetailsSource
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.RedirectionEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.TokenEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.UserInfoEndpointDsl
+import org.springframework.security.config.annotation.web.oauth2.login.AuthorizationEndpointDsl
+import org.springframework.security.config.annotation.web.oauth2.login.RedirectionEndpointDsl
+import org.springframework.security.config.annotation.web.oauth2.login.TokenEndpointDsl
+import org.springframework.security.config.annotation.web.oauth2.login.UserInfoEndpointDsl
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository

diff --git a/...ig/web/servlet/OAuth2ResourceServerDsl.kt → ...annotation/web/OAuth2ResourceServerDsl.kt b/...ig/web/servlet/OAuth2ResourceServerDsl.kt → ...annotation/web/OAuth2ResourceServerDsl.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationManagerResolver
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.web.servlet.oauth2.resourceserver.JwtDsl
-import org.springframework.security.config.web.servlet.oauth2.resourceserver.OpaqueTokenDsl
+import org.springframework.security.config.annotation.web.oauth2.resourceserver.JwtDsl
+import org.springframework.security.config.annotation.web.oauth2.resourceserver.OpaqueTokenDsl
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer
 import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver
 import org.springframework.security.web.AuthenticationEntryPoint

diff --git a/...nfig/web/servlet/PasswordManagementDsl.kt → ...g/annotation/web/PasswordManagementDsl.kt b/...nfig/web/servlet/PasswordManagementDsl.kt → ...g/annotation/web/PasswordManagementDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.PasswordManagementConfigurer

diff --git a/...urity/config/web/servlet/PortMapperDsl.kt → ...ty/config/annotation/web/PortMapperDsl.kt b/...urity/config/web/servlet/PortMapperDsl.kt → ...ty/config/annotation/web/PortMapperDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.PortMapperConfigurer

diff --git a/...urity/config/web/servlet/RememberMeDsl.kt → ...ty/config/annotation/web/RememberMeDsl.kt b/...urity/config/web/servlet/RememberMeDsl.kt → ...ty/config/annotation/web/RememberMeDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.RememberMeConfigurer

diff --git a/...ity/config/web/servlet/RequestCacheDsl.kt → .../config/annotation/web/RequestCacheDsl.kt b/...ity/config/web/servlet/RequestCacheDsl.kt → .../config/annotation/web/RequestCacheDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.RequestCacheConfigurer

diff --git a/.../config/web/servlet/RequiresChannelDsl.kt → ...nfig/annotation/web/RequiresChannelDsl.kt b/.../config/web/servlet/RequiresChannelDsl.kt → ...nfig/annotation/web/RequiresChannelDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.ChannelSecurityConfigurer

diff --git a/...k/security/config/web/servlet/Saml2Dsl.kt → ...ecurity/config/annotation/web/Saml2Dsl.kt b/...k/security/config/web/servlet/Saml2Dsl.kt → ...ecurity/config/annotation/web/Saml2Dsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder

diff --git a/...rity/config/web/servlet/SecurityMarker.kt → ...y/config/annotation/web/SecurityMarker.kt b/...rity/config/web/servlet/SecurityMarker.kt → ...y/config/annotation/web/SecurityMarker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 /**
  * Marker annotation indicating that the annotated class is part of the security DSL.

diff --git a/...onfig/web/servlet/SessionManagementDsl.kt → ...ig/annotation/web/SessionManagementDsl.kt b/...onfig/web/servlet/SessionManagementDsl.kt → ...ig/annotation/web/SessionManagementDsl.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.web.servlet.session.SessionConcurrencyDsl
-import org.springframework.security.config.web.servlet.session.SessionFixationDsl
+import org.springframework.security.config.annotation.web.session.SessionConcurrencyDsl
+import org.springframework.security.config.annotation.web.session.SessionFixationDsl
 import org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer
 import org.springframework.security.config.http.SessionCreationPolicy
 import org.springframework.security.web.authentication.AuthenticationFailureHandler

diff --git a/...rk/security/config/web/servlet/X509Dsl.kt → ...security/config/annotation/web/X509Dsl.kt b/...rk/security/config/web/servlet/X509Dsl.kt → ...security/config/annotation/web/X509Dsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet
+package org.springframework.security.config.annotation.web
 
 import org.springframework.security.authentication.AuthenticationDetailsSource
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

diff --git a/...ig/web/servlet/headers/CacheControlDsl.kt → ...annotation/web/headers/CacheControlDsl.kt b/...ig/web/servlet/headers/CacheControlDsl.kt → ...annotation/web/headers/CacheControlDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...rvlet/headers/ContentSecurityPolicyDsl.kt → ...n/web/headers/ContentSecurityPolicyDsl.kt b/...rvlet/headers/ContentSecurityPolicyDsl.kt → ...n/web/headers/ContentSecurityPolicyDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/.../servlet/headers/ContentTypeOptionsDsl.kt → ...tion/web/headers/ContentTypeOptionsDsl.kt b/.../servlet/headers/ContentTypeOptionsDsl.kt → ...tion/web/headers/ContentTypeOptionsDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...ig/web/servlet/headers/FrameOptionsDsl.kt → ...annotation/web/headers/FrameOptionsDsl.kt b/...ig/web/servlet/headers/FrameOptionsDsl.kt → ...annotation/web/headers/FrameOptionsDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/.../servlet/headers/HeadersSecurityMarker.kt → ...tion/web/headers/HeadersSecurityMarker.kt b/.../servlet/headers/HeadersSecurityMarker.kt → ...tion/web/headers/HeadersSecurityMarker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 /**
  * Marker annotation indicating that the annotated class is part of the headers security DSL.

diff --git a/...ervlet/headers/HttpPublicKeyPinningDsl.kt → ...on/web/headers/HttpPublicKeyPinningDsl.kt b/...ervlet/headers/HttpPublicKeyPinningDsl.kt → ...on/web/headers/HttpPublicKeyPinningDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...headers/HttpStrictTransportSecurityDsl.kt → ...headers/HttpStrictTransportSecurityDsl.kt b/...headers/HttpStrictTransportSecurityDsl.kt → ...headers/HttpStrictTransportSecurityDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...b/servlet/headers/PermissionsPolicyDsl.kt → ...ation/web/headers/PermissionsPolicyDsl.kt b/...b/servlet/headers/PermissionsPolicyDsl.kt → ...ation/web/headers/PermissionsPolicyDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/.../web/servlet/headers/ReferrerPolicyDsl.kt → ...notation/web/headers/ReferrerPolicyDsl.kt b/.../web/servlet/headers/ReferrerPolicyDsl.kt → ...notation/web/headers/ReferrerPolicyDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...servlet/headers/XssProtectionConfigDsl.kt → ...ion/web/headers/XssProtectionConfigDsl.kt b/...servlet/headers/XssProtectionConfigDsl.kt → ...ion/web/headers/XssProtectionConfigDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.headers
+package org.springframework.security.config.annotation.web.headers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer

diff --git a/...auth2/client/AuthorizationCodeGrantDsl.kt → ...auth2/client/AuthorizationCodeGrantDsl.kt b/...auth2/client/AuthorizationCodeGrantDsl.kt → ...auth2/client/AuthorizationCodeGrantDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.client
+package org.springframework.security.config.annotation.web.oauth2.client
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2ClientConfigurer

diff --git a/...uth2/client/OAuth2ClientSecurityMarker.kt → ...uth2/client/OAuth2ClientSecurityMarker.kt b/...uth2/client/OAuth2ClientSecurityMarker.kt → ...uth2/client/OAuth2ClientSecurityMarker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.client
+package org.springframework.security.config.annotation.web.oauth2.client
 
 /**
  * Marker annotation indicating that the annotated class is part of the OAuth 2.0 client security DSL.

diff --git a/.../oauth2/login/AuthorizationEndpointDsl.kt → .../oauth2/login/AuthorizationEndpointDsl.kt b/.../oauth2/login/AuthorizationEndpointDsl.kt → .../oauth2/login/AuthorizationEndpointDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.login
+package org.springframework.security.config.annotation.web.oauth2.login
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer

diff --git a/...oauth2/login/OAuth2LoginSecurityMarker.kt → ...oauth2/login/OAuth2LoginSecurityMarker.kt b/...oauth2/login/OAuth2LoginSecurityMarker.kt → ...oauth2/login/OAuth2LoginSecurityMarker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.login
+package org.springframework.security.config.annotation.web.oauth2.login
 
 /**
  * Marker annotation indicating that the annotated class is part of the OAuth 2.0 login security DSL.

diff --git a/...et/oauth2/login/RedirectionEndpointDsl.kt → ...eb/oauth2/login/RedirectionEndpointDsl.kt b/...et/oauth2/login/RedirectionEndpointDsl.kt → ...eb/oauth2/login/RedirectionEndpointDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.login
+package org.springframework.security.config.annotation.web.oauth2.login
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer

diff --git a/.../servlet/oauth2/login/TokenEndpointDsl.kt → ...tion/web/oauth2/login/TokenEndpointDsl.kt b/.../servlet/oauth2/login/TokenEndpointDsl.kt → ...tion/web/oauth2/login/TokenEndpointDsl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.config.web.servlet.oauth2.login
+package org.springframework.security.config.annotation.web.oauth2.login
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer