diff --git a/content/apt/developers/compatibility-plan.apt b/content/apt/developers/compatibility-plan.apt
index 5eb5693..a0213a9 100644
--- a/content/apt/developers/compatibility-plan.apt
+++ b/content/apt/developers/compatibility-plan.apt
@@ -42,9 +42,9 @@
 
 * Maven Plan
 
-  * Until 2012 (?), Maven 2.2.1 + Java 5 prerequisites, with plugins versions in 2.x
+  * Until 2012, Maven 2.2.1 + Java 5 prerequisites, with plugins versions in 2.x
 
-  * Since 2012 (?), Maven 3.0 + Java 7 prerequisites, with plugins in 3.0
+  * Since 2012, Maven 3.0 + Java 7 prerequisites, with plugins in 3.0
 
   * (WIP) discussions on Maven > 3.0.x (3.1 or 3.2 or 3.3? details still TDB) + Java 8 prerequisites
 
@@ -58,13 +58,13 @@
 
     * Java 5 (2004) is closed source, End of Public Update in 2009
 
-    * Java 6 (2006) is Open Source, maintained at OpenJDK until ... 
+    * Java 6 (2006) is Open Source, maintained at OpenJDK until 2018
 
-    * Java 7 (2011) is Open Source, maintained at OpenJDK at least until June 2020 
+    * Java 7 (2011) is Open Source, maintained {{{https://wiki.openjdk.java.net/display/jdk7u}at OpenJDK}} at least until June 2020 
 
-    * Java 8 (2014) is Open Source, maintained at OpenJDK at least until September 2023
+    * Java 8 (2014) is Open Source, maintained {{{https://wiki.openjdk.java.net/display/jdk8u}at OpenJDK}} at least until September 2023
 
-    * Java 11 (LTS, 2019) is Open Source, maintained at OpenJDK at least until ...
+    * Java 11 (LTS, 2019) is Open Source, maintained {{{https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u}at OpenJDK}} at least until ...
 
     * see {{{https://docs.google.com/document/d/1nFGazvrCvHMZJgFstlbzoHjpAVwv5DEdnaBr_5pKuHo}Java Is Still Free}}