Skip to content

Commit

Permalink
Update maven-enforcer version and GHA workflow for Java 21 (#166)
Browse files Browse the repository at this point in the history
* Update maven-enforcer version and GHA workflow for Java 21

* Test with 23.0.0.10

* Remove older Liberty version from test workflow
  • Loading branch information
mattbsox committed Oct 17, 2023
1 parent 364087e commit ffca405
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
os: [ubuntu-latest, windows-latest]
WLP_VERSION: [23.0.0_09, 23.0.0_06]
java: [17, 11, 8]
WLP_VERSION: [23.0.0_10]
java: [21, 17, 11, 8]
include:
# match up licenses to WLP versions
# http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml
- WLP_VERSION: 23.0.0_06
WLP_LICENSE: L-PGXD-4P769M
- WLP_VERSION: 23.0.0_09
WLP_LICENSE: L-BFLK-F8ALSQ
- WLP_VERSION: 23.0.0_10
WLP_LICENSE: L-HGVA-YUBJDP

runs-on: ${{ matrix.os }}
name: WL ${{ matrix.WLP_VERSION }}, Java ${{ matrix.java }}, ${{ matrix.os }}
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down
4 changes: 2 additions & 2 deletions src/it/setup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<modules>
Expand Down

0 comments on commit ffca405

Please sign in to comment.