Skip to content

Commit 62db187

Browse files
authored
Merge pull request #1260 from jenkinsci/remove-java17
Build project only with Java 21 and 25
2 parents 215eae1 + f6f6e66 commit 62db187

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/check-md-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: push
55
jobs:
66
check-markdown-links:
77
name: 'Check Markdown links'
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v5
1111
- uses: umbrelladocs/[email protected]

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
platform: [ubuntu-latest, macos-latest, windows-latest]
15-
jdk: [17, 21, 25]
15+
jdk: [21, 25]
1616

1717
runs-on: ${{ matrix.platform }}
1818
name: on ${{ matrix.platform }} with JDK ${{ matrix.jdk }}
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up JDK ${{ matrix.jdk }}
2323
uses: actions/setup-java@v5
2424
with:
25-
distribution: 'corretto'
25+
distribution: 'temurin'
2626
java-version: '${{ matrix.jdk }}'
2727
check-latest: true
2828
cache: 'maven'
@@ -33,4 +33,4 @@ jobs:
3333
- name: Build with Maven
3434
env:
3535
BROWSER: chrome-container
36-
run: mvn -V --color always -ntp clean verify '-Djenkins.test.timeout=5000' '-Dgpg.skip' -Pno-ui-tests
36+
run: mvn -V --color always -ntp clean verify -Pci -Pno-ui-tests '-Djenkins.test.timeout=5000' '-Dgpg.skip'

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-java@v5
3030
with:
3131
distribution: temurin
32-
java-version: 21
32+
java-version: 25
3333
cache: maven
3434

3535
- name: Set up Maven

.github/workflows/quality-monitor-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
- name: Checkout PR
1313
uses: actions/checkout@v5
14-
- name: Set up JDK 21
14+
- name: Set up JDK
1515
uses: actions/setup-java@v5
1616
with:
1717
distribution: 'temurin'
18-
java-version: 21
18+
java-version: 25
1919
check-latest: true
2020
cache: 'maven'
2121
- name: Set up Maven
@@ -41,6 +41,7 @@ jobs:
4141
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
4242
OSS_INDEX_TOKEN: ${{ secrets.OSS_INDEX_TOKEN }}
4343
PIT: ${{ env.PIT }}
44+
BROWSER: chrome-container
4445
run: |
4546
mvn -V --color always -ntp clean verify $PIT -Pci -Powasp | tee maven.log
4647
if [ "${PIPESTATUS[0]}" != "0" ]; then

.github/workflows/update-badges.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v5
16-
- name: Set up JDK 21
16+
- name: Set up JDK
1717
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'temurin'
20-
java-version: '21'
20+
java-version: '25'
2121
check-latest: true
2222
cache: 'maven'
2323
- name: Set up Maven

0 commit comments

Comments
 (0)