Skip to content

Commit 3e18f17

Browse files
authored
Require at least JDK 21 for build (#2128)
1 parent 3d10b87 commit 3e18f17

5 files changed

Lines changed: 15 additions & 7 deletions

File tree

‎.azure-pipelines/azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ jobs:
8787
" > toolchains.xml
8888
displayName: Setup JDK
8989
- bash: |
90-
if [[ "$JDK_VERSION" -ge "17" ]]; then
90+
if [[ "$JDK_VERSION" -ge "21" ]]; then
9191
export JAVA_HOME=$PWD/.jdk
9292
else
93-
export JAVA_HOME=$JAVA_HOME_17_X64
93+
export JAVA_HOME=$JAVA_HOME_21_X64
9494
fi
9595
if [[ "$BUILD_SOURCEBRANCH" == "refs/heads/master" && "$JDK_VERSION" == "5" ]]; then
9696
./mvnw -V -B -e --no-transfer-progress -f org.jacoco.build \

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
distribution: 'zulu'
4949
java-version: |
5050
${{ matrix.jdk }}
51-
17
51+
21
5252
- name: 'Generate toolchains.xml'
5353
env:
5454
JDK_VERSION: ${{ matrix.jdk }}
@@ -84,7 +84,7 @@ jobs:
8484
distribution: 'zulu'
8585
java-version: |
8686
6
87-
17
87+
21
8888
- name: 'Generate toolchains.xml'
8989
env:
9090
JDK_VERSION: 6

‎org.jacoco.build/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
<configuration>
538538
<rules>
539539
<requireJavaVersion>
540-
<version>17</version>
540+
<version>21</version>
541541
</requireJavaVersion>
542542
<requireMavenVersion>
543543
<version>3.9.16</version>
@@ -1025,6 +1025,14 @@
10251025
<version>3.41.0</version>
10261026
</dependency>
10271027
<dependency>
1028+
<!--
1029+
Unfortunately plexus-compiler-eclipse version 2.16.2
1030+
does not pass path to JDK selected by maven-toolchain-plugin
1031+
to ECJ using argument `system`.
1032+
As a result, ECJ uses the same JDK as Maven,
1033+
so validation tests that use classes from a particular JDK version
1034+
require Maven to be executed with at least that version.
1035+
-->
10281036
<groupId>org.codehaus.plexus</groupId>
10291037
<artifactId>plexus-compiler-eclipse</artifactId>
10301038
<version>2.16.2</version>

‎org.jacoco.doc/docroot/doc/build.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1>Build</h1>
2323
<p>
2424
The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a> and
2525
can be locally executed on every machine with a proper
26-
<a href="environment.html">environment setup</a>. In particular you need JDK 17
26+
<a href="environment.html">environment setup</a>. In particular you need JDK 21
2727
installation. Developers are encouraged to run the build before every commit
2828
to ensure consistency of the source tree.
2929
</p>

‎org.jacoco.doc/docroot/doc/environment.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h3>Build</h3>
7676

7777
<p>
7878
The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a>
79-
and requires at least Maven 3.9.16 and JDK 17.
79+
and requires at least Maven 3.9.16 and JDK 21.
8080
See the <a href="build.html">build description</a> for details.
8181
</p>
8282

0 commit comments

Comments
 (0)