From fea4c4314fcc5f232c67924f3bf95b2faeb86ca1 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Thu, 25 Mar 2021 18:57:11 -0700
Subject: [PATCH 1/4] Make Jacoco work on java 11

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b689f3faf..4e1b27a13d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
             <!-- attached to Maven test phase -->
             <execution>
               <id>report</id>
-              <phase>test</phase>
+              <phase>package</phase>
               <goals>
                 <goal>report</goal>
               </goals>
@@ -591,9 +591,9 @@
       </build>
     </profile>
     <profile>
-      <id>jdk11+</id>
+      <id>jdk11plus</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[13,)</jdk>
       </activation>
       <properties>
         <!-- this is required for GithubHttpUrlConnectionClient#setRequestMethod() to work with JDK 16+ -->

From 97bb62e9a9d4c0b89a77d4009e40c9c38a913a4b Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Fri, 26 Mar 2021 15:18:25 -0700
Subject: [PATCH 2/4] Verify jacoco.exec exists

---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4e1b27a13d..ab864f85e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -642,6 +642,30 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.0.0-M3</version>
+            <executions>
+              <execution>
+                <id>enforce-jacoco-exist</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireFilesExist>
+                      <files>
+                        <file>${project.build.outputDirectory}/jacoco.exec</file>
+                      </files>
+                    </requireFilesExist>
+                  </rules>
+                  <fail>true</fail>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

From 13d5ff77ffd9d9ec7c3487a09f999a12a5da57e0 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Fri, 26 Mar 2021 15:22:52 -0700
Subject: [PATCH 3/4] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ab864f85e2..695f310dd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -657,7 +657,7 @@
                   <rules>
                     <requireFilesExist>
                       <files>
-                        <file>${project.build.outputDirectory}/jacoco.exec</file>
+                        <file>${project.build.directory}/jacoco.exec</file>
                       </files>
                     </requireFilesExist>
                   </rules>

From 8f004ea642d071e7e5c3334ed6e0f3a6f237bd66 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Fri, 26 Mar 2021 16:17:35 -0700
Subject: [PATCH 4/4] Try System property variable

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 695f310dd0..79e309773b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,9 @@
           <configuration>
             <!-- SUREFIRE-1226 workaround -->
             <trimStackTrace>false</trimStackTrace>
+            <systemPropertyVariables>
+              <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+            </systemPropertyVariables>
           </configuration>
         </plugin>
         <plugin>