`Timestamp` is the historical truth for whatever reason, it was there before ME time. Jason introduced `OffsetDateTime` and replaced `Timestamp` in places he edited. So the unfinished work actually is getting rid of `Timestamp` – or, in general, converging to one solution (again) that is used everywhere.
It has to be thought through, and most likely it is going to be a considerable change. Since JVM 8 is the minimal version we target, we can transition to `java.time`
move Timestamp to Java 8 Date types which includes OffsetDateTime