Update to @since 7.0

Issue gh-17880
2026-08-04 09:17:02 +00:00 · 2025-09-09 11:44:44 -04:00
parent e99ea033c5
commit 592510c725
200 changed files with 200 additions and 355 deletions
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
 *
 * @author Daniel Garnier-Moiroux
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see OAuth2AuthorizationServerMetadataClaimAccessor
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc8414#section-3.2">3.2.
 * Authorization Server Metadata Response</a>
@@ -130,7 +130,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * @param pushedAuthorizationRequestEndpoint the {@code URL} of the OAuth 2.0
 		 * Pushed Authorization Request Endpoint
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 1.5
 		 */
 		public B pushedAuthorizationRequestEndpoint(String pushedAuthorizationRequestEndpoint) {
 			return claim(OAuth2AuthorizationServerMetadataClaimNames.PUSHED_AUTHORIZATION_REQUEST_ENDPOINT,
@@ -143,7 +142,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * @param deviceAuthorizationEndpoint the {@code URL} of the OAuth 2.0 Device
 		 * Authorization Endpoint
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 1.1
 		 */
 		public B deviceAuthorizationEndpoint(String deviceAuthorizationEndpoint) {
 			return claim(OAuth2AuthorizationServerMetadataClaimNames.DEVICE_AUTHORIZATION_ENDPOINT,
@@ -355,7 +353,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * @param clientRegistrationEndpoint the {@code URL} of the OAuth 2.0 Dynamic
 		 * Client Registration Endpoint
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 0.4.0
 		 */
 		public B clientRegistrationEndpoint(String clientRegistrationEndpoint) {
 			return claim(OAuth2AuthorizationServerMetadataClaimNames.REGISTRATION_ENDPOINT, clientRegistrationEndpoint);
@@ -394,7 +391,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * @param tlsClientCertificateBoundAccessTokens {@code true} to indicate support
 		 * for mutual-TLS client certificate-bound access tokens
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 1.3
 		 */
 		public B tlsClientCertificateBoundAccessTokens(boolean tlsClientCertificateBoundAccessTokens) {
 			return claim(OAuth2AuthorizationServerMetadataClaimNames.TLS_CLIENT_CERTIFICATE_BOUND_ACCESS_TOKENS,
@@ -408,7 +404,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * @param dPoPSigningAlgorithm the {@link JwsAlgorithms JSON Web Signature (JWS)
 		 * algorithm} supported for DPoP Proof JWTs
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 1.5
 		 */
 		public B dPoPSigningAlgorithm(String dPoPSigningAlgorithm) {
 			addClaimToClaimList(OAuth2AuthorizationServerMetadataClaimNames.DPOP_SIGNING_ALG_VALUES_SUPPORTED,
@@ -424,7 +419,6 @@ public abstract class AbstractOAuth2AuthorizationServerMetadata
 		 * {@link JwsAlgorithms JSON Web Signature (JWS) algorithms} supported for DPoP
 		 * Proof JWTs
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 1.5
 		 */
 		public B dPoPSigningAlgorithms(Consumer<List<String>> dPoPSigningAlgorithmsConsumer) {
 			acceptClaimValues(OAuth2AuthorizationServerMetadataClaimNames.DPOP_SIGNING_ALG_VALUES_SUPPORTED,
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
 * <b>NOTE:</b> This implementation should ONLY be used during development/testing.
 *
 * @author Daniel Garnier-Moiroux
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationConsentService
 */
 public final class InMemoryOAuth2AuthorizationConsentService implements OAuth2AuthorizationConsentService {
@@ -42,7 +42,7 @@ import org.springframework.util.Assert;
 *
 * @author Krisztian Toth
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2AuthorizationService
 */
 public final class InMemoryOAuth2AuthorizationService implements OAuth2AuthorizationService {
@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Ovidiu Popa
 * @author Josh Long
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationConsentService
 * @see OAuth2AuthorizationConsent
 * @see JdbcOperations
@@ -90,7 +90,7 @@ import org.springframework.util.StringUtils;
 * @author Ovidiu Popa
 * @author Joe Grandja
 * @author Josh Long
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationService
 * @see OAuth2Authorization
 * @see JdbcOperations
@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Joe Grandja
 * @author Krisztian Toth
- * @since 0.0.1
+ * @since 7.0
 * @see RegisteredClient
 * @see AuthorizationGrantType
 * @see OAuth2Token
@@ -111,7 +111,6 @@ public class OAuth2Authorization implements Serializable {
 	/**
 	 * Returns the authorized scope(s).
 	 * @return the {@code Set} of authorized scope(s)
-	 * @since 0.4.0
 	 */
 	public Set<String> getAuthorizedScopes() {
 		return this.authorizedScopes;
@@ -244,7 +243,6 @@ public class OAuth2Authorization implements Serializable {
 	 *
 	 * @param <T> the type of the {@link OAuth2Token}
 	 * @author Joe Grandja
-	 * @since 0.1.0
 	 */
 	public static class Token<T extends OAuth2Token> implements Serializable {

@@ -436,7 +434,6 @@ public class OAuth2Authorization implements Serializable {
 		 * Sets the authorized scope(s).
 		 * @param authorizedScopes the {@code Set} of authorized scope(s)
 		 * @return the {@link Builder}
-		 * @since 0.4.0
 		 */
 		public Builder authorizedScopes(Set<String> authorizedScopes) {
 			this.authorizedScopes = authorizedScopes;
@@ -497,7 +494,6 @@ public class OAuth2Authorization implements Serializable {
 		 * @param token the token
 		 * @param <T> the type of the token
 		 * @return the {@link Builder}
-		 * @since 1.4
 		 */
 		public <T extends OAuth2Token> Builder invalidate(T token) {
 			Assert.notNull(token, "token cannot be null");
@@ -25,7 +25,7 @@ import org.springframework.security.oauth2.core.AbstractOAuth2Token;
 * Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 0.0.3
+ * @since 7.0
 * @see AbstractOAuth2Token
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc6749#section-4.1">Section
 * 4.1 Authorization Code Grant</a>
@@ -43,7 +43,7 @@ import org.springframework.util.CollectionUtils;
 * The resource owner then selects which scopes they grant to the client.
 *
 * @author Daniel Garnier-Moiroux
- * @since 0.1.2
+ * @since 7.0
 */
 public final class OAuth2AuthorizationConsent implements Serializable {

@@ -26,7 +26,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 * {@link OAuth2AuthorizationConsent OAuth 2.0 Authorization Consent(s)}.
 *
 * @author Daniel Garnier-Moiroux
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationConsent
 */
 public interface OAuth2AuthorizationConsentService {
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
 * OAuth 2.0 Authorization Server Metadata specification (RFC 8414).
 *
 * @author Daniel Garnier-Moiroux
- * @since 0.1.1
+ * @since 7.0
 * @see AbstractOAuth2AuthorizationServerMetadata
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc8414#section-3.2">3.2.
 * Authorization Server Metadata Response</a>
@@ -29,7 +29,7 @@ import org.springframework.security.oauth2.jose.jws.JwsAlgorithms;
 *
 * @author Daniel Garnier-Moiroux
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see ClaimAccessor
 * @see OAuth2AuthorizationServerMetadataClaimNames
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc8414#section-2">2.
@@ -73,7 +73,6 @@ public interface OAuth2AuthorizationServerMetadataClaimAccessor extends ClaimAcc
 	 * Returns the {@code URL} of the OAuth 2.0 Pushed Authorization Request Endpoint
 	 * {@code (pushed_authorization_request_endpoint)}.
 	 * @return the {@code URL} of the OAuth 2.0 Pushed Authorization Request Endpoint
-	 * @since 1.5
 	 */
 	default URL getPushedAuthorizationRequestEndpoint() {
 		return getClaimAsURL(OAuth2AuthorizationServerMetadataClaimNames.PUSHED_AUTHORIZATION_REQUEST_ENDPOINT);
@@ -83,7 +82,6 @@ public interface OAuth2AuthorizationServerMetadataClaimAccessor extends ClaimAcc
 	 * Returns the {@code URL} of the OAuth 2.0 Device Authorization Endpoint
 	 * {@code (device_authorization_endpoint)}.
 	 * @return the {@code URL} of the OAuth 2.0 Device Authorization Endpoint
-	 * @since 1.1
 	 */
 	default URL getDeviceAuthorizationEndpoint() {
 		return getClaimAsURL(OAuth2AuthorizationServerMetadataClaimNames.DEVICE_AUTHORIZATION_ENDPOINT);
@@ -184,7 +182,6 @@ public interface OAuth2AuthorizationServerMetadataClaimAccessor extends ClaimAcc
 	 * Returns the {@code URL} of the OAuth 2.0 Dynamic Client Registration Endpoint
 	 * {@code (registration_endpoint)}.
 	 * @return the {@code URL} of the OAuth 2.0 Dynamic Client Registration Endpoint
-	 * @since 0.4.0
 	 */
 	default URL getClientRegistrationEndpoint() {
 		return getClaimAsURL(OAuth2AuthorizationServerMetadataClaimNames.REGISTRATION_ENDPOINT);
@@ -204,7 +201,6 @@ public interface OAuth2AuthorizationServerMetadataClaimAccessor extends ClaimAcc
 	 * access tokens {@code (tls_client_certificate_bound_access_tokens)}.
 	 * @return {@code true} to indicate support for mutual-TLS client certificate-bound
 	 * access tokens, {@code false} otherwise
-	 * @since 1.3
 	 */
 	default boolean isTlsClientCertificateBoundAccessTokens() {
 		return Boolean.TRUE.equals(getClaimAsBoolean(
@@ -216,7 +212,6 @@ public interface OAuth2AuthorizationServerMetadataClaimAccessor extends ClaimAcc
 	 * DPoP Proof JWTs {@code (dpop_signing_alg_values_supported)}.
 	 * @return the {@link JwsAlgorithms JSON Web Signature (JWS) algorithms} supported for
 	 * DPoP Proof JWTs
-	 * @since 1.5
 	 */
 	default List<String> getDPoPSigningAlgorithms() {
 		return getClaimAsStringList(OAuth2AuthorizationServerMetadataClaimNames.DPOP_SIGNING_ALG_VALUES_SUPPORTED);
@@ -24,7 +24,7 @@ import org.springframework.security.oauth2.jose.jws.JwsAlgorithms;
 *
 * @author Daniel Garnier-Moiroux
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc8414#section-2">2.
 * Authorization Server Metadata</a>
 * @see <a target="_blank" href=
@@ -59,14 +59,12 @@ public class OAuth2AuthorizationServerMetadataClaimNames {
 	/**
 	 * {@code pushed_authorization_request_endpoint} - the {@code URL} of the OAuth 2.0
 	 * Pushed Authorization Request Endpoint
-	 * @since 1.5
 	 */
 	public static final String PUSHED_AUTHORIZATION_REQUEST_ENDPOINT = "pushed_authorization_request_endpoint";

 	/**
 	 * {@code device_authorization_endpoint} - the {@code URL} of the OAuth 2.0 Device
 	 * Authorization Endpoint
-	 * @since 1.1
 	 */
 	public static final String DEVICE_AUTHORIZATION_ENDPOINT = "device_authorization_endpoint";

@@ -129,7 +127,6 @@ public class OAuth2AuthorizationServerMetadataClaimNames {
 	/**
 	 * {@code registration_endpoint} - the {@code URL} of the OAuth 2.0 Dynamic Client
 	 * Registration Endpoint
-	 * @since 0.4.0
 	 */
 	public static final String REGISTRATION_ENDPOINT = "registration_endpoint";

@@ -142,14 +139,12 @@ public class OAuth2AuthorizationServerMetadataClaimNames {
 	/**
 	 * {@code tls_client_certificate_bound_access_tokens} - {@code true} to indicate
 	 * support for mutual-TLS client certificate-bound access tokens
-	 * @since 1.3
 	 */
 	public static final String TLS_CLIENT_CERTIFICATE_BOUND_ACCESS_TOKENS = "tls_client_certificate_bound_access_tokens";

 	/**
 	 * {@code dpop_signing_alg_values_supported} - the {@link JwsAlgorithms JSON Web
 	 * Signature (JWS) algorithms} supported for DPoP Proof JWTs
-	 * @since 1.5
 	 */
 	public static final String DPOP_SIGNING_ALG_VALUES_SUPPORTED = "dpop_signing_alg_values_supported";

@@ -23,7 +23,7 @@ import org.springframework.lang.Nullable;
 * {@link OAuth2Authorization OAuth 2.0 Authorization(s)}.
 *
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2Authorization
 * @see OAuth2TokenType
 */
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
 *
 * @author Gerardo Roza
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see OAuth2TokenIntrospectionClaimAccessor
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7662#section-2.2">Section
 * 2.2 Introspection Response</a>
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 * Standard token types defined in the OAuth Token Type Hints Registry.
 *
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7009#section-4.1.2">4.1.2
 * OAuth Token Type Hints Registry</a>
 */
@@ -63,7 +63,7 @@ import org.springframework.util.ClassUtils;
 * @author Joe Grandja
 * @author Josh Long
 * @author William Koch
- * @since 1.2
+ * @since 7.0
 */
 class OAuth2AuthorizationServerBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {

@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
 * used in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2PushedAuthorizationRequestAuthenticationToken
 */
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
 *
 * @author Patryk Kostrzewa
 * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
 * @see AuthenticationProvider
 * @see OAuth2ClientAuthenticationToken
 * @see RegisteredClientRepository
@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Daniel Garnier-Moiroux
 * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
 * @see OAuth2ClientAuthenticationToken
 * @see OAuth2AuthorizationService
 */
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
 * A verifier for DPoP Proof {@link Jwt}'s.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 * @see DPoPProofJwtDecoderFactory
 * @see <a target="_blank" href="https://datatracker.ietf.org/doc/html/rfc9449">RFC 9449
 * OAuth 2.0 Demonstrating Proof of Possession (DPoP)</a>
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
 *
 * @author Rafal Lewczuk
 * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
 * @see AuthenticationProvider
 * @see OAuth2ClientAuthenticationToken
 * @see RegisteredClientRepository
@@ -153,7 +153,6 @@ public final class JwtClientAssertionAuthenticationProvider implements Authentic
 	 * {@link JwtClientAssertionDecoderFactory}.
 	 * @param jwtDecoderFactory the {@link JwtDecoderFactory} that provides a
 	 * {@link JwtDecoder} for the specified {@link RegisteredClient}
-	 * @since 0.4.0
 	 */
 	public void setJwtDecoderFactory(JwtDecoderFactory<RegisteredClient> jwtDecoderFactory) {
 		Assert.notNull(jwtDecoderFactory, "jwtDecoderFactory cannot be null");
@@ -63,7 +63,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 *
 * @author Rafal Lewczuk
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see JwtDecoderFactory
 * @see RegisteredClient
 * @see OAuth2TokenValidator
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 * when customizing the {@link OAuth2AccessTokenResponse}.
 *
 * @author Dmitriy Dubson
- * @since 1.3
+ * @since 7.0
 * @see OAuth2AuthenticationContext
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2AccessTokenResponse
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
 *
 * @author Joe Grandja
 * @author Madhu Bhat
- * @since 0.0.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see RegisteredClient
 * @see OAuth2AccessToken
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * and is used in an {@link AuthenticationProvider}.
 *
 * @author Joe Grandja
- * @since 0.2.0
+ * @since 7.0
 * @see Context
 */
 public interface OAuth2AuthenticationContext extends Context {
@@ -50,7 +50,6 @@ public interface OAuth2AuthenticationContext extends Context {
 	 *
 	 * @param <T> the type of the authentication context
 	 * @param <B> the type of the builder
-	 * @since 0.2.1
 	 */
 	abstract class AbstractBuilder<T extends OAuth2AuthenticationContext, B extends AbstractBuilder<T, B>> {

@@ -34,7 +34,7 @@ import org.springframework.util.CollectionUtils;
 * Utility methods for the OAuth 2.0 {@link AuthenticationProvider}'s.
 *
 * @author Joe Grandja
- * @since 0.0.3
+ * @since 7.0
 */
 final class OAuth2AuthenticationProviderUtils {

@@ -69,7 +69,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Joe Grandja
 * @author Daniel Garnier-Moiroux
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2AuthorizationCodeAuthenticationToken
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
@@ -103,7 +103,6 @@ public final class OAuth2AuthorizationCodeAuthenticationProvider implements Auth
 	 * provided parameters.
 	 * @param authorizationService the authorization service
 	 * @param tokenGenerator the token generator
-	 * @since 0.2.3
 	 */
 	public OAuth2AuthorizationCodeAuthenticationProvider(OAuth2AuthorizationService authorizationService,
 			OAuth2TokenGenerator<? extends OAuth2Token> tokenGenerator) {
@@ -326,7 +325,6 @@ public final class OAuth2AuthorizationCodeAuthenticationProvider implements Auth
 	 * Sets the {@link SessionRegistry} used to track OpenID Connect sessions.
 	 * @param sessionRegistry the {@link SessionRegistry} used to track OpenID Connect
 	 * sessions
-	 * @since 1.1
 	 */
 	public void setSessionRegistry(SessionRegistry sessionRegistry) {
 		Assert.notNull(sessionRegistry, "sessionRegistry cannot be null");
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * @author Joe Grandja
 * @author Madhu Bhat
 * @author Daniel Garnier-Moiroux
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2AuthorizationGrantAuthenticationToken
 * @see OAuth2AuthorizationCodeAuthenticationProvider
 */
@@ -31,7 +31,7 @@ import org.springframework.security.oauth2.server.authorization.token.OAuth2Toke
 * An {@link OAuth2TokenGenerator} that generates an {@link OAuth2AuthorizationCode}.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2TokenGenerator
 * @see OAuth2AuthorizationCode
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 * determining if authorization consent is required.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2AuthenticationContext
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider#setAuthenticationValidator(Consumer)
@@ -73,7 +73,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationContext implement
 	/**
 	 * Returns the {@link OAuth2AuthorizationRequest authorization request}.
 	 * @return the {@link OAuth2AuthorizationRequest}
-	 * @since 1.3
 	 */
 	@Nullable
 	public OAuth2AuthorizationRequest getAuthorizationRequest() {
@@ -83,7 +82,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationContext implement
 	/**
 	 * Returns the {@link OAuth2AuthorizationConsent authorization consent}.
 	 * @return the {@link OAuth2AuthorizationConsent}
-	 * @since 1.3
 	 */
 	@Nullable
 	public OAuth2AuthorizationConsent getAuthorizationConsent() {
@@ -123,7 +121,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationContext implement
 		 * Sets the {@link OAuth2AuthorizationRequest authorization request}.
 		 * @param authorizationRequest the {@link OAuth2AuthorizationRequest}
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.3
 		 */
 		public Builder authorizationRequest(OAuth2AuthorizationRequest authorizationRequest) {
 			return put(OAuth2AuthorizationRequest.class, authorizationRequest);
@@ -133,7 +130,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationContext implement
 		 * Sets the {@link OAuth2AuthorizationConsent authorization consent}.
 		 * @param authorizationConsent the {@link OAuth2AuthorizationConsent}
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.3
 		 */
 		public Builder authorizationConsent(OAuth2AuthorizationConsent authorizationConsent) {
 			return put(OAuth2AuthorizationConsent.class, authorizationConsent);
@@ -27,7 +27,7 @@ import org.springframework.security.oauth2.core.OAuth2Error;
 * authenticate the OAuth 2.0 Authorization Request (or Consent) fails.
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
 */
@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Joe Grandja
 * @author Steve Riesenberg
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationValidator
 * @see OAuth2AuthorizationCodeAuthenticationProvider
@@ -342,7 +342,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 	 * {@link OAuth2AuthorizationCode}.
 	 * @param authorizationCodeGenerator the {@link OAuth2TokenGenerator} that generates
 	 * the {@link OAuth2AuthorizationCode}
-	 * @since 0.2.3
 	 */
 	public void setAuthorizationCodeGenerator(
 			OAuth2TokenGenerator<OAuth2AuthorizationCode> authorizationCodeGenerator) {
@@ -364,7 +363,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 	 * @param authenticationValidator the {@code Consumer} providing access to the
 	 * {@link OAuth2AuthorizationCodeRequestAuthenticationContext} and is responsible for
 	 * validating specific OAuth 2.0 Authorization Request parameters
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationValidator(
 			Consumer<OAuth2AuthorizationCodeRequestAuthenticationContext> authenticationValidator) {
@@ -388,7 +386,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 	 * </ul>
 	 * @param authorizationConsentRequired the {@code Predicate} used to determine if
 	 * authorization consent is required
-	 * @since 1.3
 	 */
 	public void setAuthorizationConsentRequired(
 			Predicate<OAuth2AuthorizationCodeRequestAuthenticationContext> authorizationConsentRequired) {
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
 * @see OAuth2AuthorizationConsentAuthenticationProvider
 */
@@ -52,7 +52,6 @@ public class OAuth2AuthorizationCodeRequestAuthenticationToken
 	 * @param state the state
 	 * @param scopes the requested scope(s)
 	 * @param additionalParameters the additional parameters
-	 * @since 0.4.0
 	 */
 	public OAuth2AuthorizationCodeRequestAuthenticationToken(String authorizationUri, String clientId,
 			Authentication principal, @Nullable String redirectUri, @Nullable String state,
@@ -71,7 +70,6 @@ public class OAuth2AuthorizationCodeRequestAuthenticationToken
 	 * @param redirectUri the redirect uri
 	 * @param state the state
 	 * @param scopes the authorized scope(s)
-	 * @since 0.4.0
 	 */
 	public OAuth2AuthorizationCodeRequestAuthenticationToken(String authorizationUri, String clientId,
 			Authentication principal, OAuth2AuthorizationCode authorizationCode, @Nullable String redirectUri,
@@ -52,7 +52,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 * fails, an {@link OAuth2AuthorizationCodeRequestAuthenticationException} is thrown.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2AuthorizationCodeRequestAuthenticationContext
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider#setAuthenticationValidator(Consumer)
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
 *
 * @author Steve Riesenberg
 * @author Joe Grandja
- * @since 0.2.1
+ * @since 7.0
 * @see OAuth2AuthenticationContext
 * @see OAuth2AuthorizationConsent
 * @see OAuth2AuthorizationConsentAuthenticationProvider#setAuthorizationConsentCustomizer(Consumer)
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
 * Consent used in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2AuthorizationConsentAuthenticationToken
 * @see OAuth2AuthorizationConsent
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
 * in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2AuthorizationConsentAuthenticationProvider
 * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
 */
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 * Authorization Grant.
 *
 * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see AuthorizationGrantType
 * @see OAuth2ClientAuthenticationToken
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 * validating an OAuth 2.0 Client Authentication.
 *
 * @author Joe Grandja
- * @since 1.3
+ * @since 7.0
 * @see OAuth2AuthenticationContext
 * @see OAuth2ClientAuthenticationToken
 * @see X509ClientCertificateAuthenticationProvider#setCertificateVerifier(Consumer)
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
 * @author Joe Grandja
 * @author Patryk Kostrzewa
 * @author Anoop Garlapati
- * @since 0.0.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see RegisteredClient
 * @see JwtClientAssertionAuthenticationProvider
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 * used when validating the OAuth 2.0 Client Credentials Grant Request.
 *
 * @author Adam Pilling
- * @since 1.3
+ * @since 7.0
 * @see OAuth2AuthenticationContext
 * @see OAuth2ClientCredentialsAuthenticationToken
 * @see OAuth2ClientCredentialsAuthenticationProvider#setAuthenticationValidator(Consumer)
@@ -50,7 +50,7 @@ import org.springframework.util.Assert;
 *
 * @author Alexey Nesterov
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2ClientCredentialsAuthenticationToken
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2AuthorizationService
@@ -79,7 +79,6 @@ public final class OAuth2ClientCredentialsAuthenticationProvider implements Auth
 	 * provided parameters.
 	 * @param authorizationService the authorization service
 	 * @param tokenGenerator the token generator
-	 * @since 0.2.3
 	 */
 	public OAuth2ClientCredentialsAuthenticationProvider(OAuth2AuthorizationService authorizationService,
 			OAuth2TokenGenerator<? extends OAuth2Token> tokenGenerator) {
@@ -192,7 +191,6 @@ public final class OAuth2ClientCredentialsAuthenticationProvider implements Auth
 	 * @param authenticationValidator the {@code Consumer} providing access to the
 	 * {@link OAuth2ClientCredentialsAuthenticationContext} and is responsible for
 	 * validating specific OAuth 2.0 Client Credentials Grant Request parameters
-	 * @since 1.3
 	 */
 	public void setAuthenticationValidator(
 			Consumer<OAuth2ClientCredentialsAuthenticationContext> authenticationValidator) {
@@ -30,7 +30,7 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType;
 * Grant.
 *
 * @author Alexey Nesterov
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2AuthorizationGrantAuthenticationToken
 * @see OAuth2ClientCredentialsAuthenticationProvider
 */
@@ -41,7 +41,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 * {@link OAuth2AuthenticationException} is thrown.
 *
 * @author Adam Pilling
- * @since 1.3
+ * @since 7.0
 * @see OAuth2ClientCredentialsAuthenticationContext
 * @see OAuth2ClientCredentialsAuthenticationToken
 * @see OAuth2ClientCredentialsAuthenticationProvider#setAuthenticationValidator(Consumer)
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
 * used in the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2DeviceAuthorizationConsentAuthenticationToken
 * @see OAuth2AuthorizationConsent
 * @see OAuth2DeviceAuthorizationRequestAuthenticationProvider
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 * the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see OAuth2DeviceAuthorizationConsentAuthenticationProvider
 */
@@ -56,7 +56,7 @@ import org.springframework.util.CollectionUtils;
 * used in the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2DeviceAuthorizationRequestAuthenticationToken
 * @see OAuth2DeviceVerificationAuthenticationProvider
 * @see OAuth2DeviceAuthorizationConsentAuthenticationProvider
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 * the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see OAuth2ClientAuthenticationToken
 * @see OAuth2DeviceAuthorizationRequestAuthenticationProvider
@@ -51,7 +51,7 @@ import org.springframework.util.Assert;
 * used in the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2DeviceCodeAuthenticationToken
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2DeviceAuthorizationRequestAuthenticationProvider
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
 * the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2AuthorizationGrantAuthenticationToken
 * @see OAuth2DeviceCodeAuthenticationProvider
 */
@@ -50,7 +50,7 @@ import org.springframework.util.Assert;
 * (submission of the user code) used in the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2DeviceVerificationAuthenticationToken
 * @see OAuth2DeviceAuthorizationRequestAuthenticationProvider
 * @see OAuth2DeviceAuthorizationConsentAuthenticationProvider
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 * (submission of the user code) used in the OAuth 2.0 Device Authorization Grant.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see OAuth2DeviceVerificationAuthenticationProvider
 */
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
 * Request used in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 * @see OAuth2PushedAuthorizationRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationToken
 * @see OAuth2AuthorizationCodeRequestAuthenticationValidator
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * used in the Authorization Code Grant.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 * @see OAuth2PushedAuthorizationRequestAuthenticationProvider
 */
 public class OAuth2PushedAuthorizationRequestAuthenticationToken
@@ -27,7 +27,7 @@ import org.springframework.security.crypto.keygen.StringKeyGenerator;
 * Requests.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 */
 final class OAuth2PushedAuthorizationRequestUri {

@@ -60,7 +60,7 @@ import org.springframework.util.CollectionUtils;
 * @author Alexey Nesterov
 * @author Joe Grandja
 * @author Anoop Garlapati
- * @since 0.0.3
+ * @since 7.0
 * @see OAuth2RefreshTokenAuthenticationToken
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2AuthorizationService
@@ -89,7 +89,6 @@ public final class OAuth2RefreshTokenAuthenticationProvider implements Authentic
 	 * parameters.
 	 * @param authorizationService the authorization service
 	 * @param tokenGenerator the token generator
-	 * @since 0.2.3
 	 */
 	public OAuth2RefreshTokenAuthenticationProvider(OAuth2AuthorizationService authorizationService,
 			OAuth2TokenGenerator<? extends OAuth2Token> tokenGenerator) {
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * An {@link Authentication} implementation used for the OAuth 2.0 Refresh Token Grant.
 *
 * @author Alexey Nesterov
- * @since 0.0.3
+ * @since 7.0
 * @see OAuth2AuthorizationGrantAuthenticationToken
 * @see OAuth2RefreshTokenAuthenticationProvider
 */
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * "delegation" use case).
 *
 * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
 * @see OAuth2TokenExchangeCompositeAuthenticationToken
 */
 public final class OAuth2TokenExchangeActor implements ClaimAccessor {
@@ -59,7 +59,7 @@ import org.springframework.util.StringUtils;
 * Grant.
 *
 * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
 * @see OAuth2TokenExchangeAuthenticationToken
 * @see OAuth2AccessTokenAuthenticationToken
 * @see OAuth2AuthorizationService
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 * An {@link Authentication} implementation used for the OAuth 2.0 Token Exchange Grant.
 *
 * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
 * @see OAuth2AuthorizationGrantAuthenticationToken
 * @see OAuth2TokenExchangeAuthenticationProvider
 */
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 * represent the principal in a composite token (e.g. the "delegation" use case).
 *
 * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
 * @see OAuth2TokenExchangeAuthenticationToken
 */
 public class OAuth2TokenExchangeCompositeAuthenticationToken extends AbstractAuthenticationToken {
@@ -45,7 +45,7 @@ import org.springframework.util.CollectionUtils;
 *
 * @author Gerardo Roza
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see OAuth2TokenIntrospectionAuthenticationToken
 * @see RegisteredClientRepository
 * @see OAuth2AuthorizationService
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 *
 * @author Gerardo Roza
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see OAuth2TokenIntrospection
 * @see OAuth2TokenIntrospectionAuthenticationProvider
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 *
 * @author Vivek Babu
 * @author Joe Grandja
- * @since 0.0.3
+ * @since 7.0
 * @see OAuth2TokenRevocationAuthenticationToken
 * @see OAuth2AuthorizationService
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7009#section-2.1">Section
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 *
 * @author Vivek Babu
 * @author Joe Grandja
- * @since 0.0.3
+ * @since 7.0
 * @see AbstractAuthenticationToken
 * @see OAuth2TokenRevocationAuthenticationProvider
 */
@@ -21,7 +21,7 @@ package org.springframework.security.oauth2.server.authorization.authentication;
 * Request.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 */
 final class OidcPrompt {

@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
 * code_verifier} parameter.
 *
 * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
 * @see AuthenticationProvider
 * @see OAuth2ClientAuthenticationToken
 * @see RegisteredClientRepository
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
 * method is used.
 *
 * @author Joe Grandja
- * @since 1.3
+ * @since 7.0
 * @see AuthenticationProvider
 * @see OAuth2ClientAuthenticationToken
 * @see RegisteredClientRepository
@@ -57,7 +57,7 @@ import org.springframework.web.client.RestTemplate;
 * {@code self_signed_tls_client_auth} authentication method.
 *
 * @author Joe Grandja
- * @since 1.3
+ * @since 7.0
 * @see X509ClientCertificateAuthenticationProvider#setCertificateVerifier(Consumer)
 */
 final class X509SelfSignedCertificateVerifier implements Consumer<OAuth2ClientAuthenticationContext> {
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
 * @author Anoop Garlapati
 * @author Ovidiu Popa
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see RegisteredClientRepository
 * @see RegisteredClient
 */
@@ -74,7 +74,7 @@ import org.springframework.util.StringUtils;
 * @author Joe Grandja
 * @author Ovidiu Popa
 * @author Josh Long
- * @since 0.1.2
+ * @since 7.0
 * @see RegisteredClientRepository
 * @see RegisteredClient
 * @see JdbcOperations
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Joe Grandja
 * @author Anoop Garlapati
- * @since 0.0.1
+ * @since 7.0
 * @see <a target="_blank" href="https://tools.ietf.org/html/rfc6749#section-2">Section 2
 * Client Registration</a>
 */
@@ -165,7 +165,6 @@ public class RegisteredClient implements Serializable {
 	 * {@code post_logout_redirect_uri} parameter is used by the client when requesting
 	 * that the End-User's User Agent be redirected to after a logout has been performed.
 	 * @return the {@code Set} of post logout redirect URI(s)
-	 * @since 1.1
 	 */
 	public Set<String> getPostLogoutRedirectUris() {
 		return this.postLogoutRedirectUris;
@@ -456,7 +455,6 @@ public class RegisteredClient implements Serializable {
 		 * been performed.
 		 * @param postLogoutRedirectUri the post logout redirect URI
 		 * @return the {@link Builder}
-		 * @since 1.1
 		 */
 		public Builder postLogoutRedirectUri(String postLogoutRedirectUri) {
 			this.postLogoutRedirectUris.add(postLogoutRedirectUri);
@@ -469,7 +467,6 @@ public class RegisteredClient implements Serializable {
 		 * @param postLogoutRedirectUrisConsumer a {@link Consumer} of the post logout
 		 * redirect URI(s)
 		 * @return the {@link Builder}
-		 * @since 1.1
 		 */
 		public Builder postLogoutRedirectUris(Consumer<Set<String>> postLogoutRedirectUrisConsumer) {
 			postLogoutRedirectUrisConsumer.accept(this.postLogoutRedirectUris);
@@ -24,7 +24,7 @@ import org.springframework.lang.Nullable;
 * @author Joe Grandja
 * @author Anoop Garlapati
 * @author Ovidiu Popa
- * @since 0.0.1
+ * @since 7.0
 * @see RegisteredClient
 */
 public interface RegisteredClientRepository {
@@ -43,7 +43,7 @@ import org.springframework.security.web.SecurityFilterChain;
 * {@link Configuration} for OAuth 2.0 Authorization Server support.
 *
 * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer
 */
@Configuration(proxyBeanMethods = false)
@@ -37,7 +37,7 @@ import org.springframework.context.annotation.AnnotationBeanNameGenerator;
 * not already present.
 *
 * @author Steve Riesenberg
- * @since 0.2.0
+ * @since 7.0
 */
 final class RegisterMissingBeanPostProcessor implements BeanDefinitionRegistryPostProcessor, BeanFactoryAware {

@@ -24,7 +24,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 * Base configurer for an OAuth 2.0 component (e.g. protocol endpoint).
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 */
 abstract class AbstractOAuth2Configurer {

@@ -41,7 +41,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 * {@link AuthorizationServerContextHolder}.
 *
 * @author Joe Grandja
- * @since 0.2.2
+ * @since 7.0
 * @see AuthorizationServerContext
 * @see AuthorizationServerContextHolder
 * @see AuthorizationServerSettings
@@ -45,7 +45,7 @@ import org.springframework.util.CollectionUtils;
 /**
 * @author Joe Grandja
 * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
 */
 final class DefaultOAuth2TokenCustomizers {

@@ -56,7 +56,7 @@ import org.springframework.util.StringUtils;
 * Configurer for the OAuth 2.0 Authorization Endpoint.
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#authorizationEndpoint
 * @see OAuth2AuthorizationEndpointFilter
 */
@@ -120,7 +120,6 @@ public final class OAuth2AuthorizationEndpointConfigurer extends AbstractOAuth2C
 	 * to the {@code List} of default and (optionally) added
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OAuth2AuthorizationEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2AuthorizationEndpointConfigurer authorizationRequestConverters(
 			Consumer<List<AuthenticationConverter>> authorizationRequestConvertersConsumer) {
@@ -150,7 +149,6 @@ public final class OAuth2AuthorizationEndpointConfigurer extends AbstractOAuth2C
 	 * @param authenticationProvidersConsumer the {@code Consumer} providing access to the
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OAuth2AuthorizationEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2AuthorizationEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -67,7 +67,7 @@ import org.springframework.util.Assert;
 * @author Gerardo Roza
 * @author Ovidiu Popa
 * @author Gaurav Tiwari
- * @since 0.0.1
+ * @since 7.0
 * @see AbstractHttpConfigurer
 * @see OAuth2ClientAuthenticationConfigurer
 * @see OAuth2AuthorizationServerMetadataEndpointConfigurer
@@ -96,7 +96,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * configuring.
 	 * @return a new instance of {@link OAuth2AuthorizationServerConfigurer} for
 	 * configuring
-	 * @since 1.4
 	 */
 	public static OAuth2AuthorizationServerConfigurer authorizationServer() {
 		return new OAuth2AuthorizationServerConfigurer();
@@ -153,7 +152,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * Sets the token generator.
 	 * @param tokenGenerator the token generator
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 0.2.3
 	 */
 	public OAuth2AuthorizationServerConfigurer tokenGenerator(
 			OAuth2TokenGenerator<? extends OAuth2Token> tokenGenerator) {
@@ -179,7 +177,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param authorizationServerMetadataEndpointCustomizer the {@link Customizer}
 	 * providing access to the {@link OAuth2AuthorizationServerMetadataEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2AuthorizationServerConfigurer authorizationServerMetadataEndpoint(
 			Customizer<OAuth2AuthorizationServerMetadataEndpointConfigurer> authorizationServerMetadataEndpointCustomizer) {
@@ -205,7 +202,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param pushedAuthorizationRequestEndpointCustomizer the {@link Customizer}
 	 * providing access to the {@link OAuth2PushedAuthorizationRequestEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 1.5
 	 */
 	public OAuth2AuthorizationServerConfigurer pushedAuthorizationRequestEndpoint(
 			Customizer<OAuth2PushedAuthorizationRequestEndpointConfigurer> pushedAuthorizationRequestEndpointCustomizer) {
@@ -238,7 +234,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param tokenIntrospectionEndpointCustomizer the {@link Customizer} providing access
 	 * to the {@link OAuth2TokenIntrospectionEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 0.2.3
 	 */
 	public OAuth2AuthorizationServerConfigurer tokenIntrospectionEndpoint(
 			Customizer<OAuth2TokenIntrospectionEndpointConfigurer> tokenIntrospectionEndpointCustomizer) {
@@ -251,7 +246,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param tokenRevocationEndpointCustomizer the {@link Customizer} providing access to
 	 * the {@link OAuth2TokenRevocationEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 0.2.2
 	 */
 	public OAuth2AuthorizationServerConfigurer tokenRevocationEndpoint(
 			Customizer<OAuth2TokenRevocationEndpointConfigurer> tokenRevocationEndpointCustomizer) {
@@ -264,7 +258,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param deviceAuthorizationEndpointCustomizer the {@link Customizer} providing
 	 * access to the {@link OAuth2DeviceAuthorizationEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 1.1
 	 */
 	public OAuth2AuthorizationServerConfigurer deviceAuthorizationEndpoint(
 			Customizer<OAuth2DeviceAuthorizationEndpointConfigurer> deviceAuthorizationEndpointCustomizer) {
@@ -278,7 +271,6 @@ public final class OAuth2AuthorizationServerConfigurer
 	 * @param deviceVerificationEndpointCustomizer the {@link Customizer} providing access
 	 * to the {@link OAuth2DeviceVerificationEndpointConfigurer}
 	 * @return the {@link OAuth2AuthorizationServerConfigurer} for further configuration
-	 * @since 1.1
 	 */
 	public OAuth2AuthorizationServerConfigurer deviceVerificationEndpoint(
 			Customizer<OAuth2DeviceVerificationEndpointConfigurer> deviceVerificationEndpointCustomizer) {
@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 * Configurer for the OAuth 2.0 Authorization Server Metadata Endpoint.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#authorizationServerMetadataEndpoint
 * @see OAuth2AuthorizationServerMetadataEndpointFilter
 */
@@ -58,7 +58,7 @@ import org.springframework.util.Assert;
 * Configurer for OAuth 2.0 Client Authentication.
 *
 * @author Joe Grandja
- * @since 0.2.0
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#clientAuthentication
 * @see OAuth2ClientAuthenticationFilter
 */
@@ -112,7 +112,6 @@ public final class OAuth2ClientAuthenticationConfigurer extends AbstractOAuth2Co
 	 * the {@code List} of default and (optionally) added
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OAuth2ClientAuthenticationConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2ClientAuthenticationConfigurer authenticationConverters(
 			Consumer<List<AuthenticationConverter>> authenticationConvertersConsumer) {
@@ -142,7 +141,6 @@ public final class OAuth2ClientAuthenticationConfigurer extends AbstractOAuth2Co
 	 * @param authenticationProvidersConsumer the {@code Consumer} providing access to the
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OAuth2ClientAuthenticationConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2ClientAuthenticationConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
 * Utility methods for the OAuth 2.0 Configurers.
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 */
 final class OAuth2ConfigurerUtils {

@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
 * Configurer for the OAuth 2.0 Device Authorization Endpoint.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#deviceAuthorizationEndpoint
 * @see OAuth2DeviceAuthorizationEndpointFilter
 */
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
 * Configurer for the OAuth 2.0 Device Verification Endpoint.
 *
 * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#deviceVerificationEndpoint
 * @see OAuth2DeviceVerificationEndpointFilter
 */
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
 * Configurer for the OAuth 2.0 Pushed Authorization Request Endpoint.
 *
 * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#pushedAuthorizationRequestEndpoint
 * @see OAuth2PushedAuthorizationRequestEndpointFilter
 */
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
 * Configurer for the OAuth 2.0 Token Endpoint.
 *
 * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#tokenEndpoint
 * @see OAuth2TokenEndpointFilter
 */
@@ -117,7 +117,6 @@ public final class OAuth2TokenEndpointConfigurer extends AbstractOAuth2Configure
 	 * to the {@code List} of default and (optionally) added
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OAuth2TokenEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenEndpointConfigurer accessTokenRequestConverters(
 			Consumer<List<AuthenticationConverter>> accessTokenRequestConvertersConsumer) {
@@ -147,7 +146,6 @@ public final class OAuth2TokenEndpointConfigurer extends AbstractOAuth2Configure
 	 * @param authenticationProvidersConsumer the {@code Consumer} providing access to the
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OAuth2TokenEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
 *
 * @author Gaurav Tiwari
 * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#tokenIntrospectionEndpoint(Customizer)
 * @see OAuth2TokenIntrospectionEndpointFilter
 */
@@ -107,7 +107,6 @@ public final class OAuth2TokenIntrospectionEndpointConfigurer extends AbstractOA
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OAuth2TokenIntrospectionEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenIntrospectionEndpointConfigurer introspectionRequestConverters(
 			Consumer<List<AuthenticationConverter>> introspectionRequestConvertersConsumer) {
@@ -140,7 +139,6 @@ public final class OAuth2TokenIntrospectionEndpointConfigurer extends AbstractOA
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OAuth2TokenIntrospectionEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenIntrospectionEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -48,7 +48,7 @@ import org.springframework.util.Assert;
 *
 * @author Arfat Chaus
 * @author Joe Grandja
- * @since 0.2.2
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#tokenRevocationEndpoint
 * @see OAuth2TokenRevocationEndpointFilter
 */
@@ -106,7 +106,6 @@ public final class OAuth2TokenRevocationEndpointConfigurer extends AbstractOAuth
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OAuth2TokenRevocationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenRevocationEndpointConfigurer revocationRequestConverters(
 			Consumer<List<AuthenticationConverter>> revocationRequestConvertersConsumer) {
@@ -139,7 +138,6 @@ public final class OAuth2TokenRevocationEndpointConfigurer extends AbstractOAuth
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OAuth2TokenRevocationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OAuth2TokenRevocationEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -52,7 +52,7 @@ import org.springframework.util.Assert;
 *
 * @author Joe Grandja
 * @author Daniel Garnier-Moiroux
- * @since 0.2.0
+ * @since 7.0
 * @see OidcConfigurer#clientRegistrationEndpoint
 * @see OidcClientRegistrationEndpointFilter
 */
@@ -93,7 +93,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * {@link HttpServletRequest}
 	 * @return the {@link OidcClientRegistrationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer clientRegistrationRequestConverter(
 			AuthenticationConverter clientRegistrationRequestConverter) {
@@ -112,7 +111,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * access to the {@code List} of default and (optionally) added
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer clientRegistrationRequestConverters(
 			Consumer<List<AuthenticationConverter>> clientRegistrationRequestConvertersConsumer) {
@@ -129,7 +127,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * authenticating an {@link OidcClientRegistrationAuthenticationToken}
 	 * @return the {@link OidcClientRegistrationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer authenticationProvider(
 			AuthenticationProvider authenticationProvider) {
@@ -147,7 +144,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OidcClientRegistrationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -164,7 +160,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * used for handling an {@link OidcClientRegistrationAuthenticationToken}
 	 * @return the {@link OidcClientRegistrationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer clientRegistrationResponseHandler(
 			AuthenticationSuccessHandler clientRegistrationResponseHandler) {
@@ -180,7 +175,6 @@ public final class OidcClientRegistrationEndpointConfigurer extends AbstractOAut
 	 * handling an {@link OAuth2AuthenticationException}
 	 * @return the {@link OidcClientRegistrationEndpointConfigurer} for further
 	 * configuration
-	 * @since 0.4.0
 	 */
 	public OidcClientRegistrationEndpointConfigurer errorResponseHandler(
 			AuthenticationFailureHandler errorResponseHandler) {
@@ -35,7 +35,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 * Configurer for OpenID Connect 1.0 support.
 *
 * @author Joe Grandja
- * @since 0.2.0
+ * @since 7.0
 * @see OAuth2AuthorizationServerConfigurer#oidc
 * @see OidcProviderConfigurationEndpointConfigurer
 * @see OidcLogoutEndpointConfigurer
@@ -65,7 +65,6 @@ public final class OidcConfigurer extends AbstractOAuth2Configurer {
 	 * @param providerConfigurationEndpointCustomizer the {@link Customizer} providing
 	 * access to the {@link OidcProviderConfigurationEndpointConfigurer}
 	 * @return the {@link OidcConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcConfigurer providerConfigurationEndpoint(
 			Customizer<OidcProviderConfigurationEndpointConfigurer> providerConfigurationEndpointCustomizer) {
@@ -79,7 +78,6 @@ public final class OidcConfigurer extends AbstractOAuth2Configurer {
 	 * @param logoutEndpointCustomizer the {@link Customizer} providing access to the
 	 * {@link OidcLogoutEndpointConfigurer}
 	 * @return the {@link OidcConfigurer} for further configuration
-	 * @since 1.1
 	 */
 	public OidcConfigurer logoutEndpoint(Customizer<OidcLogoutEndpointConfigurer> logoutEndpointCustomizer) {
 		logoutEndpointCustomizer.customize(getConfigurer(OidcLogoutEndpointConfigurer.class));
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
 * Configurer for OpenID Connect 1.0 RP-Initiated Logout Endpoint.
 *
 * @author Joe Grandja
- * @since 1.1
+ * @since 7.0
 * @see OidcConfigurer#logoutEndpoint
 * @see OidcLogoutEndpointFilter
 */
@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 * Configurer for the OpenID Connect 1.0 Provider Configuration Endpoint.
 *
 * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
 * @see OidcConfigurer#providerConfigurationEndpoint
 * @see OidcProviderConfigurationEndpointFilter
 */
@@ -55,7 +55,7 @@ import org.springframework.util.Assert;
 *
 * @author Steve Riesenberg
 * @author Daniel Garnier-Moiroux
- * @since 0.2.1
+ * @since 7.0
 * @see OidcConfigurer#userInfoEndpoint
 * @see OidcUserInfoEndpointFilter
 */
@@ -94,7 +94,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * @param userInfoRequestConverter an {@link AuthenticationConverter} used when
 	 * attempting to extract an UserInfo Request from {@link HttpServletRequest}
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer userInfoRequestConverter(AuthenticationConverter userInfoRequestConverter) {
 		Assert.notNull(userInfoRequestConverter, "userInfoRequestConverter cannot be null");
@@ -111,7 +110,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * the {@code List} of default and (optionally) added
 	 * {@link AuthenticationConverter}'s
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer userInfoRequestConverters(
 			Consumer<List<AuthenticationConverter>> userInfoRequestConvertersConsumer) {
@@ -126,7 +124,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * @param authenticationProvider an {@link AuthenticationProvider} used for
 	 * authenticating an {@link OidcUserInfoAuthenticationToken}
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer authenticationProvider(AuthenticationProvider authenticationProvider) {
 		Assert.notNull(authenticationProvider, "authenticationProvider cannot be null");
@@ -142,7 +139,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * @param authenticationProvidersConsumer the {@code Consumer} providing access to the
 	 * {@code List} of default and (optionally) added {@link AuthenticationProvider}'s
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer authenticationProviders(
 			Consumer<List<AuthenticationProvider>> authenticationProvidersConsumer) {
@@ -158,7 +154,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * @param userInfoResponseHandler the {@link AuthenticationSuccessHandler} used for
 	 * handling an {@link OidcUserInfoAuthenticationToken}
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer userInfoResponseHandler(
 			AuthenticationSuccessHandler userInfoResponseHandler) {
@@ -173,7 +168,6 @@ public final class OidcUserInfoEndpointConfigurer extends AbstractOAuth2Configur
 	 * @param errorResponseHandler the {@link AuthenticationFailureHandler} used for
 	 * handling an {@link OAuth2AuthenticationException}
 	 * @return the {@link OidcUserInfoEndpointConfigurer} for further configuration
-	 * @since 0.4.0
 	 */
 	public OidcUserInfoEndpointConfigurer errorResponseHandler(AuthenticationFailureHandler errorResponseHandler) {
 		this.errorResponseHandler = errorResponseHandler;
@@ -22,7 +22,7 @@ import org.springframework.security.oauth2.server.authorization.settings.Authori
 * A context that holds information of the Authorization Server runtime environment.
 *
 * @author Joe Grandja
- * @since 0.2.2
+ * @since 7.0
 * @see AuthorizationServerSettings
 * @see AuthorizationServerContextHolder
 */
@@ -21,7 +21,7 @@ package org.springframework.security.oauth2.server.authorization.context;
 * thread using a {@code ThreadLocal}.
 *
 * @author Joe Grandja
- * @since 0.2.2
+ * @since 7.0
 * @see AuthorizationServerContext
 */
 public final class AuthorizationServerContextHolder {
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 * A facility for holding information associated to a specific context.
 *
 * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
 */
 public interface Context {

@@ -28,7 +28,7 @@ import org.springframework.util.ClassUtils;
 *
 * @author Joe Grandja
 * @author l uamas
- * @since 0.1.1
+ * @since 7.0
 */
 final class HttpMessageConverters {

@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
 * 2.0 Authorization Server Metadata Response}.
 *
 * @author Daniel Garnier-Moiroux
- * @since 0.1.1
+ * @since 7.0
 * @see AbstractHttpMessageConverter
 * @see OAuth2AuthorizationServerMetadata
 */
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Gerardo Roza
 * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
 * @see AbstractHttpMessageConverter
 * @see OAuth2TokenIntrospection
 */
--- a/Show More
+++ b/Show More