Deprecation wording with suggested alternative and without removal hint

See gh-25733
See gh-25736

spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java

@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * @see #setStyle
  * @see #setIso
  * @see DateTimeFormatterFactoryBean
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public class DateTimeFormatterFactory {

spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java

@@ -33,7 +33,7 @@ import org.springframework.lang.Nullable;
  * @see #setIso
  * @see #setStyle
  * @see DateTimeFormatterFactory
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public class DateTimeFormatterFactoryBean extends DateTimeFormatterFactory

spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java

@@ -29,7 +29,7 @@ import org.springframework.format.Parser;
  *
  * @author Keith Donald
  * @since 3.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class DateTimeParser implements Parser<DateTime> {

spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java

@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @since 3.0
  * @see DateTimeFormat
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public class JodaDateTimeFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport

spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java

@@ -36,7 +36,7 @@ import org.springframework.lang.Nullable;
  * @author Keith Donald
  * @since 3.0
  * @see JodaTimeContextHolder
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public class JodaTimeContext {

spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java

@@ -31,7 +31,7 @@ import org.springframework.lang.Nullable;
  * @author Juergen Hoeller
  * @since 3.0
  * @see org.springframework.context.i18n.LocaleContextHolder
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class JodaTimeContextHolder {

spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java

@@ -55,7 +55,7 @@ import org.springframework.format.annotation.DateTimeFormat.ISO;
  * @see FormatterRegistrar#registerFormatters
  * @see org.springframework.format.datetime.DateFormatterRegistrar
  * @see DateTimeFormatterFactoryBean
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public class JodaTimeFormatterRegistrar implements FormatterRegistrar {

spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java

@@ -30,7 +30,7 @@ import org.springframework.format.Parser;
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class LocalDateParser implements Parser<LocalDate> {

spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java

@@ -30,7 +30,7 @@ import org.springframework.format.Parser;
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class LocalDateTimeParser implements Parser<LocalDateTime> {

spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java

@@ -30,7 +30,7 @@ import org.springframework.format.Parser;
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class LocalTimeParser implements Parser<LocalTime> {

spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java

@@ -27,7 +27,7 @@ import org.springframework.format.Printer;
  *
  * @author Keith Donald
  * @since 3.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class MillisecondInstantPrinter implements Printer<Long> {

spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java

@@ -28,7 +28,7 @@ import org.springframework.format.Printer;
  *
  * @author Keith Donald
  * @since 3.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class ReadableInstantPrinter implements Printer<ReadableInstant> {

spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java

@@ -28,7 +28,7 @@ import org.springframework.format.Printer;
  *
  * @author Keith Donald
  * @since 3.0
- * @deprecated as of 5.3.0, scheduled for removal in 6.0.
+ * @deprecated as of 5.3, in favor of standard JSR-310 support
  */
 @Deprecated
 public final class ReadablePartialPrinter implements Printer<ReadablePartial> {

spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java

@@ -65,7 +65,7 @@ import org.springframework.web.server.ServerWebExchange;
  * @author Brian Clozel
  * @since 5.0
  * @see <a href="https://html.spec.whatwg.org/multipage/browsers.html#offline">HTML5 offline applications spec</a>
- * @deprecated as of 5.3 since browser support is going away, scheduled for removal in 6.0.
+ * @deprecated as of 5.3 since browser support is going away
  */
 @Deprecated
 public class AppCacheManifestTransformer extends ResourceTransformerSupport {

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java

@@ -62,7 +62,7 @@ import org.springframework.util.StringUtils;
  * @author Brian Clozel
  * @since 4.1
  * @see <a href="https://html.spec.whatwg.org/multipage/browsers.html#offline">HTML5 offline applications spec</a>
- * @deprecated as of 5.3 since browser support is going away, scheduled for removal in 6.0.
+ * @deprecated as of 5.3 since browser support is going away
  */
 @Deprecated
 public class AppCacheManifestTransformer extends ResourceTransformerSupport {