diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
index 1173bae9f0b..7ddcd372f23 100644
--- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
+++ b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
@@ -37,7 +37,9 @@ import org.springframework.util.Assert;
  * @see #addCookie
  * @see #removeCookie
  * @see org.springframework.web.servlet.theme.CookieThemeResolver
+ * @deprecated since 6.0 in favor of {@link org.springframework.http.ResponseCookie}
  */
+@Deprecated
 public class CookieGenerator {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 7c404f50050..dc3dd3acbe2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -59,6 +59,7 @@ import org.springframework.web.util.WebUtils;
  * @see #setDefaultLocale
  * @see #setDefaultTimeZone
  */
+@SuppressWarnings("deprecation")
 public class CookieLocaleResolver extends AbstractLocaleContextResolver {
 
 	/**