From 4f8a18be241d8a281cd06f87c55788feba88b93e Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Thu, 3 Feb 2022 04:44:12 +0100
Subject: [PATCH] Update documentation: JDK versions 17 and 18 are officially
 supported

---
 org.jacoco.doc/docroot/doc/build.html       | 18 ++++++++++++++++++
 org.jacoco.doc/docroot/doc/changes.html     |  5 +++--
 org.jacoco.doc/docroot/doc/environment.html |  3 ++-
 org.jacoco.doc/docroot/doc/faq.html         |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index f51d3823ba..16b9c6b182 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -93,6 +93,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>JDK 14</td>
     <td>JDK 15</td>
     <td>JDK 16</td>
+    <td>JDK 17</td>
+    <td>JDK 18</td>
   </tr>
   </thead>
   <tbody>
@@ -110,6 +112,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td></td>
     <td></td>
     <td>16</td>
+    <td>16</td>
+    <td>16</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java14</td>
@@ -125,6 +129,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>14</td>
     <td>14</td>
     <td>14</td>
+    <td>14</td>
+    <td>14</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java8</td>
@@ -140,6 +146,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java7</td>
@@ -155,6 +163,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
+    <td>7</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.groovy</td>
@@ -170,6 +180,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.kotlin</td>
@@ -185,6 +197,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>6</td>
     <td>6</td>
     <td>6</td>
+    <td>6</td>
+    <td>6</td>
   </tr>
   <tr>
     <td>all other modules</td>
@@ -200,6 +214,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
+    <td>7</td>
   </tr>
   </tbody>
 </table>
@@ -244,6 +260,8 @@ <h2>Compilation and testing with different JDKs</h2>
   <li><code>mvn clean verify -Djdk.version=14 -Dbytecode.version=14</code></li>
   <li><code>mvn clean verify -Djdk.version=15 -Dbytecode.version=15</code></li>
   <li><code>mvn clean verify -Djdk.version=16 -Dbytecode.version=16</code></li>
+  <li><code>mvn clean verify -Djdk.version=17 -Dbytecode.version=17</code></li>
+  <li><code>mvn clean verify -Djdk.version=18 -Dbytecode.version=18</code></li>
 </ul>
 
 
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index baece73bb2..561f54200e 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,8 +22,9 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
 
 <h3>New Features</h3>
 <ul>
-  <li>Experimental support for Java 18 class files
-      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1198">#1198</a>).</li>
+  <li>JaCoCo now officially supports Java 17 and 18
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1282">#1282</a>,
+      <a href="https://github.com/jacoco/jacoco/issues/1198">#1198</a>).</li>
   <li>Experimental support for Java 19 class files
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1264">#1264</a>).</li>
   <li>Part of bytecode generated by the Java compilers for <code>assert</code>
diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html
index d0788d728d..c424e65390 100644
--- a/org.jacoco.doc/docroot/doc/environment.html
+++ b/org.jacoco.doc/docroot/doc/environment.html
@@ -68,7 +68,8 @@ <h3>JRE/JDK</h3>
 <p>
   The minimum supported JRE version for JaCoCo is Java 5. To guarantee
   compatibility JaCoCo release builds should always be executed using JDK 5.
-  In addition we run builds with 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 and 16 JDKs.
+  In addition we run builds with 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
+  and 18 JDKs.
 </p>
 
 <h3>Build</h3>
diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html
index 6a6ec1f253..fcfea9feaf 100644
--- a/org.jacoco.doc/docroot/doc/faq.html
+++ b/org.jacoco.doc/docroot/doc/faq.html
@@ -45,7 +45,7 @@ <h3>Does JaCoCo have a plug-in for [Eclipse|Netbeans|Whatever...]?</h3>
 
 <h3>What Java versions are supported by JaCoCo?</h3>
 <p>
-  JaCoCo supports Java class files from version 1.0 to 16. However the minimum
+  JaCoCo supports Java class files from version 1.0 to 18. However the minimum
   JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo
   tools is 1.5. Also note that class files under test from version 1.6 and above
   have to contain valid stackmap frames.