diff --git a/src/main/java/org/springframework/data/convert/JodaTimeConverters.java b/src/main/java/org/springframework/data/convert/JodaTimeConverters.java
index 94a3dff39..c2c763533 100644
--- a/src/main/java/org/springframework/data/convert/JodaTimeConverters.java
+++ b/src/main/java/org/springframework/data/convert/JodaTimeConverters.java
@@ -39,7 +39,9 @@ import org.springframework.util.ClassUtils;
  * @author Christoph Strobl
  * @author Jens Schauder
  * @author Mark Paluch
+ * @deprecated since 2.3, use JSR-310 types as replacement for Joda-Time.
  */
+@Deprecated
 public abstract class JodaTimeConverters {
 
 	private static final boolean JODA_TIME_IS_PRESENT = ClassUtils.isPresent("org.joda.time.LocalDate", null);
@@ -75,6 +77,7 @@ public abstract class JodaTimeConverters {
 		return converters;
 	}
 
+	@Deprecated
 	public enum LocalDateTimeToJsr310Converter implements Converter<LocalDateTime, java.time.LocalDateTime> {
 
 		INSTANCE;
@@ -86,6 +89,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum LocalDateToDateConverter implements Converter<LocalDate, Date> {
 
 		INSTANCE;
@@ -97,6 +101,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum LocalDateTimeToDateConverter implements Converter<LocalDateTime, Date> {
 
 		INSTANCE;
@@ -108,6 +113,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum DateTimeToDateConverter implements Converter<DateTime, Date> {
 
 		INSTANCE;
@@ -119,6 +125,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum DateToLocalDateConverter implements Converter<Date, LocalDate> {
 
 		INSTANCE;
@@ -130,6 +137,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum DateToLocalDateTimeConverter implements Converter<Date, LocalDateTime> {
 
 		INSTANCE;
@@ -141,6 +149,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum DateToDateTimeConverter implements Converter<Date, DateTime> {
 
 		INSTANCE;
@@ -153,6 +162,7 @@ public abstract class JodaTimeConverters {
 	}
 
 	@ReadingConverter
+	@Deprecated
 	public enum LocalDateTimeToJodaLocalDateTime implements Converter<java.time.LocalDateTime, LocalDateTime> {
 
 		INSTANCE;
@@ -164,6 +174,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum InstantToJodaLocalDateTime implements Converter<java.time.Instant, LocalDateTime> {
 
 		INSTANCE;
@@ -175,6 +186,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum JodaLocalDateTimeToInstant implements Converter<LocalDateTime, Instant> {
 
 		INSTANCE;
@@ -186,6 +198,7 @@ public abstract class JodaTimeConverters {
 		}
 	}
 
+	@Deprecated
 	public enum LocalDateTimeToJodaDateTime implements Converter<java.time.LocalDateTime, DateTime> {
 
 		INSTANCE;
diff --git a/src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java b/src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java
index d99c170f4..9bf5518ed 100644
--- a/src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java
+++ b/src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java
@@ -48,7 +48,9 @@ import org.threeten.bp.ZoneOffset;
  * @author Mark Paluch
  * @see <a href="https://www.threeten.org/threetenbp">https://www.threeten.org/threetenbp</a>
  * @since 1.10
+ * @deprecated since 2.3, use JSR-310 types as replacement for ThreeTenBackport.
  */
+@Deprecated
 public abstract class ThreeTenBackPortConverters {
 
 	private static final boolean THREE_TEN_BACK_PORT_IS_PRESENT = ClassUtils.isPresent("org.threeten.bp.LocalDateTime",
@@ -95,6 +97,7 @@ public abstract class ThreeTenBackPortConverters {
 		return SUPPORTED_TYPES.contains(type);
 	}
 
+	@Deprecated
 	public static enum LocalDateTimeToJsr310LocalDateTimeConverter
 			implements Converter<LocalDateTime, java.time.LocalDateTime> {
 
@@ -114,6 +117,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum DateToLocalDateTimeConverter implements Converter<Date, LocalDateTime> {
 
 		INSTANCE;
@@ -125,6 +129,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum LocalDateTimeToDateConverter implements Converter<LocalDateTime, Date> {
 
 		INSTANCE;
@@ -136,6 +141,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum DateToLocalDateConverter implements Converter<Date, LocalDate> {
 
 		INSTANCE;
@@ -147,6 +153,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum LocalDateToDateConverter implements Converter<LocalDate, Date> {
 
 		INSTANCE;
@@ -158,6 +165,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum DateToLocalTimeConverter implements Converter<Date, LocalTime> {
 
 		INSTANCE;
@@ -169,6 +177,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum LocalTimeToDateConverter implements Converter<LocalTime, Date> {
 
 		INSTANCE;
@@ -180,6 +189,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum DateToInstantConverter implements Converter<Date, Instant> {
 
 		INSTANCE;
@@ -191,6 +201,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum InstantToDateConverter implements Converter<Instant, Date> {
 
 		INSTANCE;
@@ -202,6 +213,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum LocalDateTimeToJavaTimeInstantConverter implements Converter<LocalDateTime, java.time.Instant> {
 
 		INSTANCE;
@@ -213,6 +225,7 @@ public abstract class ThreeTenBackPortConverters {
 		}
 	}
 
+	@Deprecated
 	public static enum JavaTimeInstantToLocalDateTimeConverter implements Converter<java.time.Instant, LocalDateTime> {
 
 		INSTANCE;
@@ -225,6 +238,7 @@ public abstract class ThreeTenBackPortConverters {
 	}
 
 	@WritingConverter
+	@Deprecated
 	public static enum ZoneIdToStringConverter implements Converter<ZoneId, String> {
 
 		INSTANCE;
@@ -237,6 +251,7 @@ public abstract class ThreeTenBackPortConverters {
 	}
 
 	@ReadingConverter
+	@Deprecated
 	public static enum StringToZoneIdConverter implements Converter<String, ZoneId> {
 
 		INSTANCE;