From 4fca868d0c1ddd36457af8420136c1f11e56a1ba Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <138671+Godin@users.noreply.github.com>
Date: Thu, 16 Mar 2023 07:38:57 +0100
Subject: [PATCH] Require at least JDK 11 for the build (#1413)

---
 .appveyor.yml                               | 3 ++-
 .azure-pipelines/azure-pipelines.yml        | 2 +-
 org.jacoco.build/pom.xml                    | 2 +-
 org.jacoco.doc/docroot/doc/build.html       | 2 +-
 org.jacoco.doc/docroot/doc/changes.html     | 2 ++
 org.jacoco.doc/docroot/doc/environment.html | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index d8efac6101..c90688d6f7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,8 @@ install:
       curl -LsS "http://www.apache.org/dyn/closer.cgi?action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip" > apache-maven-3.3.9-bin.zip &&
       unzip apache-maven-3.3.9-bin.zip -d C:\Users\appveyor
     )
-  - SET PATH=C:\Users\appveyor\apache-maven-3.3.9\bin;%PATH%
+  - SET JAVA_HOME=C:\Program Files\Java\jdk11
+  - SET PATH=C:\Users\appveyor\apache-maven-3.3.9\bin;%JAVA_HOME%;%PATH%
 
 build_script:
   # Maven 3.3.9 requires Java >= 7, but generation of Javadocs requires Java <= 6 (https://github.com/jacoco/jacoco/issues/110)
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 37d4d9ba85..59ec28779f 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
       tar -xzf .maven/maven.tar.gz -C .maven --strip-components 1
     displayName: Setup Maven
   - bash: |
-      if [[ "$JDK_VERSION" -ge "8" ]]; then
+      if [[ "$JDK_VERSION" -ge "11" ]]; then
         export JAVA_HOME=$PWD/.jdk
       fi
       if [[ "$BUILD_SOURCEBRANCH" == "refs/heads/master" && "$JDK_VERSION" == "5" ]]; then
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 328a7d989c..15ba07da1f 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -531,7 +531,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>1.8</version>
+                  <version>11</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <!-- Maven 3.8.2 contains bug - see https://github.com/jacoco/jacoco/issues/1218 -->
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 7ceab93405..a246a2ba83 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -24,7 +24,7 @@ <h1>Build</h1>
   The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a> and
   can be locally executed on every machine with a proper
   <a href="environment.html">environment setup</a>. In particular you need at
-  least <a href="http://maven.apache.org/">Maven 3.3.9</a> and JDK 8
+  least <a href="http://maven.apache.org/">Maven 3.3.9</a> and JDK 11
   installations. Developers are encouraged to run the build before every commit
   to ensure consistency of the source tree.
 </p>
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 2aa667be8b..e79693102b 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -40,6 +40,8 @@ <h3>Non-functional Changes</h3>
   <li>JaCoCo now depends on ASM 9.4
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1299">#1299</a>,
       <a href="https://github.com/jacoco/jacoco/issues/1368">#1368</a>).</li>
+  <li>JaCoCo build now requires JDK 11
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1413">#1413</a>).</li>
 </ul>
 
 <h2>Release 0.8.8 (2022/04/05)</h2>
diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html
index 81c429fada..1042d4dbf9 100644
--- a/org.jacoco.doc/docroot/doc/environment.html
+++ b/org.jacoco.doc/docroot/doc/environment.html
@@ -76,7 +76,7 @@ <h3>Build</h3>
 
 <p>
   The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a>
-  and requires at least Maven 3.3.9 and JDK 8.
+  and requires at least Maven 3.3.9 and JDK 11.
   See the <a href="build.html">build description</a> for details.
 </p>