Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build with JDK >= 20 when option -Dbytecode.version is not provided #1605

Merged
merged 1 commit into from Apr 9, 2024
Merged

Fix build with JDK >= 20 when option -Dbytecode.version is not provided #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 28 additions & 1 deletion org.jacoco.build/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
18 changes: 14 additions & 4 deletions org.jacoco.core.test.validation.java7/pom.xml
View file
Open in desktop
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions org.jacoco.doc/docroot/doc/build.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down