Skip to content

Commit 9e7a320

Browse files
committed
Add Payara 6 and Payara 7 integration test profiles
Profiles activate automatically via -Dpayara.version=6 or 7 Payara 7 requires JDK 21+ (Jakarta EE 11) Fix archive names Remove unnecesary cron - nothing is dynamic here, no need to retest Signed-off-by: Radoslav Husar <radosoft@gmail.com>
1 parent b0d4c7b commit 9e7a320

2 files changed

Lines changed: 69 additions & 26 deletions

File tree

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# This workflow will build a Java project with Maven
2-
# For more information see: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
3-
41
name: Arquillian Integration Tests
52

63
on:
@@ -10,10 +7,7 @@ on:
107
pull_request:
118
branches:
129
- '**'
13-
schedule:
14-
- cron: '0 0 * * *' # Every day at 00:00 UTC
1510

16-
# Only run the latest job
1711
concurrency:
1812
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
1913
cancel-in-progress: true
@@ -26,59 +20,77 @@ jobs:
2620
strategy:
2721
fail-fast: false
2822
matrix:
29-
os: [ubuntu-latest, windows-latest ]
30-
java: ['17', '21']
23+
os:
24+
- ubuntu-latest
25+
- windows-latest
26+
java:
27+
- 17
28+
- 21
3129

3230
steps:
3331
- uses: actions/checkout@v6
3432
- name: Set up JDK ${{ matrix.java }}
3533
uses: actions/setup-java@v5
3634
with:
3735
java-version: ${{ matrix.java }}
38-
distribution: 'temurin'
39-
cache: 'maven'
36+
distribution: temurin
37+
cache: maven
4038
- name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
4139
run: |
4240
./mvnw -V clean install -U -B -fae '-Pwildfly' '-T1' '-Pintegration-tests'
4341
- uses: actions/upload-artifact@v6
4442
if: failure()
4543
with:
46-
name: wildfly-surefire-reports-${{ matrix.os }}-${{ matrix.java }}
44+
name: ${{ matrix.os }}-${{ matrix.java }}-wildfly-surefire-reports
4745
path: '**/surefire-reports/*'
4846
- uses: actions/upload-artifact@v6
4947
if: failure()
5048
with:
51-
name: wildfly-server-logs-${{ matrix.os }}-${{ matrix.java }}
49+
name: ${{ matrix.os }}-${{ matrix.java }}-wildfly-server-logs
5250
path: '**/server.log'
5351

5452
payara-integration:
55-
name: 'Payara Integration Tests'
53+
name: 'Payara ${{ matrix.payara }} Integration Tests (${{ matrix.os }}, ${{ matrix.java }})'
5654
runs-on: ${{ matrix.os }}
5755
timeout-minutes: 90
5856
strategy:
5957
fail-fast: false
6058
matrix:
61-
os: [ubuntu-latest, windows-latest ]
62-
java: ['11', '17', '21']
59+
os:
60+
- ubuntu-latest
61+
- windows-latest
62+
java:
63+
- 11
64+
- 17
65+
- 21
66+
payara:
67+
- 6
68+
- 7
69+
exclude:
70+
# Payara 7 requires JDK 21+ (compiled with class file version 65)
71+
- java: 11
72+
payara: 7
73+
- java: 17
74+
payara: 7
6375

6476
steps:
6577
- uses: actions/checkout@v6
6678
- name: Set up JDK ${{ matrix.java }}
6779
uses: actions/setup-java@v5
6880
with:
6981
java-version: ${{ matrix.java }}
70-
distribution: 'temurin'
71-
cache: 'maven'
72-
- name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
82+
distribution: temurin
83+
cache: maven
84+
- name: Build with Maven Java ${{ matrix.java }} - Payara ${{ matrix.payara }} - ${{ matrix.os }}
7385
run: |
74-
./mvnw -V clean install -U -B -fae '-Ppayara' '-T1' '-Pintegration-tests'
86+
./mvnw -V clean install -U -B -fae '-Dpayara.version=${{ matrix.payara }}' '-T1' '-Pintegration-tests'
7587
- uses: actions/upload-artifact@v6
7688
if: failure()
7789
with:
78-
name: paraya-surefire-reports-${{ matrix.os }}-${{ matrix.java }}
90+
name: ${{ matrix.os }}-${{ matrix.java }}-payara-${{ matrix.payara }}-surefire-reports
7991
path: '**/surefire-reports/*'
8092
- uses: actions/upload-artifact@v6
8193
if: failure()
8294
with:
83-
name: paraya-server-logs-${{ matrix.os }}-${{ matrix.java }}
95+
name: ${{ matrix.os }}-${{ matrix.java }}-payara-${{ matrix.payara }}-server-logs
8496
path: '**/server.log'

integration-tests/pom.xml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,15 +259,46 @@
259259
</profile>
260260

261261
<profile>
262+
<!-- Payara 6 (Jakarta EE 10) - supports JDK 11+. Activate with -Dpayara.version=6 -->
263+
<id>payara6</id>
264+
<activation>
265+
<property>
266+
<name>payara.version</name>
267+
<value>6</value>
268+
</property>
269+
</activation>
270+
<properties>
271+
<version.fish.payara>6.2025.10</version.fish.payara>
272+
<payara.home>${project.build.directory}${file.separator}payara6</payara.home>
273+
</properties>
274+
</profile>
275+
276+
<profile>
277+
<!-- Payara 7 (Jakarta EE 11) - requires JDK 21+. Activate with -Dpayara.version=7 -->
278+
<id>payara7</id>
279+
<activation>
280+
<property>
281+
<name>payara.version</name>
282+
<value>7</value>
283+
</property>
284+
</activation>
285+
<properties>
286+
<version.fish.payara>7.2026.1</version.fish.payara>
287+
<payara.home>${project.build.directory}${file.separator}payara7</payara.home>
288+
</properties>
289+
</profile>
290+
291+
<profile>
292+
<!-- Common Payara configuration - activates automatically when payara.version is set -->
262293
<id>payara</id>
294+
<activation>
295+
<property>
296+
<name>payara.version</name>
297+
</property>
298+
</activation>
263299
<properties>
264300
<skip.provision.server>${skipTests}</skip.provision.server>
265-
266-
<!-- Versions -->
267-
<version.fish.payara>6.2025.10</version.fish.payara>
268301
<version.fish.payara.arquillian>3.1</version.fish.payara.arquillian>
269-
270-
<payara.home>${project.build.directory}${file.separator}payara6</payara.home>
271302
</properties>
272303

273304
<dependencies>

0 commit comments

Comments
 (0)