diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java
index 5ad6ab976f..a78d0e50f0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java
@@ -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,
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationConsentService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationConsentService.java
index 37d5e10dd7..a82c81d8e4 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationConsentService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationConsentService.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationService.java
index ad43a1901a..a4fb51e2d7 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationService.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java
index 0bdd093960..ee3456ea5d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java
index 3b67bafae6..f23b1ff147 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java
index 041275c217..b62f4c4a83 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java
@@ -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");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationCode.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationCode.java
index 8771651530..56b8bb185a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationCode.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationCode.java
@@ -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>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java
index fe605b396c..4db6dd72b2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsentService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsentService.java
index cbaac364ec..20b16d9347 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsentService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsentService.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadata.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadata.java
index 58cced6fdd..9b339de938 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadata.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadata.java
@@ -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>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimAccessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimAccessor.java
index c76c833034..a5432d4e27 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimAccessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimAccessor.java
@@ -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);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimNames.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimNames.java
index d5a176de6a..fabc2c5a08 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimNames.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationServerMetadataClaimNames.java
@@ -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";
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationService.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationService.java
index f6fcf0dedb..a4ebd9205e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationService.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationService.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java
index 6e0651e24b..45a9ef0a9c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java
@@ -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>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java
index c880e7ec66..b4413d8b4f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java
@@ -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>
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/aot/hint/OAuth2AuthorizationServerBeanRegistrationAotProcessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/aot/hint/OAuth2AuthorizationServerBeanRegistrationAotProcessor.java
index 53d2d89f60..e8b362a5e2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/aot/hint/OAuth2AuthorizationServerBeanRegistrationAotProcessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/aot/hint/OAuth2AuthorizationServerBeanRegistrationAotProcessor.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/AbstractOAuth2AuthorizationCodeRequestAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/AbstractOAuth2AuthorizationCodeRequestAuthenticationToken.java
index d26804c9d6..a548b8df1c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/AbstractOAuth2AuthorizationCodeRequestAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/AbstractOAuth2AuthorizationCodeRequestAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/ClientSecretAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/ClientSecretAuthenticationProvider.java
index 0b5b0189c9..8c1933e3e0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/ClientSecretAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/ClientSecretAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/CodeVerifierAuthenticator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/CodeVerifierAuthenticator.java
index 9f8a30e658..05426cfa8f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/CodeVerifierAuthenticator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/CodeVerifierAuthenticator.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/DPoPProofVerifier.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/DPoPProofVerifier.java
index 5f8f726e88..7d8af7acd5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/DPoPProofVerifier.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/DPoPProofVerifier.java
@@ -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>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionAuthenticationProvider.java
index d103ad3d5e..06efbe8df4 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionAuthenticationProvider.java
@@ -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");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionDecoderFactory.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionDecoderFactory.java
index 6baac60176..f2e8e1ea9e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionDecoderFactory.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionDecoderFactory.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationContext.java
index 735ad7e8e9..9fafb2c7ff 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationContext.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java
index 5e530c87b5..4bd12b1750 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
index 2550981d4f..6591ca135b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationContext.java
@@ -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>> {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationProviderUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationProviderUtils.java
index 15f49ffde3..3cddb148f5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationProviderUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthenticationProviderUtils.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java
index 30e7ca1a29..1cb945f0d0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java
@@ -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");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationToken.java
index 7252e5341c..74e9825a0a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeGenerator.java
index f38c33bf13..aa03e4fdd1 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeGenerator.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationContext.java
index 78f0d905d0..16b13d1396 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationContext.java
@@ -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);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationException.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationException.java
index 7d8d285275..023f2a2bb0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationException.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationException.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java
index 21676e5727..9a51ad71e2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java
index 2213fe8e28..95e0489a56 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java
@@ -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,
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationValidator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationValidator.java
index 9b954d4605..08af27f02f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationValidator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationValidator.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationContext.java
index 2fd6ea0723..75a4f4f852 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationContext.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationProvider.java
index 36a0202d60..539c54d28e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationToken.java
index 2a9cc85359..e5772e6b26 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java
index beec7fc6d3..60733c6785 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationContext.java
index 4c83572de6..6cd5d06f5e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationContext.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java
index 4ee3e2c178..642467be11 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationContext.java
index 227af9de9a..35b0ee37a8 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationContext.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java
index 68580cde65..8ac7917a83 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationToken.java
index ba9ad5a760..f634cfa4f5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationValidator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationValidator.java
index 30da80fe58..be33fd571f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationValidator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationValidator.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationProvider.java
index cdf8fa32da..385dd11124 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationToken.java
index 25829750e9..99479d74df 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationConsentAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationProvider.java
index 118b49870f..ce55e092fe 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationToken.java
index 61f751e484..7fc2ae95b9 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationProvider.java
index 5b493a249d..beca3134e0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationToken.java
index 19ea1e5a3e..653ca0b62c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationProvider.java
index 75b94dda0e..9629807f60 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationToken.java
index b1954f85d9..af948ca6dd 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationProvider.java
index ec1cc756eb..4d0225a27b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationToken.java
index 6f2e0c5c19..73b94bfa86 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestUri.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestUri.java
index 505ba323e7..96566f0b6f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestUri.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestUri.java
@@ -27,7 +27,7 @@ import org.springframework.security.crypto.keygen.StringKeyGenerator;
  * Requests.
  *
  * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
  */
 final class OAuth2PushedAuthorizationRequestUri {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java
index 4ab1ba3e9f..c6c50a3215 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationToken.java
index 6b9bad8f42..2cb8e6569b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeActor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeActor.java
index 80a657d1ae..f2a6967d1c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeActor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeActor.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationProvider.java
index 1fe2616530..50b9b00930 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationToken.java
index f6d2ef8101..0c320c56a2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeCompositeAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeCompositeAuthenticationToken.java
index 573f0b0e73..35ebf79a41 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeCompositeAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeCompositeAuthenticationToken.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java
index d3ed47dddd..544cf3cf53 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java
index b250c8a8d3..d79920571f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java
index f94e27536d..fd3f260ce9 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java
index af5605ff0c..dc331aafdf 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OidcPrompt.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OidcPrompt.java
index 785258df11..937c696625 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OidcPrompt.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OidcPrompt.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/PublicClientAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/PublicClientAuthenticationProvider.java
index bf092a9e26..0b486c373d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/PublicClientAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/PublicClientAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509ClientCertificateAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509ClientCertificateAuthenticationProvider.java
index c455443ba1..7d95ed092b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509ClientCertificateAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509ClientCertificateAuthenticationProvider.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509SelfSignedCertificateVerifier.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509SelfSignedCertificateVerifier.java
index c5ff051ee4..252b4ac878 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509SelfSignedCertificateVerifier.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509SelfSignedCertificateVerifier.java
@@ -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> {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/InMemoryRegisteredClientRepository.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/InMemoryRegisteredClientRepository.java
index 46c8ad62da..3cc4f4d42a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/InMemoryRegisteredClientRepository.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/InMemoryRegisteredClientRepository.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java
index 97f625b2a2..e4f8161584 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java
index 7d7bd70d2d..7edab94097 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java
@@ -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);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClientRepository.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClientRepository.java
index 653d6c401d..450a4bca59 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClientRepository.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClientRepository.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
index 8b697938ad..3103b59124 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
@@ -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)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java
index 28dc858104..2c59086a79 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AbstractOAuth2Configurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AbstractOAuth2Configurer.java
index 7a976802b8..d84ba1c93f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AbstractOAuth2Configurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AbstractOAuth2Configurer.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AuthorizationServerContextFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AuthorizationServerContextFilter.java
index b941426423..7e15ecd977 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AuthorizationServerContextFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AuthorizationServerContextFilter.java
@@ -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
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java
index 369f4ed7c0..5a67c47c84 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java
@@ -45,7 +45,7 @@ import org.springframework.util.CollectionUtils;
 /**
  * @author Joe Grandja
  * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
  */
 final class DefaultOAuth2TokenCustomizers {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java
index d2d6009475..19dbb21c6d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
index 21ad461982..f4df73cf06 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataEndpointConfigurer.java
index 3c6565e6e7..3687cf36b4 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientAuthenticationConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientAuthenticationConfigurer.java
index c4cc81342e..135e18bf41 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientAuthenticationConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientAuthenticationConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ConfigurerUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ConfigurerUtils.java
index 6151b677b4..5fc47988df 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ConfigurerUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ConfigurerUtils.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceAuthorizationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceAuthorizationEndpointConfigurer.java
index 57a3551c64..9a51e0685d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceAuthorizationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceAuthorizationEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceVerificationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceVerificationEndpointConfigurer.java
index ca936998e5..2a8ac2ac8f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceVerificationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2DeviceVerificationEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2PushedAuthorizationRequestEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2PushedAuthorizationRequestEndpointConfigurer.java
index 8805e7f261..1880850a35 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2PushedAuthorizationRequestEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2PushedAuthorizationRequestEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenEndpointConfigurer.java
index 28737961d6..5261bbe0c8 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenEndpointConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionEndpointConfigurer.java
index 20092be94b..53126cd0f7 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionEndpointConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationEndpointConfigurer.java
index 8b23130b8d..3ea0ea9502 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationEndpointConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationEndpointConfigurer.java
index e8a59f1256..ff43247181 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationEndpointConfigurer.java
@@ -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) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcConfigurer.java
index 2512de93c4..79f8858411 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcConfigurer.java
@@ -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));
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcLogoutEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcLogoutEndpointConfigurer.java
index 0fbb15b772..da762eecf5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcLogoutEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcLogoutEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationEndpointConfigurer.java
index 23e4635a0f..91807f65f0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationEndpointConfigurer.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoEndpointConfigurer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoEndpointConfigurer.java
index db2b7a93d4..e12dded7f3 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoEndpointConfigurer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoEndpointConfigurer.java
@@ -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;
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContext.java
index d829c9ac21..57c4d1a1b0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContext.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContextHolder.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContextHolder.java
index a20067b65c..1e3f5b6c12 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContextHolder.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/AuthorizationServerContextHolder.java
@@ -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 {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
index 198ff6d9d5..b9dbbee9c5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/context/Context.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java
index 105226b706..e8db55e819 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java
@@ -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 {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2AuthorizationServerMetadataHttpMessageConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2AuthorizationServerMetadataHttpMessageConverter.java
index 97b7cb9c6e..9a9a660870 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2AuthorizationServerMetadataHttpMessageConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2AuthorizationServerMetadataHttpMessageConverter.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2TokenIntrospectionHttpMessageConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2TokenIntrospectionHttpMessageConverter.java
index 28f6ebe36c..9f553475c2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2TokenIntrospectionHttpMessageConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/http/converter/OAuth2TokenIntrospectionHttpMessageConverter.java
@@ -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
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/DurationMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/DurationMixin.java
index 01b2a319b3..0825283190 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/DurationMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/DurationMixin.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
  * This mixin class is used to serialize/deserialize {@link Duration}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see Duration
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/HashSetMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/HashSetMixin.java
index ca22c0c72b..55a45ed516 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/HashSetMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/HashSetMixin.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
  * This mixin class is used to serialize/deserialize {@link HashSet}.
  *
  * @author Steve Riesenberg
- * @since 0.1.2
+ * @since 7.0
  * @see HashSet
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JsonNodeUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JsonNodeUtils.java
index 1d53d70362..b2ffb6b7a0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JsonNodeUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JsonNodeUtils.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * Utility class for {@code JsonNode}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  */
 abstract class JsonNodeUtils {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JwsAlgorithmMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JwsAlgorithmMixin.java
index df53830300..360cdcd2c6 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JwsAlgorithmMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/JwsAlgorithmMixin.java
@@ -25,7 +25,7 @@ import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
  * This mixin class is used to serialize/deserialize {@link SignatureAlgorithm}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see SignatureAlgorithm
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestDeserializer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestDeserializer.java
index e1b8c11828..9cb47faf82 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestDeserializer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestDeserializer.java
@@ -33,7 +33,7 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequ
  * A {@code JsonDeserializer} for {@link OAuth2AuthorizationRequest}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see OAuth2AuthorizationRequest
  * @see OAuth2AuthorizationRequestMixin
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestMixin.java
index 424488efce..3cabb43c53 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestMixin.java
@@ -28,7 +28,7 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequ
  * It also registers a custom deserializer {@link OAuth2AuthorizationRequestDeserializer}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see OAuth2AuthorizationRequest
  * @see OAuth2AuthorizationRequestDeserializer
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java
index 568d0cb349..0b058651f0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java
@@ -60,7 +60,7 @@ import org.springframework.security.oauth2.server.authorization.settings.OAuth2T
  * of all security modules.
  *
  * @author Steve Riesenberg
- * @since 0.1.2
+ * @since 7.0
  * @see SecurityJackson2Modules
  * @see UnmodifiableMapMixin
  * @see HashSetMixin
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeActorMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeActorMixin.java
index db5a8f5087..28efca7d92 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeActorMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeActorMixin.java
@@ -30,7 +30,7 @@ import org.springframework.security.oauth2.server.authorization.authentication.O
  * This mixin class is used to serialize/deserialize {@link OAuth2TokenExchangeActor}.
  *
  * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
  * @see OAuth2TokenExchangeActor
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeCompositeAuthenticationTokenMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeCompositeAuthenticationTokenMixin.java
index 3db54d28da..1659f2c109 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeCompositeAuthenticationTokenMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenExchangeCompositeAuthenticationTokenMixin.java
@@ -32,7 +32,7 @@ import org.springframework.security.oauth2.server.authorization.authentication.O
  * {@link OAuth2TokenExchangeCompositeAuthenticationToken}.
  *
  * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
  * @see OAuth2TokenExchangeCompositeAuthenticationToken
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenFormatMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenFormatMixin.java
index 935cfd1683..12b9223e9e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenFormatMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenFormatMixin.java
@@ -27,7 +27,7 @@ import org.springframework.security.oauth2.server.authorization.settings.OAuth2T
  * This mixin class is used to serialize/deserialize {@link OAuth2TokenFormat}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenFormat
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/StringArrayMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/StringArrayMixin.java
index 28a5641562..0ff5272666 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/StringArrayMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/StringArrayMixin.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
  * This mixin class is used to serialize/deserialize {@link String} array.
  *
  * @author Nikola Jovanovic
- * @since 1.2.6
+ * @since 7.0
  * @see String
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapDeserializer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapDeserializer.java
index 275cea4565..33dcf91290 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapDeserializer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapDeserializer.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * A {@code JsonDeserializer} for {@link Collections#unmodifiableMap(Map)}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see Collections#unmodifiableMap(Map)
  * @see UnmodifiableMapMixin
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapMixin.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapMixin.java
index 4636d68290..fabe1d3a99 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapMixin.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/UnmodifiableMapMixin.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
  * {@link UnmodifiableMapDeserializer}.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see Collections#unmodifiableMap(Map)
  * @see UnmodifiableMapDeserializer
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimAccessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimAccessor.java
index 2ea6b2d037..2e0f9ed40c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimAccessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimAccessor.java
@@ -33,7 +33,7 @@ import org.springframework.security.oauth2.jwt.Jwt;
  *
  * @author Ovidiu Popa
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  * @see ClaimAccessor
  * @see OidcClientMetadataClaimNames
  * @see OidcClientRegistration
@@ -104,7 +104,6 @@ public interface OidcClientMetadataClaimAccessor extends ClaimAccessor {
 	 * 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 post logout redirection {@code URI} values used by the Client
-	 * @since 1.1
 	 */
 	default List<String> getPostLogoutRedirectUris() {
 		return getClaimAsStringList(OidcClientMetadataClaimNames.POST_LOGOUT_REDIRECT_URIS);
@@ -127,7 +126,6 @@ public interface OidcClientMetadataClaimAccessor extends ClaimAccessor {
 	 * authentication methods {@code (token_endpoint_auth_signing_alg)}.
 	 * @return the {@link JwsAlgorithm JWS} algorithm that must be used for signing the
 	 * {@link Jwt JWT} used to authenticate the Client at the Token Endpoint
-	 * @since 0.2.2
 	 */
 	default String getTokenEndpointAuthenticationSigningAlgorithm() {
 		return getClaimAsString(OidcClientMetadataClaimNames.TOKEN_ENDPOINT_AUTH_SIGNING_ALG);
@@ -166,7 +164,6 @@ public interface OidcClientMetadataClaimAccessor extends ClaimAccessor {
 	/**
 	 * Returns the {@code URL} for the Client's JSON Web Key Set {@code (jwks_uri)}.
 	 * @return the {@code URL} for the Client's JSON Web Key Set {@code (jwks_uri)}
-	 * @since 0.2.2
 	 */
 	default URL getJwkSetUrl() {
 		return getClaimAsURL(OidcClientMetadataClaimNames.JWKS_URI);
@@ -188,7 +185,6 @@ public interface OidcClientMetadataClaimAccessor extends ClaimAccessor {
 	 * Endpoint.
 	 * @return the Registration Access Token that can be used at the Client Configuration
 	 * Endpoint
-	 * @since 0.2.1
 	 */
 	default String getRegistrationAccessToken() {
 		return getClaimAsString(OidcClientMetadataClaimNames.REGISTRATION_ACCESS_TOKEN);
@@ -199,7 +195,6 @@ public interface OidcClientMetadataClaimAccessor extends ClaimAccessor {
 	 * Access Token can be used.
 	 * @return the {@code URL} of the Client Configuration Endpoint where the Registration
 	 * Access Token can be used
-	 * @since 0.2.1
 	 */
 	default URL getRegistrationClientUrl() {
 		return getClaimAsURL(OidcClientMetadataClaimNames.REGISTRATION_CLIENT_URI);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimNames.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimNames.java
index db25026870..b122b1c94b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimNames.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientMetadataClaimNames.java
@@ -27,7 +27,7 @@ import org.springframework.security.oauth2.jwt.Jwt;
  *
  * @author Ovidiu Popa
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  * @see <a target="_blank" href=
  * "https://openid.net/specs/openid-connect-registration-1_0.html#ClientMetadata">2.
  * Client Metadata</a>
@@ -73,7 +73,6 @@ public final class OidcClientMetadataClaimNames {
 	 * used by the Client. The {@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.
-	 * @since 1.1
 	 */
 	public static final String POST_LOGOUT_REDIRECT_URIS = "post_logout_redirect_uris";
 
@@ -89,7 +88,6 @@ public final class OidcClientMetadataClaimNames {
 	 * at the Token Endpoint for the {@link ClientAuthenticationMethod#PRIVATE_KEY_JWT
 	 * private_key_jwt} and {@link ClientAuthenticationMethod#CLIENT_SECRET_JWT
 	 * client_secret_jwt} authentication methods
-	 * @since 0.2.2
 	 */
 	public static final String TOKEN_ENDPOINT_AUTH_SIGNING_ALG = "token_endpoint_auth_signing_alg";
 
@@ -113,7 +111,6 @@ public final class OidcClientMetadataClaimNames {
 
 	/**
 	 * {@code jwks_uri} - the {@code URL} for the Client's JSON Web Key Set
-	 * @since 0.2.2
 	 */
 	public static final String JWKS_URI = "jwks_uri";
 
@@ -126,14 +123,12 @@ public final class OidcClientMetadataClaimNames {
 	/**
 	 * {@code registration_access_token} - the Registration Access Token that can be used
 	 * at the Client Configuration Endpoint
-	 * @since 0.2.1
 	 */
 	public static final String REGISTRATION_ACCESS_TOKEN = "registration_access_token";
 
 	/**
 	 * {@code registration_client_uri} - the {@code URL} of the Client Configuration
 	 * Endpoint where the Registration Access Token can be used
-	 * @since 0.2.1
 	 */
 	public static final String REGISTRATION_CLIENT_URI = "registration_client_uri";
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java
index 5873dc3a7d..c51cfb3fad 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  *
  * @author Ovidiu Popa
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  * @see OidcClientMetadataClaimAccessor
  * @see <a target="_blank" href=
  * "https://openid.net/specs/openid-connect-registration-1_0.html#RegistrationRequest">3.1.
@@ -181,7 +181,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * @param postLogoutRedirectUri the post logout redirection {@code URI} used by
 		 * the Client
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder postLogoutRedirectUri(String postLogoutRedirectUri) {
 			addClaimToClaimList(OidcClientMetadataClaimNames.POST_LOGOUT_REDIRECT_URIS, postLogoutRedirectUri);
@@ -194,7 +193,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * @param postLogoutRedirectUrisConsumer a {@code Consumer} of the post logout
 		 * redirection {@code URI} values used by the Client
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder postLogoutRedirectUris(Consumer<List<String>> postLogoutRedirectUrisConsumer) {
 			acceptClaimValues(OidcClientMetadataClaimNames.POST_LOGOUT_REDIRECT_URIS, postLogoutRedirectUrisConsumer);
@@ -222,7 +220,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * that must be used for signing the {@link Jwt JWT} used to authenticate the
 		 * Client at the Token Endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.2
 		 */
 		public Builder tokenEndpointAuthenticationSigningAlgorithm(String authenticationSigningAlgorithm) {
 			return claim(OidcClientMetadataClaimNames.TOKEN_ENDPOINT_AUTH_SIGNING_ALG, authenticationSigningAlgorithm);
@@ -307,7 +304,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * Sets the {@code URL} for the Client's JSON Web Key Set, OPTIONAL.
 		 * @param jwkSetUrl the {@code URL} for the Client's JSON Web Key Set
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.2
 		 */
 		public Builder jwkSetUrl(String jwkSetUrl) {
 			return claim(OidcClientMetadataClaimNames.JWKS_URI, jwkSetUrl);
@@ -331,7 +327,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * @param registrationAccessToken the Registration Access Token that can be used
 		 * at the Client Configuration Endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.1
 		 */
 		public Builder registrationAccessToken(String registrationAccessToken) {
 			return claim(OidcClientMetadataClaimNames.REGISTRATION_ACCESS_TOKEN, registrationAccessToken);
@@ -343,7 +338,6 @@ public final class OidcClientRegistration implements OidcClientMetadataClaimAcce
 		 * @param registrationClientUrl the {@code URL} of the Client Configuration
 		 * Endpoint where the Registration Access Token can be used
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.1
 		 */
 		public Builder registrationClientUrl(String registrationClientUrl) {
 			return claim(OidcClientMetadataClaimNames.REGISTRATION_CLIENT_URI, registrationClientUrl);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderConfiguration.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderConfiguration.java
index 882c464f1b..e1f8106225 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderConfiguration.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see AbstractOAuth2AuthorizationServerMetadata
  * @see OidcProviderMetadataClaimAccessor
  * @see <a target="_blank" href=
@@ -132,7 +132,6 @@ public final class OidcProviderConfiguration extends AbstractOAuth2Authorization
 		 * @param userInfoEndpoint the {@code URL} of the OpenID Connect 1.0 UserInfo
 		 * Endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.2
 		 */
 		public Builder userInfoEndpoint(String userInfoEndpoint) {
 			return claim(OidcProviderMetadataClaimNames.USER_INFO_ENDPOINT, userInfoEndpoint);
@@ -144,7 +143,6 @@ public final class OidcProviderConfiguration extends AbstractOAuth2Authorization
 		 * @param endSessionEndpoint the {@code URL} of the OpenID Connect 1.0 End Session
 		 * Endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder endSessionEndpoint(String endSessionEndpoint) {
 			return claim(OidcProviderMetadataClaimNames.END_SESSION_ENDPOINT, endSessionEndpoint);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimAccessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimAccessor.java
index 540858c917..e8cc668c93 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimAccessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimAccessor.java
@@ -31,7 +31,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see ClaimAccessor
  * @see OAuth2AuthorizationServerMetadataClaimAccessor
  * @see OidcProviderMetadataClaimNames
@@ -65,7 +65,6 @@ public interface OidcProviderMetadataClaimAccessor extends OAuth2AuthorizationSe
 	 * Returns the {@code URL} of the OpenID Connect 1.0 UserInfo Endpoint
 	 * {@code (userinfo_endpoint)}.
 	 * @return the {@code URL} of the OpenID Connect 1.0 UserInfo Endpoint
-	 * @since 0.2.2
 	 */
 	default URL getUserInfoEndpoint() {
 		return getClaimAsURL(OidcProviderMetadataClaimNames.USER_INFO_ENDPOINT);
@@ -75,7 +74,6 @@ public interface OidcProviderMetadataClaimAccessor extends OAuth2AuthorizationSe
 	 * Returns the {@code URL} of the OpenID Connect 1.0 End Session Endpoint
 	 * {@code (end_session_endpoint)}.
 	 * @return the {@code URL} of the OpenID Connect 1.0 End Session Endpoint
-	 * @since 1.1
 	 */
 	default URL getEndSessionEndpoint() {
 		return getClaimAsURL(OidcProviderMetadataClaimNames.END_SESSION_ENDPOINT);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimNames.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimNames.java
index 6c224bc2a8..bff7280614 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimNames.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcProviderMetadataClaimNames.java
@@ -26,7 +26,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see OAuth2AuthorizationServerMetadataClaimNames
  * @see <a target="_blank" href=
  * "https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata">3. OpenID
@@ -48,14 +48,12 @@ public final class OidcProviderMetadataClaimNames extends OAuth2AuthorizationSer
 	/**
 	 * {@code userinfo_endpoint} - the {@code URL} of the OpenID Connect 1.0 UserInfo
 	 * Endpoint
-	 * @since 0.2.2
 	 */
 	public static final String USER_INFO_ENDPOINT = "userinfo_endpoint";
 
 	/**
 	 * {@code end_session_endpoint} - the {@code URL} of the OpenID Connect 1.0 End
 	 * Session Endpoint
-	 * @since 1.1
 	 */
 	public static final String END_SESSION_ENDPOINT = "end_session_endpoint";
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcAuthenticationProviderUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcAuthenticationProviderUtils.java
index 4ac1810939..ab8a3091e2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcAuthenticationProviderUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcAuthenticationProviderUtils.java
@@ -28,7 +28,7 @@ import org.springframework.security.oauth2.server.authorization.token.OAuth2Toke
  * Utility methods for the OpenID Connect 1.0 {@link AuthenticationProvider}'s.
  *
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  */
 final class OidcAuthenticationProviderUtils {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientConfigurationAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientConfigurationAuthenticationProvider.java
index b4b7651770..588a1e784a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientConfigurationAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientConfigurationAuthenticationProvider.java
@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
  * @author Joe Grandja
  * @author Rafal Lewczuk
  * @author Dmitriy Dubson
- * @since 0.4.0
+ * @since 7.0
  * @see RegisteredClientRepository
  * @see OAuth2AuthorizationService
  * @see OidcClientRegistrationAuthenticationToken
@@ -91,7 +91,6 @@ public final class OidcClientConfigurationAuthenticationProvider implements Auth
 	 * {@link OidcClientRegistration}.
 	 * @param clientRegistrationConverter the {@link Converter} used for converting a
 	 * {@link RegisteredClient} to an {@link OidcClientRegistration}
-	 * @since 1.2.0
 	 */
 	public void setClientRegistrationConverter(
 			Converter<RegisteredClient, OidcClientRegistration> clientRegistrationConverter) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java
index 52d1a88ae8..b402f306d7 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java
@@ -71,7 +71,7 @@ import org.springframework.util.StringUtils;
  * @author Joe Grandja
  * @author Rafal Lewczuk
  * @author Dmitriy Dubson
- * @since 0.1.1
+ * @since 7.0
  * @see RegisteredClientRepository
  * @see OAuth2AuthorizationService
  * @see OAuth2TokenGenerator
@@ -108,7 +108,6 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
 	 * @param registeredClientRepository the repository of registered clients
 	 * @param authorizationService the authorization service
 	 * @param tokenGenerator the token generator
-	 * @since 0.2.3
 	 */
 	public OidcClientRegistrationAuthenticationProvider(RegisteredClientRepository registeredClientRepository,
 			OAuth2AuthorizationService authorizationService,
@@ -176,7 +175,6 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
 	 * a {@link RegisteredClient}.
 	 * @param registeredClientConverter the {@link Converter} used for converting an
 	 * {@link OidcClientRegistration} to a {@link RegisteredClient}
-	 * @since 0.4.0
 	 */
 	public void setRegisteredClientConverter(
 			Converter<OidcClientRegistration, RegisteredClient> registeredClientConverter) {
@@ -189,7 +187,6 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
 	 * {@link OidcClientRegistration}.
 	 * @param clientRegistrationConverter the {@link Converter} used for converting a
 	 * {@link RegisteredClient} to an {@link OidcClientRegistration}
-	 * @since 1.2.0
 	 */
 	public void setClientRegistrationConverter(
 			Converter<RegisteredClient, OidcClientRegistration> clientRegistrationConverter) {
@@ -203,7 +200,6 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
 	 * secret will be encoded using
 	 * {@link PasswordEncoderFactories#createDelegatingPasswordEncoder()}.
 	 * @param passwordEncoder the {@link PasswordEncoder} used to encode the client secret
-	 * @since 1.1.0
 	 */
 	public void setPasswordEncoder(PasswordEncoder passwordEncoder) {
 		Assert.notNull(passwordEncoder, "passwordEncoder cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java
index a498646aba..11961eb56e 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  *
  * @author Joe Grandja
  * @author Ovidiu Popa
- * @since 0.1.1
+ * @since 7.0
  * @see AbstractAuthenticationToken
  * @see OidcClientRegistration
  * @see OidcClientRegistrationAuthenticationProvider
@@ -70,7 +70,6 @@ public class OidcClientRegistrationAuthenticationToken extends AbstractAuthentic
 	 * parameters.
 	 * @param principal the authenticated principal
 	 * @param clientId the client identifier
-	 * @since 0.2.1
 	 */
 	public OidcClientRegistrationAuthenticationToken(Authentication principal, String clientId) {
 		super(Collections.emptyList());
@@ -103,7 +102,6 @@ public class OidcClientRegistrationAuthenticationToken extends AbstractAuthentic
 	/**
 	 * Returns the client identifier.
 	 * @return the client identifier
-	 * @since 0.2.1
 	 */
 	@Nullable
 	public String getClientId() {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationContext.java
index dcbf9488c2..e8e2c4460d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationContext.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * validating the OpenID Connect RP-Initiated Logout Request parameters.
  *
  * @author Daniel Garnier-Moiroux
- * @since 1.4
+ * @since 7.0
  * @see OAuth2AuthenticationContext
  * @see OidcLogoutAuthenticationToken
  * @see OidcLogoutAuthenticationProvider#setAuthenticationValidator(Consumer)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationProvider.java
index b043dfece4..5d26b2721c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationProvider.java
@@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
  * Logout Endpoint.
  *
  * @author Joe Grandja
- * @since 1.1
+ * @since 7.0
  * @see RegisteredClientRepository
  * @see OAuth2AuthorizationService
  * @see SessionRegistry
@@ -199,7 +199,6 @@ public final class OidcLogoutAuthenticationProvider implements AuthenticationPro
 	 * @param authenticationValidator the {@code Consumer} providing access to the
 	 * {@link OidcLogoutAuthenticationContext} and is responsible for validating specific
 	 * OpenID Connect RP-Initiated Logout Request parameters
-	 * @since 1.4
 	 */
 	public void setAuthenticationValidator(Consumer<OidcLogoutAuthenticationContext> authenticationValidator) {
 		Assert.notNull(authenticationValidator, "authenticationValidator cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationToken.java
index b0190da3cb..07b82a00a0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationToken.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * Logout Endpoint.
  *
  * @author Joe Grandja
- * @since 1.1
+ * @since 7.0
  * @see AbstractAuthenticationToken
  * @see OidcLogoutAuthenticationProvider
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationValidator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationValidator.java
index 30d67c4f8b..6ceb32b2ed 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationValidator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcLogoutAuthenticationValidator.java
@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
  * an {@link OAuth2AuthenticationException} is thrown.
  *
  * @author Daniel Garnier-Moiroux
- * @since 1.4
+ * @since 7.0
  * @see OidcLogoutAuthenticationContext
  * @see OidcLogoutAuthenticationToken
  * @see OidcLogoutAuthenticationProvider#setAuthenticationValidator(Consumer)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationContext.java
index a5c1c2955d..27382ec49a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationContext.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  * mapping claims to an instance of {@link OidcUserInfo}.
  *
  * @author Joe Grandja
- * @since 0.2.1
+ * @since 7.0
  * @see OAuth2AuthenticationContext
  * @see OidcUserInfo
  * @see OidcUserInfoAuthenticationProvider#setUserInfoMapper(Function)
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProvider.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProvider.java
index 576dee0565..e7b96a3b58 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProvider.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProvider.java
@@ -48,7 +48,7 @@ import org.springframework.util.Assert;
  * Endpoint.
  *
  * @author Steve Riesenberg
- * @since 0.2.1
+ * @since 7.0
  * @see OAuth2AuthorizationService
  * @see <a href="https://openid.net/specs/openid-connect-core-1_0.html#UserInfo">5.3.
  * UserInfo Endpoint</a>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java
index 179a1a2fa2..a6f7ce07ab 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * An {@link Authentication} implementation used for OpenID Connect 1.0 UserInfo Endpoint.
  *
  * @author Steve Riesenberg
- * @since 0.2.1
+ * @since 7.0
  * @see AbstractAuthenticationToken
  * @see OidcUserInfo
  * @see OidcUserInfoAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/OidcClientRegistrationRegisteredClientConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/OidcClientRegistrationRegisteredClientConverter.java
index 3be8312f9c..e885ea210a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/OidcClientRegistrationRegisteredClientConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/OidcClientRegistrationRegisteredClientConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils;
  *
  * @author Joe Grandja
  * @author Dmitriy Dubson
- * @since 1.2.0
+ * @since 7.0
  */
 public final class OidcClientRegistrationRegisteredClientConverter
 		implements Converter<OidcClientRegistration, RegisteredClient> {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/RegisteredClientOidcClientRegistrationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/RegisteredClientOidcClientRegistrationConverter.java
index b3cb97fdf6..77e9e8a269 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/RegisteredClientOidcClientRegistrationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/converter/RegisteredClientOidcClientRegistrationConverter.java
@@ -33,7 +33,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * {@link OidcClientRegistration}.
  *
  * @author Joe Grandja
- * @since 1.2.0
+ * @since 7.0
  */
 public final class RegisteredClientOidcClientRegistrationConverter
 		implements Converter<RegisteredClient, OidcClientRegistration> {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java
index ef75f8e370..e277b3fcdc 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java
@@ -28,7 +28,7 @@ import org.springframework.util.ClassUtils;
  *
  * @author Joe Grandja
  * @author l uamas
- * @since 0.1.0
+ * @since 7.0
  */
 final class HttpMessageConverters {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverter.java
index f193997c00..37c741d886 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverter.java
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Ovidiu Popa
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  * @see AbstractHttpMessageConverter
  * @see OidcClientRegistration
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcProviderConfigurationHttpMessageConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcProviderConfigurationHttpMessageConverter.java
index 9c6efdd35e..99a138d9c0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcProviderConfigurationHttpMessageConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcProviderConfigurationHttpMessageConverter.java
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  * Configuration Response}.
  *
  * @author Daniel Garnier-Moiroux
- * @since 0.1.0
+ * @since 7.0
  * @see AbstractHttpMessageConverter
  * @see OidcProviderConfiguration
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcUserInfoHttpMessageConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcUserInfoHttpMessageConverter.java
index b3a2be6db6..86f8867665 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcUserInfoHttpMessageConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcUserInfoHttpMessageConverter.java
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  *
  * @author Ido Salomon
  * @author Steve Riesenberg
- * @since 0.2.1
+ * @since 7.0
  * @see AbstractHttpMessageConverter
  * @see OidcUserInfo
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java
index b1bdc9c7cf..adfe3b6fe2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java
@@ -61,7 +61,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @author Ovidiu Popa
  * @author Joe Grandja
  * @author Daniel Garnier-Moiroux
- * @since 0.1.1
+ * @since 7.0
  * @see OidcClientRegistration
  * @see OidcClientRegistrationAuthenticationConverter
  * @see OidcClientRegistrationAuthenticationProvider
@@ -178,7 +178,6 @@ public final class OidcClientRegistrationEndpointFilter extends OncePerRequestFi
 	 * request.
 	 * @param authenticationConverter an {@link AuthenticationConverter} used when
 	 * attempting to extract a Client Registration Request from {@link HttpServletRequest}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) {
 		Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
@@ -191,7 +190,6 @@ public final class OidcClientRegistrationEndpointFilter extends OncePerRequestFi
 	 * {@link OidcClientRegistration Client Registration Response}.
 	 * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used
 	 * for handling an {@link OidcClientRegistrationAuthenticationToken}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) {
 		Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null");
@@ -204,7 +202,6 @@ public final class OidcClientRegistrationEndpointFilter extends OncePerRequestFi
 	 * Response}.
 	 * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used
 	 * for handling an {@link OAuth2AuthenticationException}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) {
 		Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcLogoutEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcLogoutEndpointFilter.java
index 81347a8152..c9333749b1 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcLogoutEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcLogoutEndpointFilter.java
@@ -49,7 +49,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * A {@code Filter} that processes OpenID Connect 1.0 RP-Initiated Logout Requests.
  *
  * @author Joe Grandja
- * @since 1.1
+ * @since 7.0
  * @see OidcLogoutAuthenticationConverter
  * @see OidcLogoutAuthenticationSuccessHandler
  * @see OidcLogoutAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java
index 79c42564a8..c2f39bb00f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java
@@ -50,7 +50,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see OidcProviderConfiguration
  * @see AuthorizationServerSettings
  * @see <a target="_blank" href=
@@ -77,7 +77,6 @@ public final class OidcProviderConfigurationEndpointFilter extends OncePerReques
 	 * claims of the OpenID Provider's configuration.
 	 * @param providerConfigurationCustomizer the {@code Consumer} providing access to the
 	 * {@link OidcProviderConfiguration.Builder}
-	 * @since 0.4.0
 	 */
 	public void setProviderConfigurationCustomizer(
 			Consumer<OidcProviderConfiguration.Builder> providerConfigurationCustomizer) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilter.java
index 4520ad0f60..cc00e80743 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilter.java
@@ -55,7 +55,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @author Ido Salomon
  * @author Steve Riesenberg
  * @author Daniel Garnier-Moiroux
- * @since 0.2.1
+ * @since 7.0
  * @see OidcUserInfo
  * @see OidcUserInfoAuthenticationProvider
  * @see <a href="https://openid.net/specs/openid-connect-core-1_0.html#UserInfo">5.3.
@@ -149,7 +149,6 @@ public final class OidcUserInfoEndpointFilter extends OncePerRequestFilter {
 	 * {@link OidcUserInfoAuthenticationToken} used for authenticating the request.
 	 * @param authenticationConverter the {@link AuthenticationConverter} used when
 	 * attempting to extract an UserInfo Request from {@link HttpServletRequest}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) {
 		Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
@@ -162,7 +161,6 @@ public final class OidcUserInfoEndpointFilter extends OncePerRequestFilter {
 	 * UserInfo Response}.
 	 * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used
 	 * for handling an {@link OidcUserInfoAuthenticationToken}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) {
 		Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null");
@@ -175,7 +173,6 @@ public final class OidcUserInfoEndpointFilter extends OncePerRequestFilter {
 	 * Response}.
 	 * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used
 	 * for handling an {@link OAuth2AuthenticationException}
-	 * @since 0.4.0
 	 */
 	public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) {
 		Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OAuth2EndpointUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OAuth2EndpointUtils.java
index 915325f9d5..c4d673e1f7 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OAuth2EndpointUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OAuth2EndpointUtils.java
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Joe Grandja
  * @author Greg Li
- * @since 1.1.4
+ * @since 7.0
  */
 final class OAuth2EndpointUtils {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcClientRegistrationAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcClientRegistrationAuthenticationConverter.java
index 05a79364e4..60891d3f38 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcClientRegistrationAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcClientRegistrationAuthenticationConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  * {@link OidcClientRegistrationAuthenticationToken} used for authenticating the request.
  *
  * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OidcClientRegistrationAuthenticationToken
  * @see OidcClientRegistrationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationConverter.java
index f7cdd08b4c..cc7d8a6c0d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationConverter.java
@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
  * {@link OidcLogoutAuthenticationToken} used for authenticating the request.
  *
  * @author Joe Grandja
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OidcLogoutAuthenticationToken
  * @see OidcLogoutEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationSuccessHandler.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationSuccessHandler.java
index 5940e2d95e..e95548f6ed 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationSuccessHandler.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/authentication/OidcLogoutAuthenticationSuccessHandler.java
@@ -48,7 +48,7 @@ import org.springframework.web.util.UriUtils;
  * RP-Initiated Logout.
  *
  * @author Joe Grandja
- * @since 1.4
+ * @since 7.0
  * @see OidcLogoutEndpointFilter#setAuthenticationSuccessHandler(AuthenticationSuccessHandler)
  * @see LogoutHandler
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java
index 7e8801e256..36cea950ec 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
  * Base implementation for configuration settings.
  *
  * @author Joe Grandja
- * @since 0.0.2
+ * @since 7.0
  */
 public abstract class AbstractSettings implements Serializable {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AuthorizationServerSettings.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AuthorizationServerSettings.java
index 0f5f041725..deeaef0429 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AuthorizationServerSettings.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AuthorizationServerSettings.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see AbstractSettings
  * @see ConfigurationSettingNames.AuthorizationServer
  */
@@ -61,7 +61,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 	 * </ul>
 	 * @return {@code true} if multiple issuers are allowed per host, {@code false}
 	 * otherwise
-	 * @since 1.3
 	 * @see AuthorizationServerContext#getIssuer()
 	 */
 	public boolean isMultipleIssuersAllowed() {
@@ -81,7 +80,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 	 * Returns the OAuth 2.0 Pushed Authorization Request endpoint. The default is
 	 * {@code /oauth2/par}.
 	 * @return the Pushed Authorization Request endpoint
-	 * @since 1.5
 	 */
 	public String getPushedAuthorizationRequestEndpoint() {
 		return getSetting(ConfigurationSettingNames.AuthorizationServer.PUSHED_AUTHORIZATION_REQUEST_ENDPOINT);
@@ -91,7 +89,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 	 * Returns the OAuth 2.0 Device Authorization endpoint. The default is
 	 * {@code /oauth2/device_authorization}.
 	 * @return the Device Authorization endpoint
-	 * @since 1.1
 	 */
 	public String getDeviceAuthorizationEndpoint() {
 		return getSetting(ConfigurationSettingNames.AuthorizationServer.DEVICE_AUTHORIZATION_ENDPOINT);
@@ -101,7 +98,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 	 * Returns the OAuth 2.0 Device Verification endpoint. The default is
 	 * {@code /oauth2/device_verification}.
 	 * @return the Device Verification endpoint
-	 * @since 1.1
 	 */
 	public String getDeviceVerificationEndpoint() {
 		return getSetting(ConfigurationSettingNames.AuthorizationServer.DEVICE_VERIFICATION_ENDPOINT);
@@ -162,7 +158,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 	 * Returns the OpenID Connect 1.0 Logout endpoint. The default is
 	 * {@code /connect/logout}.
 	 * @return the OpenID Connect 1.0 Logout endpoint
-	 * @since 1.1
 	 */
 	public String getOidcLogoutEndpoint() {
 		return getSetting(ConfigurationSettingNames.AuthorizationServer.OIDC_LOGOUT_ENDPOINT);
@@ -235,7 +230,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 		 * @param multipleIssuersAllowed {@code true} if multiple issuers are allowed per
 		 * host, {@code false} otherwise
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.3
 		 * @see AuthorizationServerContext#getIssuer()
 		 */
 		public Builder multipleIssuersAllowed(boolean multipleIssuersAllowed) {
@@ -257,7 +251,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 		 * @param pushedAuthorizationRequestEndpoint the Pushed Authorization Request
 		 * endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.5
 		 */
 		public Builder pushedAuthorizationRequestEndpoint(String pushedAuthorizationRequestEndpoint) {
 			return setting(ConfigurationSettingNames.AuthorizationServer.PUSHED_AUTHORIZATION_REQUEST_ENDPOINT,
@@ -268,7 +261,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 		 * Sets the OAuth 2.0 Device Authorization endpoint.
 		 * @param deviceAuthorizationEndpoint the Device Authorization endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder deviceAuthorizationEndpoint(String deviceAuthorizationEndpoint) {
 			return setting(ConfigurationSettingNames.AuthorizationServer.DEVICE_AUTHORIZATION_ENDPOINT,
@@ -279,7 +271,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 		 * Sets the OAuth 2.0 Device Verification endpoint.
 		 * @param deviceVerificationEndpoint the Device Verification endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder deviceVerificationEndpoint(String deviceVerificationEndpoint) {
 			return setting(ConfigurationSettingNames.AuthorizationServer.DEVICE_VERIFICATION_ENDPOINT,
@@ -348,7 +339,6 @@ public final class AuthorizationServerSettings extends AbstractSettings {
 		 * Sets the OpenID Connect 1.0 Logout endpoint.
 		 * @param oidcLogoutEndpoint the OpenID Connect 1.0 Logout endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder oidcLogoutEndpoint(String oidcLogoutEndpoint) {
 			return setting(ConfigurationSettingNames.AuthorizationServer.OIDC_LOGOUT_ENDPOINT, oidcLogoutEndpoint);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ClientSettings.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ClientSettings.java
index 9232281823..fce4baf700 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ClientSettings.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ClientSettings.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * A facility for client configuration settings.
  *
  * @author Joe Grandja
- * @since 0.0.2
+ * @since 7.0
  * @see AbstractSettings
  * @see ConfigurationSettingNames.Client
  */
@@ -65,7 +65,6 @@ public final class ClientSettings extends AbstractSettings {
 	/**
 	 * Returns the {@code URL} for the Client's JSON Web Key Set.
 	 * @return the {@code URL} for the Client's JSON Web Key Set
-	 * @since 0.2.2
 	 */
 	public String getJwkSetUrl() {
 		return getSetting(ConfigurationSettingNames.Client.JWK_SET_URL);
@@ -79,7 +78,6 @@ public final class ClientSettings extends AbstractSettings {
 	 * authentication methods.
 	 * @return the {@link JwsAlgorithm JWS} algorithm that must be used for signing the
 	 * {@link Jwt JWT} used to authenticate the Client at the Token Endpoint
-	 * @since 0.2.2
 	 */
 	public JwsAlgorithm getTokenEndpointAuthenticationSigningAlgorithm() {
 		return getSetting(ConfigurationSettingNames.Client.TOKEN_ENDPOINT_AUTHENTICATION_SIGNING_ALGORITHM);
@@ -91,7 +89,6 @@ public final class ClientSettings extends AbstractSettings {
 	 * {@code tls_client_auth} method.
 	 * @return the expected subject distinguished name associated to the client
 	 * {@code X509Certificate} received during client authentication
-	 * @since 1.3
 	 */
 	public String getX509CertificateSubjectDN() {
 		return getSetting(ConfigurationSettingNames.Client.X509_CERTIFICATE_SUBJECT_DN);
@@ -150,7 +147,6 @@ public final class ClientSettings extends AbstractSettings {
 		 * Sets the {@code URL} for the Client's JSON Web Key Set.
 		 * @param jwkSetUrl the {@code URL} for the Client's JSON Web Key Set
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.2
 		 */
 		public Builder jwkSetUrl(String jwkSetUrl) {
 			return setting(ConfigurationSettingNames.Client.JWK_SET_URL, jwkSetUrl);
@@ -166,7 +162,6 @@ public final class ClientSettings extends AbstractSettings {
 		 * that must be used for signing the {@link Jwt JWT} used to authenticate the
 		 * Client at the Token Endpoint
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.2
 		 */
 		public Builder tokenEndpointAuthenticationSigningAlgorithm(JwsAlgorithm authenticationSigningAlgorithm) {
 			return setting(ConfigurationSettingNames.Client.TOKEN_ENDPOINT_AUTHENTICATION_SIGNING_ALGORITHM,
@@ -181,7 +176,6 @@ public final class ClientSettings extends AbstractSettings {
 		 * associated to the client {@code X509Certificate} received during client
 		 * authentication * @return the {@link Builder} for further configuration
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.3
 		 */
 		public Builder x509CertificateSubjectDN(String x509CertificateSubjectDN) {
 			return setting(ConfigurationSettingNames.Client.X509_CERTIFICATE_SUBJECT_DN, x509CertificateSubjectDN);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ConfigurationSettingNames.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ConfigurationSettingNames.java
index 4bde37810c..97ff73517d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ConfigurationSettingNames.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ConfigurationSettingNames.java
@@ -26,7 +26,7 @@ import org.springframework.security.oauth2.jwt.Jwt;
  * The names for all the configuration settings.
  *
  * @author Joe Grandja
- * @since 0.2.0
+ * @since 7.0
  */
 public final class ConfigurationSettingNames {
 
@@ -58,7 +58,6 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set the {@code URL} for the Client's JSON Web Key Set.
-		 * @since 0.2.2
 		 */
 		public static final String JWK_SET_URL = CLIENT_SETTINGS_NAMESPACE.concat("jwk-set-url");
 
@@ -68,7 +67,6 @@ public final class ConfigurationSettingNames {
 		 * {@link ClientAuthenticationMethod#PRIVATE_KEY_JWT private_key_jwt} and
 		 * {@link ClientAuthenticationMethod#CLIENT_SECRET_JWT client_secret_jwt}
 		 * authentication methods.
-		 * @since 0.2.2
 		 */
 		public static final String TOKEN_ENDPOINT_AUTHENTICATION_SIGNING_ALGORITHM = CLIENT_SETTINGS_NAMESPACE
 			.concat("token-endpoint-authentication-signing-algorithm");
@@ -77,7 +75,6 @@ public final class ConfigurationSettingNames {
 		 * Set the expected subject distinguished name associated to the client
 		 * {@code X509Certificate} received during client authentication when using the
 		 * {@code tls_client_auth} method.
-		 * @since 1.3
 		 */
 		public static final String X509_CERTIFICATE_SUBJECT_DN = CLIENT_SETTINGS_NAMESPACE
 			.concat("x509-certificate-subject-dn");
@@ -102,7 +99,6 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set to {@code true} if multiple issuers are allowed per host.
-		 * @since 1.3
 		 */
 		public static final String MULTIPLE_ISSUERS_ALLOWED = AUTHORIZATION_SERVER_SETTINGS_NAMESPACE
 			.concat("multiple-issuers-allowed");
@@ -115,7 +111,6 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set the OAuth 2.0 Pushed Authorization Request endpoint.
-		 * @since 1.5
 		 */
 		public static final String PUSHED_AUTHORIZATION_REQUEST_ENDPOINT = AUTHORIZATION_SERVER_SETTINGS_NAMESPACE
 			.concat("pushed-authorization-request-endpoint");
@@ -169,7 +164,6 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set the OpenID Connect 1.0 Logout endpoint.
-		 * @since 1.1
 		 */
 		public static final String OIDC_LOGOUT_ENDPOINT = AUTHORIZATION_SERVER_SETTINGS_NAMESPACE
 			.concat("oidc-logout-endpoint");
@@ -188,7 +182,6 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set the time-to-live for an authorization code.
-		 * @since 0.4.0
 		 */
 		public static final String AUTHORIZATION_CODE_TIME_TO_LIVE = TOKEN_SETTINGS_NAMESPACE
 			.concat("authorization-code-time-to-live");
@@ -201,13 +194,11 @@ public final class ConfigurationSettingNames {
 
 		/**
 		 * Set the {@link OAuth2TokenFormat token format} for an access token.
-		 * @since 0.2.3
 		 */
 		public static final String ACCESS_TOKEN_FORMAT = TOKEN_SETTINGS_NAMESPACE.concat("access-token-format");
 
 		/**
 		 * Set the time-to-live for a device code.
-		 * @since 1.1
 		 */
 		public static final String DEVICE_CODE_TIME_TO_LIVE = TOKEN_SETTINGS_NAMESPACE
 			.concat("device-code-time-to-live");
@@ -235,7 +226,6 @@ public final class ConfigurationSettingNames {
 		 * Set to {@code true} if access tokens must be bound to the client
 		 * {@code X509Certificate} received during client authentication when using the
 		 * {@code tls_client_auth} or {@code self_signed_tls_client_auth} method.
-		 * @since 1.3
 		 */
 		public static final String X509_CERTIFICATE_BOUND_ACCESS_TOKENS = TOKEN_SETTINGS_NAMESPACE
 			.concat("x509-certificate-bound-access-tokens");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java
index 25ec206bcf..ae4a97be2c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
  * Standard data formats for OAuth 2.0 Tokens.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  */
 public final class OAuth2TokenFormat implements Serializable {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettings.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettings.java
index fbd99cedf5..1716679ae1 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettings.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettings.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * A facility for token configuration settings.
  *
  * @author Joe Grandja
- * @since 0.0.2
+ * @since 7.0
  * @see AbstractSettings
  * @see ConfigurationSettingNames.Token
  */
@@ -44,7 +44,6 @@ public final class TokenSettings extends AbstractSettings {
 	/**
 	 * Returns the time-to-live for an authorization code. The default is 5 minutes.
 	 * @return the time-to-live for an authorization code
-	 * @since 0.4.0
 	 */
 	public Duration getAuthorizationCodeTimeToLive() {
 		return getSetting(ConfigurationSettingNames.Token.AUTHORIZATION_CODE_TIME_TO_LIVE);
@@ -62,7 +61,6 @@ public final class TokenSettings extends AbstractSettings {
 	 * Returns the token format for an access token. The default is
 	 * {@link OAuth2TokenFormat#SELF_CONTAINED}.
 	 * @return the token format for an access token
-	 * @since 0.2.3
 	 */
 	public OAuth2TokenFormat getAccessTokenFormat() {
 		return getSetting(ConfigurationSettingNames.Token.ACCESS_TOKEN_FORMAT);
@@ -71,7 +69,6 @@ public final class TokenSettings extends AbstractSettings {
 	/**
 	 * Returns the time-to-live for a device code. The default is 5 minutes.
 	 * @return the time-to-live for a device code
-	 * @since 1.1
 	 */
 	public Duration getDeviceCodeTimeToLive() {
 		return getSetting(ConfigurationSettingNames.Token.DEVICE_CODE_TIME_TO_LIVE);
@@ -114,7 +111,6 @@ public final class TokenSettings extends AbstractSettings {
 	 * is {@code false}.
 	 * @return {@code true} if access tokens must be bound to the client
 	 * {@code X509Certificate}, {@code false} otherwise
-	 * @since 1.3
 	 */
 	public boolean isX509CertificateBoundAccessTokens() {
 		return getSetting(ConfigurationSettingNames.Token.X509_CERTIFICATE_BOUND_ACCESS_TOKENS);
@@ -159,7 +155,6 @@ public final class TokenSettings extends AbstractSettings {
 		 * RECOMMENDED.
 		 * @param authorizationCodeTimeToLive the time-to-live for an authorization code
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.4.0
 		 */
 		public Builder authorizationCodeTimeToLive(Duration authorizationCodeTimeToLive) {
 			Assert.notNull(authorizationCodeTimeToLive, "authorizationCodeTimeToLive cannot be null");
@@ -186,7 +181,6 @@ public final class TokenSettings extends AbstractSettings {
 		 * Set the token format for an access token.
 		 * @param accessTokenFormat the token format for an access token
 		 * @return the {@link Builder} for further configuration
-		 * @since 0.2.3
 		 */
 		public Builder accessTokenFormat(OAuth2TokenFormat accessTokenFormat) {
 			Assert.notNull(accessTokenFormat, "accessTokenFormat cannot be null");
@@ -198,7 +192,6 @@ public final class TokenSettings extends AbstractSettings {
 		 * {@code Duration.ZERO}.
 		 * @param deviceCodeTimeToLive the time-to-live for a device code
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.1
 		 */
 		public Builder deviceCodeTimeToLive(Duration deviceCodeTimeToLive) {
 			Assert.notNull(deviceCodeTimeToLive, "deviceCodeTimeToLive cannot be null");
@@ -250,7 +243,6 @@ public final class TokenSettings extends AbstractSettings {
 		 * @param x509CertificateBoundAccessTokens {@code true} if access tokens must be
 		 * bound to the client {@code X509Certificate}, {@code false} otherwise
 		 * @return the {@link Builder} for further configuration
-		 * @since 1.3
 		 */
 		public Builder x509CertificateBoundAccessTokens(boolean x509CertificateBoundAccessTokens) {
 			return setting(ConfigurationSettingNames.Token.X509_CERTIFICATE_BOUND_ACCESS_TOKENS,
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DefaultOAuth2TokenContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DefaultOAuth2TokenContext.java
index 3323941fcb..afa8166db4 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DefaultOAuth2TokenContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DefaultOAuth2TokenContext.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * Default implementation of {@link OAuth2TokenContext}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenContext
  */
 public final class DefaultOAuth2TokenContext implements OAuth2TokenContext {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DelegatingOAuth2TokenGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DelegatingOAuth2TokenGenerator.java
index 08313b533a..88ad058b0f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DelegatingOAuth2TokenGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/DelegatingOAuth2TokenGenerator.java
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  * {@code non-null} {@link OAuth2Token} being returned.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenGenerator
  * @see JwtGenerator
  * @see OAuth2RefreshTokenGenerator
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtEncodingContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtEncodingContext.java
index 79119fa1d9..310b8644b0 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtEncodingContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtEncodingContext.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * An {@link OAuth2TokenContext} implementation used when encoding a {@link Jwt}.
  *
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see OAuth2TokenContext
  * @see JwsHeader.Builder
  * @see JwtClaimsSet.Builder
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java
index f133cce72f..fe94c4a8de 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java
@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
  * {@link OAuth2AccessToken} or {@link OidcIdToken}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenGenerator
  * @see Jwt
  * @see JwtEncoder
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
index 5ea84268d2..3d03a8bd75 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * "reference"} (opaque) {@link OAuth2AccessToken}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenGenerator
  * @see OAuth2AccessToken
  * @see OAuth2TokenCustomizer
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGenerator.java
index 0a23f2ddec..f9e29634f5 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGenerator.java
@@ -32,7 +32,7 @@ import org.springframework.security.oauth2.server.authorization.authentication.O
  * An {@link OAuth2TokenGenerator} that generates an {@link OAuth2RefreshToken}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenGenerator
  * @see OAuth2RefreshToken
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimAccessor.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimAccessor.java
index cca706bb09..25be0d08ac 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimAccessor.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimAccessor.java
@@ -27,7 +27,7 @@ import org.springframework.security.oauth2.core.ClaimAccessor;
  * {@link OAuth2TokenClaimsSet}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see ClaimAccessor
  * @see OAuth2TokenClaimNames
  * @see OAuth2TokenClaimsSet
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimNames.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimNames.java
index 649fd5e21f..f7cbb49579 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimNames.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimNames.java
@@ -23,7 +23,7 @@ import org.springframework.security.oauth2.core.OAuth2Token;
  * are associated to an {@link OAuth2Token}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenClaimAccessor
  * @see OAuth2TokenClaimsSet
  * @see OAuth2Token
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
index fb380bbbbc..cdb3995014 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * {@link #getClaims() claims} of an OAuth 2.0 Token, allowing the ability to customize.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenContext
  * @see OAuth2TokenClaimsSet.Builder
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsSet.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsSet.java
index 4044a6269b..bbc7319dd1 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsSet.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsSet.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * A representation of a set of claims that are associated to an {@link OAuth2Token}.
  *
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2TokenClaimAccessor
  * @see OAuth2TokenClaimNames
  * @see OAuth2Token
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
index e38989e68d..97b143f1e7 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
  * by an {@link OAuth2TokenGenerator} and {@link OAuth2TokenCustomizer}.
  *
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see Context
  * @see OAuth2TokenGenerator
  * @see OAuth2TokenCustomizer
@@ -47,7 +47,6 @@ public interface OAuth2TokenContext extends Context {
 
 	/**
 	 * The key used for the DPoP Proof {@link Jwt} (if available).
-	 * @since 1.5
 	 */
 	String DPOP_PROOF_KEY = Jwt.class.getName().concat(".DPOP_PROOF");
 
@@ -73,7 +72,6 @@ public interface OAuth2TokenContext extends Context {
 	/**
 	 * Returns the {@link AuthorizationServerContext authorization server context}.
 	 * @return the {@link AuthorizationServerContext}
-	 * @since 0.2.3
 	 */
 	default AuthorizationServerContext getAuthorizationServerContext() {
 		return get(AuthorizationServerContext.class);
@@ -164,7 +162,6 @@ public interface OAuth2TokenContext extends Context {
 		 * Sets the {@link AuthorizationServerContext authorization server context}.
 		 * @param authorizationServerContext the {@link AuthorizationServerContext}
 		 * @return the {@link AbstractBuilder} for further configuration
-		 * @since 0.2.3
 		 */
 		public B authorizationServerContext(AuthorizationServerContext authorizationServerContext) {
 			return put(AuthorizationServerContext.class, authorizationServerContext);
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenCustomizer.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenCustomizer.java
index c1e42d936f..60aaf8ef29 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenCustomizer.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenCustomizer.java
@@ -22,7 +22,7 @@ package org.springframework.security.oauth2.server.authorization.token;
  *
  * @param <T> the type of the context containing the OAuth 2.0 Token attributes
  * @author Joe Grandja
- * @since 0.1.0
+ * @since 7.0
  * @see OAuth2TokenContext
  */
 @FunctionalInterface
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenGenerator.java
index 382e1deb48..0eaeeae4e1 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenGenerator.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenGenerator.java
@@ -27,7 +27,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
  *
  * @param <T> the type of the OAuth 2.0 Token
  * @author Joe Grandja
- * @since 0.2.3
+ * @since 7.0
  * @see OAuth2Token
  * @see OAuth2TokenContext
  * @see OAuth2TokenClaimsSet
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/HttpMessageConverters.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/HttpMessageConverters.java
index 6bb1757cf8..f246152d95 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/HttpMessageConverters.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/HttpMessageConverters.java
@@ -27,7 +27,7 @@ import org.springframework.util.ClassUtils;
  * Utility methods for {@link HttpMessageConverter}'s.
  *
  * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
  */
 final class HttpMessageConverters {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java
index 4a77200a3d..08bf9ea9a2 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java
@@ -40,7 +40,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * A {@code Filter} that processes JWK Set requests.
  *
  * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
  * @see com.nimbusds.jose.jwk.source.JWKSource
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7517">JSON Web Key
  * (JWK)</a>
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java
index 0a3419b04e..3988198848 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java
@@ -77,7 +77,7 @@ import org.springframework.web.util.UriUtils;
  * @author Daniel Garnier-Moiroux
  * @author Anoop Garlapati
  * @author Dmitriy Dubson
- * @since 0.0.1
+ * @since 7.0
  * @see AuthenticationManager
  * @see OAuth2AuthorizationCodeRequestAuthenticationProvider
  * @see OAuth2AuthorizationConsentAuthenticationProvider
@@ -216,7 +216,6 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte
 	 * details instance from {@link HttpServletRequest}.
 	 * @param authenticationDetailsSource the {@link AuthenticationDetailsSource} used for
 	 * building an authentication details instance from {@link HttpServletRequest}
-	 * @since 0.3.1
 	 */
 	public void setAuthenticationDetailsSource(
 			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
@@ -270,7 +269,6 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte
 	 * implementation tracks OpenID Connect sessions using a {@link SessionRegistry}.
 	 * @param sessionAuthenticationStrategy the {@link SessionAuthenticationStrategy} used
 	 * for handling an {@link OAuth2AuthorizationCodeRequestAuthenticationToken}
-	 * @since 1.1
 	 */
 	public void setSessionAuthenticationStrategy(SessionAuthenticationStrategy sessionAuthenticationStrategy) {
 		Assert.notNull(sessionAuthenticationStrategy, "sessionAuthenticationStrategy cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java
index c77ce4c5ca..924f6ef9ae 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java
@@ -48,7 +48,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  *
  * @author Daniel Garnier-Moiroux
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  * @see OAuth2AuthorizationServerMetadata
  * @see AuthorizationServerSettings
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc8414#section-3">3.
@@ -76,7 +76,6 @@ public final class OAuth2AuthorizationServerMetadataEndpointFilter extends OnceP
 	 * the claims of the Authorization Server's configuration.
 	 * @param authorizationServerMetadataCustomizer the {@code Consumer} providing access
 	 * to the {@link OAuth2AuthorizationServerMetadata.Builder}
-	 * @since 0.4.0
 	 */
 	public void setAuthorizationServerMetadataCustomizer(
 			Consumer<OAuth2AuthorizationServerMetadata.Builder> authorizationServerMetadataCustomizer) {
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java
index 7e81b73f69..ccb90f635f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java
@@ -63,7 +63,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  *
  * @author Joe Grandja
  * @author Patryk Kostrzewa
- * @since 0.0.1
+ * @since 7.0
  * @see AuthenticationManager
  * @see JwtClientAssertionAuthenticationConverter
  * @see JwtClientAssertionAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java
index ea574e1aa6..c6df001411 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java
@@ -60,7 +60,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * processing of the OAuth 2.0 Device Authorization Request.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationManager
  * @see OAuth2DeviceAuthorizationRequestAuthenticationConverter
  * @see OAuth2DeviceAuthorizationRequestAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java
index b03c704649..b52461b782 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java
@@ -69,7 +69,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * Device Authorization Consent.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationManager
  * @see OAuth2DeviceVerificationAuthenticationConverter
  * @see OAuth2DeviceVerificationAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2PushedAuthorizationRequestEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2PushedAuthorizationRequestEndpointFilter.java
index 6cace180be..7e73dee08f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2PushedAuthorizationRequestEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2PushedAuthorizationRequestEndpointFilter.java
@@ -59,7 +59,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * the processing of the OAuth 2.0 Pushed Authorization Request.
  *
  * @author Joe Grandja
- * @since 1.5
+ * @since 7.0
  * @see AuthenticationManager
  * @see OAuth2PushedAuthorizationRequestAuthenticationProvider
  * @see <a target="_blank" href=
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java
index 5af3035000..270bdf2fc9 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java
@@ -83,7 +83,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @author Madhu Bhat
  * @author Daniel Garnier-Moiroux
  * @author Dmitriy Dubson
- * @since 0.0.1
+ * @since 7.0
  * @see AuthenticationManager
  * @see OAuth2AuthorizationCodeAuthenticationProvider
  * @see OAuth2RefreshTokenAuthenticationProvider
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java
index d124a3fd63..d8de09fc4a 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java
@@ -52,7 +52,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @author Gerardo Roza
  * @author Joe Grandja
  * @author Gaurav Tiwari
- * @since 0.1.1
+ * @since 7.0
  * @see OAuth2TokenIntrospectionAuthenticationProvider
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7662#section-2">Section 2
  * Introspection Endpoint</a>
@@ -136,7 +136,6 @@ public final class OAuth2TokenIntrospectionEndpointFilter extends OncePerRequest
 	 * request.
 	 * @param authenticationConverter the {@link AuthenticationConverter} used when
 	 * attempting to extract an Introspection Request from {@link HttpServletRequest}
-	 * @since 0.2.3
 	 */
 	public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) {
 		Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
@@ -148,7 +147,6 @@ public final class OAuth2TokenIntrospectionEndpointFilter extends OncePerRequest
 	 * {@link OAuth2TokenIntrospectionAuthenticationToken}.
 	 * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used
 	 * for handling an {@link OAuth2TokenIntrospectionAuthenticationToken}
-	 * @since 0.2.3
 	 */
 	public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) {
 		Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null");
@@ -161,7 +159,6 @@ public final class OAuth2TokenIntrospectionEndpointFilter extends OncePerRequest
 	 * Resonse}.
 	 * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used
 	 * for handling an {@link OAuth2AuthenticationException}
-	 * @since 0.2.3
 	 */
 	public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) {
 		Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java
index a0f5d460e3..052bafda61 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java
@@ -52,7 +52,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @author Vivek Babu
  * @author Joe Grandja
  * @author Arfat Chaus
- * @since 0.0.3
+ * @since 7.0
  * @see OAuth2TokenRevocationAuthenticationProvider
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7009#section-2">Section 2
  * Token Revocation</a>
@@ -138,7 +138,6 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil
 	 * details instance from {@link HttpServletRequest}.
 	 * @param authenticationDetailsSource the {@link AuthenticationDetailsSource} used for
 	 * building an authentication details instance from {@link HttpServletRequest}
-	 * @since 1.4
 	 */
 	public void setAuthenticationDetailsSource(
 			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
@@ -153,7 +152,6 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil
 	 * request.
 	 * @param authenticationConverter the {@link AuthenticationConverter} used when
 	 * attempting to extract a Revoke Token Request from {@link HttpServletRequest}
-	 * @since 0.2.2
 	 */
 	public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) {
 		Assert.notNull(authenticationConverter, "authenticationConverter cannot be null");
@@ -165,7 +163,6 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil
 	 * {@link OAuth2TokenRevocationAuthenticationToken}.
 	 * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used
 	 * for handling an {@link OAuth2TokenRevocationAuthenticationToken}
-	 * @since 0.2.2
 	 */
 	public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) {
 		Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null");
@@ -178,7 +175,6 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil
 	 * Response}.
 	 * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used
 	 * for handling an {@link OAuth2AuthenticationException}
-	 * @since 0.2.2
 	 */
 	public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) {
 		Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null");
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretBasicAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretBasicAuthenticationConverter.java
index 9e7fae3975..dc77643445 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretBasicAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretBasicAuthenticationConverter.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Patryk Kostrzewa
  * @author Joe Grandja
- * @since 0.0.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientAuthenticationToken
  * @see OAuth2ClientAuthenticationFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretPostAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretPostAuthenticationConverter.java
index 429eb441d0..790da53233 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretPostAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/ClientSecretPostAuthenticationConverter.java
@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * {@link OAuth2ClientAuthenticationToken} used for authenticating the client.
  *
  * @author Anoop Garlapati
- * @since 0.1.0
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientAuthenticationToken
  * @see OAuth2ClientAuthenticationFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/JwtClientAssertionAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/JwtClientAssertionAuthenticationConverter.java
index 7fda30717a..39c358c927 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/JwtClientAssertionAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/JwtClientAssertionAuthenticationConverter.java
@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * the client.
  *
  * @author Rafal Lewczuk
- * @since 0.2.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientAuthenticationToken
  * @see OAuth2ClientAuthenticationFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AccessTokenResponseAuthenticationSuccessHandler.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AccessTokenResponseAuthenticationSuccessHandler.java
index 27a8c2680b..1c4a489c93 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AccessTokenResponseAuthenticationSuccessHandler.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AccessTokenResponseAuthenticationSuccessHandler.java
@@ -49,7 +49,7 @@ import org.springframework.util.CollectionUtils;
  * {@link OAuth2AccessTokenResponse Access Token Response}.
  *
  * @author Dmitriy Dubson
- * @since 1.3
+ * @since 7.0
  * @see AuthenticationSuccessHandler
  * @see OAuth2AccessTokenResponseHttpMessageConverter
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java
index e7450c80f5..9da1fe81a3 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  * authorization grant.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2AuthorizationCodeAuthenticationToken
  * @see OAuth2TokenEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeRequestAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeRequestAuthenticationConverter.java
index 80c842c93a..2d6e53cd64 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeRequestAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeRequestAuthenticationConverter.java
@@ -59,7 +59,7 @@ import org.springframework.util.StringUtils;
  * request.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2AuthorizationCodeRequestAuthenticationToken
  * @see OAuth2PushedAuthorizationRequestAuthenticationToken
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationConsentAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationConsentAuthenticationConverter.java
index 78a906853e..01250a7267 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationConsentAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationConsentAuthenticationConverter.java
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
  * request.
  *
  * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2AuthorizationConsentAuthenticationToken
  * @see OAuth2AuthorizationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ClientCredentialsAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ClientCredentialsAuthenticationConverter.java
index 2d31ca0c11..ff2a30c3fa 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ClientCredentialsAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ClientCredentialsAuthenticationConverter.java
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
  * authorization grant.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientCredentialsAuthenticationToken
  * @see OAuth2TokenEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationConsentAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationConsentAuthenticationConverter.java
index c25e8a9e96..16dd7295c8 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationConsentAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationConsentAuthenticationConverter.java
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * request.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2DeviceAuthorizationConsentAuthenticationToken
  * @see OAuth2DeviceVerificationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationRequestAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationRequestAuthenticationConverter.java
index 3217fbc309..b423856113 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationRequestAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceAuthorizationRequestAuthenticationConverter.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  * request.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2DeviceAuthorizationRequestAuthenticationToken
  * @see OAuth2DeviceAuthorizationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceCodeAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceCodeAuthenticationConverter.java
index b530813c40..128bb4e256 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceCodeAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceCodeAuthenticationConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  * grant.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2DeviceCodeAuthenticationToken
  * @see OAuth2TokenEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceVerificationAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceVerificationAuthenticationConverter.java
index fd79c0d841..ab5cb38649 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceVerificationAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2DeviceVerificationAuthenticationConverter.java
@@ -39,7 +39,7 @@ import org.springframework.util.MultiValueMap;
  * request.
  *
  * @author Steve Riesenberg
- * @since 1.1
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2DeviceVerificationAuthenticationToken
  * @see OAuth2DeviceVerificationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java
index 16cecb117b..f361c4fa56 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Joe Grandja
  * @author Greg Li
- * @since 0.1.2
+ * @since 7.0
  */
 final class OAuth2EndpointUtils {
 
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java
index 4da28ed5ef..6017dc588d 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  * Error Response}.
  *
  * @author Dmitriy Dubson
- * @since 1.2
+ * @since 7.0
  * @see AuthenticationFailureHandler
  * @see OAuth2ErrorHttpMessageConverter
  */
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2RefreshTokenAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2RefreshTokenAuthenticationConverter.java
index c17ec8db1e..65d895b525 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2RefreshTokenAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2RefreshTokenAuthenticationConverter.java
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
  * grant.
  *
  * @author Joe Grandja
- * @since 0.1.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2RefreshTokenAuthenticationToken
  * @see OAuth2TokenEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenExchangeAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenExchangeAuthenticationConverter.java
index 676db46182..a72e72353b 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenExchangeAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenExchangeAuthenticationConverter.java
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  * authorization grant.
  *
  * @author Steve Riesenberg
- * @since 1.3
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2TokenExchangeAuthenticationToken
  * @see OAuth2TokenEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenIntrospectionAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenIntrospectionAuthenticationConverter.java
index f6879c1586..ec6e1f40a3 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenIntrospectionAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenIntrospectionAuthenticationConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Gerardo Roza
  * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2TokenIntrospectionAuthenticationToken
  * @see OAuth2TokenIntrospectionEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenRevocationAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenRevocationAuthenticationConverter.java
index a2fcbd25af..7d8ba8f04f 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenRevocationAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2TokenRevocationAuthenticationConverter.java
@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Vivek Babu
  * @author Joe Grandja
- * @since 0.4.0
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2TokenRevocationAuthenticationToken
  * @see OAuth2TokenRevocationEndpointFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/PublicClientAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/PublicClientAuthenticationConverter.java
index 7afa4f7133..a2046a23ee 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/PublicClientAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/PublicClientAuthenticationConverter.java
@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
  * authenticating public clients using Proof Key for Code Exchange (PKCE).
  *
  * @author Joe Grandja
- * @since 0.0.2
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientAuthenticationToken
  * @see OAuth2ClientAuthenticationFilter
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/X509ClientCertificateAuthenticationConverter.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/X509ClientCertificateAuthenticationConverter.java
index a03143d769..56792c202c 100644
--- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/X509ClientCertificateAuthenticationConverter.java
+++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/X509ClientCertificateAuthenticationConverter.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  * {@code tls_client_auth} or {@code self_signed_tls_client_auth} method.
  *
  * @author Joe Grandja
- * @since 1.3
+ * @since 7.0
  * @see AuthenticationConverter
  * @see OAuth2ClientAuthenticationToken
  * @see OAuth2ClientAuthenticationFilter
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProviderTests.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProviderTests.java
index 314c54d4d4..43380e88ea 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProviderTests.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProviderTests.java
@@ -97,7 +97,7 @@ import static org.mockito.Mockito.verify;
  * @author Alexey Nesterov
  * @author Joe Grandja
  * @author Anoop Garlapati
- * @since 0.0.3
+ * @since 7.0
  */
 public class OAuth2RefreshTokenAuthenticationProviderTests {
 
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationTokenTests.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationTokenTests.java
index cc1cae1255..991e9bda56 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationTokenTests.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationTokenTests.java
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
  * Tests for {@link OAuth2RefreshTokenAuthenticationToken}.
  *
  * @author Alexey Nesterov
- * @since 0.0.3
+ * @since 7.0
  */
 public class OAuth2RefreshTokenAuthenticationTokenTests {
 
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java
index dbc009899a..5618e27361 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java
@@ -121,7 +121,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * Integration tests for the OAuth 2.0 Refresh Token Grant.
  *
  * @author Alexey Nesterov
- * @since 0.0.3
+ * @since 7.0
  */
 @ExtendWith(SpringTestContextExtension.class)
 public class OAuth2RefreshTokenGrantTests {
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/jackson2/TestingAuthenticationTokenMixin.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/jackson2/TestingAuthenticationTokenMixin.java
index e40b484ae9..e3d0e690e9 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/jackson2/TestingAuthenticationTokenMixin.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/jackson2/TestingAuthenticationTokenMixin.java
@@ -31,7 +31,7 @@ import org.springframework.security.core.GrantedAuthority;
  * This mixin class is used to serialize/deserialize {@link TestingAuthenticationToken}.
  *
  * @author Steve Riesenberg
- * @since 0.1.2
+ * @since 7.0
  * @see TestingAuthenticationToken
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverterTests.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverterTests.java
index c4238ca232..2dd1559de8 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverterTests.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverterTests.java
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  *
  * @author Ovidiu Popa
  * @author Joe Grandja
- * @since 0.1.1
+ * @since 7.0
  */
 public class OidcClientRegistrationHttpMessageConverterTests {
 
diff --git a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilterTests.java b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilterTests.java
index 4b06347ee2..a1ffda8dcb 100644
--- a/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilterTests.java
+++ b/oauth2/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilterTests.java
@@ -84,7 +84,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
  * @author Anoop Garlapati
  * @author Dmitriy Dubson
  * @author Greg Li
- * @since 0.0.1
+ * @since 7.0
  */
 public class OAuth2AuthorizationEndpointFilterTests {