Skip to content

Commit cfcdf0b

Browse files
committed
chore(build): bump Java versions in actions, allow legacy branches
1 parent 3fc3b29 commit cfcdf0b

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/codeql.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [s3mock-v2, main]
16+
branches: [s3mock-v2, s3mock-v3, s3mock-v4, main]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [s3mock-v2, main]
19+
branches: [s3mock-v2, s3mock-v3, s3mock-v4, main]
2020
schedule:
2121
- cron: '43 21 * * 6'
2222

@@ -64,12 +64,12 @@ jobs:
6464
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
6565
# queries: security-extended,security-and-quality
6666

67-
# Set up JDK 17, otherwise autobuild will fail below.
67+
# Set up JDK 25, otherwise autobuild will fail below.
6868
- name: Set up JDK
6969
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7070
with:
71-
java-version: 21
72-
distribution: 'temurin'
71+
java-version: 25
72+
distribution: 'oracle'
7373
cache: 'maven'
7474

7575
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).

.github/workflows/maven-ci-and-prb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ name: Maven Build
2020

2121
on:
2222
push:
23-
branches: [s3mock-v2, main]
23+
branches: [s3mock-v2, s3mock-v3, s3mock-v4, main]
2424
pull_request:
25-
branches: [s3mock-v2, main]
25+
branches: [s3mock-v2, s3mock-v3, s3mock-v4, main]
2626

2727
# Declare default permissions as read only.
2828
permissions: read-all

.github/workflows/maven-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ jobs:
4040
- name: Set up JDK
4141
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4242
with:
43-
java-version: 21
44-
distribution: 'temurin'
43+
java-version: 25
44+
distribution: 'oracle'
45+
cache: 'maven'
4546

4647
# The release build pushes a Docker image to Docker Hub, so we need to log in
4748
- name: Perform docker login

0 commit comments

Comments
 (0)