Skip to content

Commit

Permalink
Add Java 21 to CI matrix build
Browse files Browse the repository at this point in the history
* Update groovy patch version to support Java 21.

NOTE: This adds a Maven profile that ups the source/target version to Java 8, but ONLY when building with 21+
  • Loading branch information
bdemers committed Sep 25, 2023
1 parent 7805e08 commit 7fcd652
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
zulu:
strategy:
matrix:
java: [ '7', '8', '9', '11', '12', '13', '14', '15', '16', '17', '18' ]
java: [ '7', '8', '9', '11', '12', '13', '14', '15', '16', '17', '18', '21' ]
runs-on: 'ubuntu-latest'
env:
JDK_MAJOR_VERSION: ${{ matrix.java }}
Expand Down
12 changes: 11 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@
</activation>
<properties>
<gmavenplus.version>1.13.1</gmavenplus.version>
<groovy.version>3.0.10</groovy.version>
<groovy.version>3.0.19</groovy.version>
<easymock.version>4.2</easymock.version>
<powermock.version>2.0.7</powermock.version>
<maven.japicmp.version>0.15.6</maven.japicmp.version>
Expand All @@ -683,6 +683,16 @@
<surefire.argLine>${test.addOpens}</surefire.argLine>
</properties>
</profile>
<profile>
<id>jdk21AndLater</id>
<activation>
<jdk>[21,)</jdk>
</activation>
<properties>
<!-- normally this is 1.7, but as of 21, JDK 8 is the lowest source/target -->
<jdk.version>8</jdk.version>
</properties>
</profile>
<profile>
<id>docs</id>
<build>
Expand Down

0 comments on commit 7fcd652

Please sign in to comment.