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 @@
maven-jdk12
- [12,)
+ [12,20)
7
+
+
+ maven-jdk20
+
+ [20,)
+
+
+ 8
+
+
+
+
+
+ intellij
+
+
+ idea.maven.embedder.version
+
+
+
+ 5
+
+
+
integration-tests
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 @@
JaCoCo :: Test :: Core :: Validation Java 7
-
- 7
-
-
${project.groupId}
org.jacoco.core.test
+
+
+
+ intellij
+
+
+ idea.maven.embedder.version
+
+
+
+ 7
+
+
+
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 @@ Compilation and testing with different JDKs
7 |
7 |
7 |
- 7 |
- 7 |
- 7 |
+ 8 |
+ 8 |
+ 8 |