Remove deprecated web APIs

This commit also marks for removal APIs that were deprecated a long time
ago but were not marked for removal.

See gh-33809

spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java

@@ -39,9 +39,10 @@ import org.springframework.web.util.WebUtils;
  * @author Juergen Hoeller
  * @since 17.06.2003
  * @see #setThemeName
- * @deprecated as of 6.0 in favor of using CSS, without direct replacement
+ * @deprecated as of 6.0 in favor of using CSS, without direct replacement for removal in 7.1
  */
-@Deprecated(since = "6.0")
+@Deprecated(since = "6.0", forRemoval = true)
+@SuppressWarnings("removal")
 public class CookieThemeResolver extends CookieGenerator implements ThemeResolver {
 
 	/**

spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

@@ -272,6 +272,7 @@ public class MvcNamespaceTests {
 	}
 
 	@Test  // gh-25290
+	@SuppressWarnings("removal")
 	void testDefaultConfigWithBeansInParentContext() {
 		StaticApplicationContext parent = new StaticApplicationContext();
 		parent.registerSingleton("localeResolver", CookieLocaleResolver.class);

spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java

@@ -66,6 +66,7 @@ public class ThemeResolverTests {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void cookieThemeResolver() {
 		internalTest(new CookieThemeResolver(), true, AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME);
 	}