Skip to content

Commit 98ce1d7

Browse files
committed
Merge branch '3.4.x' into 3.5.x
Closes gh-46980
2 parents 234501a + e1e8914 commit 98ce1d7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/actions/prepare-gradle-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
tool-cache: true
3535
docker-images: false
3636
- name: Set Up Java
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
3838
with:
3939
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
4040
java-version: |

.github/actions/publish-gradle-plugin/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
shell: bash
2929
run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-boot-{0}', inputs.plugin-version) }};buildNumber=${{ inputs.build-number }}'
3030
- name: Set Up Java
31-
uses: actions/setup-java@v4
31+
uses: actions/setup-java@v5
3232
with:
3333
distribution: 'liberica'
3434
java-version: '17'

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
path: send-notification
5050
sparse-checkout: .github/actions/send-notification
5151
- name: Set Up Java
52-
uses: actions/setup-java@v4
52+
uses: actions/setup-java@v5
5353
with:
5454
distribution: 'liberica'
5555
java-version: 17

0 commit comments

Comments
 (0)