From e4a3d5bf66adc755ab3cf117a762a31876eb564d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 15 Sep 2020 13:22:34 +0200 Subject: [PATCH] Deprecation wording with suggested alternative and without removal hint See gh-25733 See gh-25736 --- .../format/datetime/joda/DateTimeFormatterFactory.java | 2 +- .../format/datetime/joda/DateTimeFormatterFactoryBean.java | 2 +- .../springframework/format/datetime/joda/DateTimeParser.java | 2 +- .../joda/JodaDateTimeFormatAnnotationFormatterFactory.java | 2 +- .../springframework/format/datetime/joda/JodaTimeContext.java | 2 +- .../format/datetime/joda/JodaTimeContextHolder.java | 2 +- .../format/datetime/joda/JodaTimeFormatterRegistrar.java | 2 +- .../springframework/format/datetime/joda/LocalDateParser.java | 2 +- .../format/datetime/joda/LocalDateTimeParser.java | 2 +- .../springframework/format/datetime/joda/LocalTimeParser.java | 2 +- .../format/datetime/joda/MillisecondInstantPrinter.java | 2 +- .../format/datetime/joda/ReadableInstantPrinter.java | 2 +- .../format/datetime/joda/ReadablePartialPrinter.java | 2 +- .../web/reactive/resource/AppCacheManifestTransformer.java | 2 +- .../web/servlet/resource/AppCacheManifestTransformer.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) 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 index fe9285b8dbf..e276fd278cb 100644 --- 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 @@ 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 { 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 index 6461226243e..d7a0aa3a8f4 100644 --- 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 @@ 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 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 index 3aad8959790..99cc1e59532 100644 --- 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 @@ 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 { 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 index 4834f8519a3..3d5d541cf50 100644 --- 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 @@ 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 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 index ce64ed49d39..c544497d0fb 100644 --- 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 @@ 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 { 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 index 791928b0416..44cd2e93911 100644 --- 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 @@ 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 { 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 index 5ac626c00f4..19835bbc517 100644 --- 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 @@ 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 { 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 index d900799a36e..189f6ea5f43 100644 --- 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 @@ 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 { 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 index 5cce2985daa..9a2d6ec8668 100644 --- 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 @@ 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 { 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 index 3b8698abf2a..0d68e82fd2f 100644 --- 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 @@ 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 { 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 index 90fbe5c98fe..75cd6baa68e 100644 --- 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 @@ 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 { 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 index 86baa9910f0..995075be0ee 100644 --- 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 @@ 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 { 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 index b241108b50b..85d4e3d556a 100644 --- 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 @@ 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 { 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 index 99c130389db..95fbce8734f 100644 --- 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 @@ import org.springframework.web.server.ServerWebExchange; * @author Brian Clozel * @since 5.0 * @see HTML5 offline applications spec - * @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 index 8d80ed678a2..5f8facffd39 100644 --- 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 @@ import org.springframework.util.StringUtils; * @author Brian Clozel * @since 4.1 * @see HTML5 offline applications spec - * @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 {