From 2f7f84172f4127d74b33bd333a9da60c33cc176d Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <138671+Godin@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:37:54 +0200
Subject: [PATCH] Fix build with JDK >= 20 when option `-Dbytecode.version` is
 not provided (#1605)

---
 org.jacoco.build/pom.xml                      | 29 ++++++++++++++++++-
 org.jacoco.core.test.validation.java7/pom.xml | 18 +++++++++---
 org.jacoco.doc/docroot/doc/build.html         |  6 ++--
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 1ea398c34..1a0e8448c 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -744,13 +744,40 @@
     <profile>
       <id>maven-jdk12</id>
       <activation>
-        <jdk>[12,)</jdk>
+        <jdk>[12,20)</jdk>
       </activation>
       <properties>
         <bytecode.version>7</bytecode.version>
       </properties>
     </profile>
 
+    <profile>
+      <!-- https://bugs.openjdk.org/browse/JDK-8173605 -->
+      <id>maven-jdk20</id>
+      <activation>
+        <jdk>[20,)</jdk>
+      </activation>
+      <properties>
+        <bytecode.version>8</bytecode.version>
+      </properties>
+    </profile>
+
+    <!--
+    Following profile is automatically activated in IntelliJ IDEA
+    and used to set the correct Java language level in it
+    -->
+    <profile>
+      <id>intellij</id>
+      <activation>
+        <property>
+          <name>idea.maven.embedder.version</name>
+        </property>
+      </activation>
+      <properties>
+        <bytecode.version>5</bytecode.version>
+      </properties>
+    </profile>
+
     <!-- This profile enables use of JDK from Maven Toolchains -->
     <profile>
       <id>integration-tests</id>
diff --git a/org.jacoco.core.test.validation.java7/pom.xml b/org.jacoco.core.test.validation.java7/pom.xml
index 487715758..3f7d34dad 100644
--- a/org.jacoco.core.test.validation.java7/pom.xml
+++ b/org.jacoco.core.test.validation.java7/pom.xml
@@ -24,14 +24,24 @@
 
   <name>JaCoCo :: Test :: Core :: Validation Java 7</name>
 
-  <properties>
-    <bytecode.version>7</bytecode.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>org.jacoco.core.test</artifactId>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>intellij</id>
+      <activation>
+        <property>
+          <name>idea.maven.embedder.version</name>
+        </property>
+      </activation>
+      <properties>
+        <bytecode.version>7</bytecode.version>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 8cca1348e..46600cdd1 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -287,9 +287,9 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
-    <td>7</td>
-    <td>7</td>
-    <td>7</td>
+    <td>8</td>
+    <td>8</td>
+    <td>8</td>
   </tr>
   </tbody>
 </table>