Deprecation wording with suggested alternative and without removal hint

jhoeller · jhoeller · commit e4a3d5bf66ad · 2020-09-15T13:22:34.000+02:00
See gh-25733 See gh-25736
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
@@ -42,7 +42,7 @@
  * @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 {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
@@ -33,7 +33,7 @@
  * @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
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
@@ -29,7 +29,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
@@ -45,7 +45,7 @@
  * @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
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
@@ -36,7 +36,7 @@
  * @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 {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
@@ -31,7 +31,7 @@
  * @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 {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
@@ -55,7 +55,7 @@
  * @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 {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java
@@ -30,7 +30,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java
@@ -30,7 +30,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java
@@ -30,7 +30,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
@@ -27,7 +27,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
@@ -28,7 +28,7 @@
  *
  * @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> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
@@ -28,7 +28,7 @@
  *
  * @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> {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
@@ -65,7 +65,7 @@
  * @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 {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
@@ -62,7 +62,7 @@
  * @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 {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`* @author Keith Donald`
`31`	`31`	`* @since 3.0`
`32`		`- * @deprecated as of 5.3.0, scheduled for removal in 6.0.`
	`32`	`+ * @deprecated as of 5.3, in favor of standard JSR-310 support`
`33`	`33`	`*/`
`34`	`34`	`@Deprecated`
`35`	`35`	`public final class DateTimeParser implements Parser<DateTime> {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author Juergen Hoeller`
`32`	`32`	`* @since 4.0`
`33`		`- * @deprecated as of 5.3.0, scheduled for removal in 6.0.`
	`33`	`+ * @deprecated as of 5.3, in favor of standard JSR-310 support`
`34`	`34`	`*/`
`35`	`35`	`@Deprecated`
`36`	`36`	`public final class LocalDateParser implements Parser<LocalDate> {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Keith Donald`
`29`	`29`	`* @since 3.0`
`30`		`- * @deprecated as of 5.3.0, scheduled for removal in 6.0.`
	`30`	`+ * @deprecated as of 5.3, in favor of standard JSR-310 support`
`31`	`31`	`*/`
`32`	`32`	`@Deprecated`
`33`	`33`	`public final class MillisecondInstantPrinter implements Printer<Long> {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Keith Donald`
`30`	`30`	`* @since 3.0`
`31`		`- * @deprecated as of 5.3.0, scheduled for removal in 6.0.`
	`31`	`+ * @deprecated as of 5.3, in favor of standard JSR-310 support`
`32`	`32`	`*/`
`33`	`33`	`@Deprecated`
`34`	`34`	`public final class ReadableInstantPrinter implements Printer<ReadableInstant> {`