Add Java 21 to CI matrix build

* 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+
This commit is contained in:
Brian Demers 2023-09-25 15:09:43 -04:00 committed by Brian Demers
parent 7805e08bff
commit 7fcd652aea
2 changed files with 12 additions and 2 deletions

View File

@ -66,7 +66,7 @@ jobs:
zulu: zulu:
strategy: strategy:
matrix: 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' runs-on: 'ubuntu-latest'
env: env:
JDK_MAJOR_VERSION: ${{ matrix.java }} JDK_MAJOR_VERSION: ${{ matrix.java }}

12
pom.xml
View File

@ -656,7 +656,7 @@
</activation> </activation>
<properties> <properties>
<gmavenplus.version>1.13.1</gmavenplus.version> <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> <easymock.version>4.2</easymock.version>
<powermock.version>2.0.7</powermock.version> <powermock.version>2.0.7</powermock.version>
<maven.japicmp.version>0.15.6</maven.japicmp.version> <maven.japicmp.version>0.15.6</maven.japicmp.version>
@ -683,6 +683,16 @@
<surefire.argLine>${test.addOpens}</surefire.argLine> <surefire.argLine>${test.addOpens}</surefire.argLine>
</properties> </properties>
</profile> </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> <profile>
<id>docs</id> <id>docs</id>
<build> <build>