Index: /applications/viewer/jmapviewer/Readme.txt
===================================================================
--- /applications/viewer/jmapviewer/Readme.txt	(revision 35918)
+++ /applications/viewer/jmapviewer/Readme.txt	(revision 35919)
@@ -11,5 +11,5 @@
 (c) 2011-2017, Paul Hartmann
 (c) 2011-2016, Gleb Smirnoff
-(c) 2011-2021, Vincent Privat
+(c) 2011-2022, Vincent Privat
 (c) 2011, Jason Huntley
 (c) 2012-2020, Simon Legner
Index: /applications/viewer/jmapviewer/build.xml
===================================================================
--- /applications/viewer/jmapviewer/build.xml	(revision 35918)
+++ /applications/viewer/jmapviewer/build.xml	(revision 35919)
@@ -10,12 +10,18 @@
     <!-- For Java specific stuff by version -->
     <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
-    <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
-    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
-    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
-    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
-    <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
+    <condition property="isJava10"><matches string="${ant.java.version}" pattern="(1|2)[0-9]" /></condition>
+    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava18"><matches string="${ant.java.version}" pattern="1[8-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava19"><matches string="${ant.java.version}" pattern="19|[2-9][0-9]" /></condition>
+    <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition>
+    <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
+    <!-- Disable jacoco on Java 18+, see https://github.com/jacoco/jacoco/pull/1132 -->
     <condition property="coverageByDefault">
         <not>
-            <isset property="isJava13"/>
+            <isset property="isJava18"/>
         </not>
     </condition>