Skip to content

Commit 9b0e2ff

Browse files
committed
Bump project to run on a minimum of Java 17
1 parent acbca4e commit 9b0e2ff

File tree

13 files changed

+98
-255
lines changed

13 files changed

+98
-255
lines changed

.github/workflows/build-ea.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,79 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- v5
78
push:
89
branches:
910
- main
11+
- v5
1012
workflow_call: {}
1113
workflow_dispatch: {}
1214

1315
jobs:
16+
validate:
17+
name: Validation steps
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
23+
- name: Run ShellCheck
24+
uses: ludeeus/action-shellcheck@master
25+
with:
26+
check_together: 'yes'
27+
scandir: './scripts'
28+
29+
- name: Validate codecov.yml
30+
shell: bash
31+
run: curl -vvv --fail --data-binary @- https://codecov.io/validate < codecov.yml
32+
33+
1434
build:
1535
name: Build on JDK ${{ matrix.java-version }} (${{ matrix.os-name }})
1636
runs-on: ${{ matrix.os-name }}
1737

1838
strategy:
1939
fail-fast: false
2040
matrix:
21-
os-name: [ubuntu-latest]
22-
java-version:
23-
- 11 # LTS
24-
- 17 # LTS
25-
- 21 # LTS
41+
include:
42+
- java-version: 17
43+
use-oracle: false
44+
os-name: ubuntu-latest
45+
- java-version: 17
46+
use-oracle: false
47+
os-name: windows-latest
48+
- java-version: 17
49+
use-oracle: false
50+
os-name: macos-latest
51+
- java-version: 21
52+
use-oracle: false
53+
os-name: ubuntu-latest
54+
- java-version: GA
55+
use-oracle: true
56+
os-name: ubuntu-latest
57+
- java-version: EA
58+
use-oracle: true
59+
os-name: ubuntu-latest
60+
2661
steps:
2762
- name: Checkout repository
2863
uses: actions/checkout@v4
2964
with:
3065
fetch-depth: 2
3166

32-
- name: Initialize JDK
67+
- name: Initialize JDK from Temurin
68+
if: ${{ ! matrix.use-oracle }}
3369
uses: actions/setup-java@v4
3470
with:
35-
check-latest: true
36-
distribution: zulu
3771
java-version: ${{ matrix.java-version }}
72+
distribution: 'temurin'
73+
74+
- name: Initialize JDK from Oracle
75+
if: ${{ matrix.use-oracle }}
76+
uses: oracle-actions/setup-java@v1
77+
with:
78+
website: jdk.java.net
79+
release: ${{ matrix.java-version }}
3880

3981
- name: Maven cache
4082
uses: actions/cache@v4
@@ -44,7 +86,7 @@ jobs:
4486
path:
4587
~/.m2
4688
key: build-${{ env.cache-name }}
47-
89+
4890
- name: Compile and run tests
4991
shell: bash
5092
run: ./mvnw -B -U clean verify

.github/workflows/codeql.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- v5
67
types:
78
- opened
89
- synchronize
910
push:
1011
branches:
1112
- main
13+
- v5
1214
workflow_call: {}
1315
workflow_dispatch: {}
1416

@@ -18,7 +20,7 @@ jobs:
1820
runs-on: ubuntu-latest
1921

2022
concurrency:
21-
group: codeql-codeql-${{ github.head_ref || github.run_id }}
23+
group: codeql-${{ github.head_ref || github.run_id }}
2224
cancel-in-progress: true
2325

2426
permissions:

.github/workflows/deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
uses: actions/setup-java@v4
3636
with:
3737
distribution: zulu
38-
# Must use >= JDK 17 for Javadocs to generate correctly
3938
java-version: 23
4039
server-id: ossrh
4140
server-username: OSSRH_USERNAME

.github/workflows/security.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- main
6+
- v5
67

78
jobs:
89
submit-dependency-snapshot:

.github/workflows/validate.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)