Skip to content

Commit facdc18

Browse files
authored
ci: use .java-version (#11323)
1 parent d18ccc5 commit facdc18

17 files changed

+26
-24
lines changed

.github/workflows/auto-update-otel-sdk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
7070
with:
7171
distribution: temurin
72-
java-version: 21
72+
java-version-file: .java-version
7373

7474
- name: Setup Gradle
7575
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/build-common.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
3636
with:
3737
distribution: temurin
38-
java-version: 21
38+
java-version-file: .java-version
3939

4040
- name: Setup Gradle
4141
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
6969
with:
7070
distribution: temurin
71-
java-version: 21
71+
java-version-file: .java-version
7272

7373
- name: Setup Gradle
7474
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -138,7 +138,7 @@ jobs:
138138
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
139139
with:
140140
distribution: temurin
141-
java-version: 21
141+
java-version-file: .java-version
142142

143143
- name: Increase gradle daemon heap size
144144
run: |
@@ -220,7 +220,7 @@ jobs:
220220
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
221221
with:
222222
distribution: temurin
223-
java-version: 21
223+
java-version-file: .java-version
224224

225225
# vaadin 14 tests fail with node 18
226226
- name: Set up Node
@@ -335,7 +335,7 @@ jobs:
335335
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
336336
with:
337337
distribution: temurin
338-
java-version: 21
338+
java-version-file: .java-version
339339

340340
- name: Set up Gradle cache
341341
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -388,7 +388,7 @@ jobs:
388388
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
389389
with:
390390
distribution: temurin
391-
java-version: 21
391+
java-version-file: .java-version
392392

393393
- name: Setup Gradle
394394
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -411,7 +411,7 @@ jobs:
411411
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
412412
with:
413413
distribution: temurin
414-
java-version: 21
414+
java-version-file: .java-version
415415

416416
- name: Set up Gradle cache
417417
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
7171
with:
7272
distribution: temurin
73-
java-version: 21
73+
java-version-file: .java-version
7474

7575
- name: Setup Gradle
7676
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/codeql-daily.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2828
with:
2929
distribution: temurin
30-
java-version: 21
30+
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
3333
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5

.github/workflows/owasp-dependency-check-daily.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2323
with:
2424
distribution: temurin
25-
java-version: 21
25+
java-version-file: .java-version
2626

2727
- name: Increase gradle daemon heap size
2828
run: |

.github/workflows/pr-smoke-test-fake-backend-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2323
with:
2424
distribution: temurin
25-
java-version: 21
25+
java-version-file: .java-version
2626

2727
- name: Setup Gradle
2828
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
5050
with:
5151
distribution: temurin
52-
java-version: 21
52+
java-version-file: .java-version
5353

5454
- name: Setup Gradle
5555
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/pr-smoke-test-servlet-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/setup-java@v4
4141
with:
4242
distribution: temurin
43-
java-version: 21
43+
java-version-file: .java-version
4444

4545
- name: Set up Gradle cache
4646
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/publish-smoke-test-fake-backend-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin
25-
java-version: 21
25+
java-version-file: .java-version
2626

2727
- name: Login to GitHub package registry
2828
uses: docker/login-action@v3
@@ -55,7 +55,7 @@ jobs:
5555
uses: actions/setup-java@v4
5656
with:
5757
distribution: temurin
58-
java-version: 21
58+
java-version-file: .java-version
5959

6060
- name: Login to GitHub package registry
6161
uses: azure/docker-login@v1

.github/workflows/publish-smoke-test-servlet-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
5858
with:
5959
distribution: temurin
60-
java-version: 21
60+
java-version-file: .java-version
6161

6262
- name: Login to GitHub package registry
6363
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
8484
with:
8585
distribution: temurin
86-
java-version: 21
86+
java-version-file: .java-version
8787

8888
- name: Setup Gradle
8989
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/reusable-muzzle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
3232
with:
3333
distribution: temurin
34-
java-version: 21
34+
java-version-file: .java-version
3535

3636
- name: Setup Gradle
3737
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

.github/workflows/reusable-native-tests.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
16+
- id: read-java
17+
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
1618
- uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1.1
1719
with:
1820
version: "latest"
19-
java-version: "21"
21+
java-version: "${{ steps.read-java.outputs.version }}"
2022
components: "native-image"
2123
- name: Running test
2224
env:

.github/workflows/reusable-smoke-test-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
4848
with:
4949
distribution: temurin
50-
java-version: 21
50+
java-version-file: .java-version
5151

5252
- name: Login to GitHub package registry
5353
if: inputs.publish

.github/workflows/reusable-test-indy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
4040
with:
4141
distribution: temurin
42-
java-version: 21
42+
java-version-file: .java-version
4343

4444
- name: Increase gradle daemon heap size
4545
run: |

.github/workflows/reusable-test-latest-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
3939
with:
4040
distribution: temurin
41-
java-version: 21
41+
java-version-file: .java-version
4242

4343
- name: Increase gradle daemon heap size
4444
run: |

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ out/
5454
/workspace
5555
java-agent/benchmark-integration/perf-test-settings.rc
5656
derby.log
57-
.java-version
5857
hs_err_pid*
5958
replay_pid*
6059
.attach_pid*

.java-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
21

0 commit comments

Comments
 (0)