Skip to content

Commit 0ae6281

Browse files
kopporkoppor
authored
Merge 62f86c6 into be8e57d 
2 parents be8e57d + 62f86c6 commit 0ae6281

File tree

12 files changed

+40
-41
lines changed

12 files changed

+40
-41
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
// Install java.
3232
// See https://github.com/devcontainers/features/tree/main/src/java#options for details.
3333
"ghcr.io/devcontainers/features/java:1": {
34-
"version": "24.0.2-amzn",
34+
"version": "latest",
3535
"installGradle": true,
36-
"gradleVersion": "8.14.3",
37-
"jdkDistro": "Corretto"
36+
"gradleVersion": "latest",
37+
"jdkDistro": "Temurin"
3838
}
3939
}
4040
}

‎.github/workflows/binaries.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ jobs:
195195
- name: Setup JDK
196196
uses: actions/setup-java@v5
197197
with:
198-
java-version: '24'
199-
distribution: 'corretto'
198+
java-version: 25
199+
distribution: 'temurin'
200200
check-latest: true
201201
- name: Setup Gradle
202202
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ jobs:
9292
- name: Setup JDK
9393
uses: actions/setup-java@v5
9494
with:
95-
java-version: '24'
96-
distribution: 'corretto'
95+
java-version: 25
96+
distribution: 'temurin'
9797
check-latest: true
9898
- name: Setup Gradle
9999
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/run-openrewrite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
- name: Set up JDK
3434
uses: actions/setup-java@v5
3535
with:
36-
java-version: 24
37-
distribution: 'corretto'
36+
java-version: 25
37+
distribution: 'temurin'
3838
check-latest: true
3939
- name: Setup Gradle
4040
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/sbom-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- name: Set up JDK
2222
uses: actions/setup-java@v5
2323
with:
24-
distribution: 'corretto'
25-
java-version: '24'
24+
distribution: 'temurin'
25+
java-version: 25
2626
check-latest: true
2727
cache: 'gradle'
2828

‎.github/workflows/tests-code-fetchers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- name: Set up JDK
5757
uses: actions/setup-java@v5
5858
with:
59-
java-version: 24
60-
distribution: 'corretto'
59+
java-version: 25
60+
distribution: 'temurin'
6161
check-latest: true
6262
- name: Setup Gradle
6363
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/tests-code.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
- name: Set up JDK
5353
uses: actions/setup-java@v5
5454
with:
55-
java-version: 24
56-
distribution: 'corretto'
55+
java-version: 25
56+
distribution: 'temurin'
5757
check-latest: true
5858
- name: Run checkstyle reporter
5959
uses: dbelyaev/action-checkstyle@master
@@ -92,8 +92,8 @@ jobs:
9292
- name: Set up JDK
9393
uses: actions/setup-java@v5
9494
with:
95-
java-version: 24
96-
distribution: 'corretto'
95+
java-version: 25
96+
distribution: 'temurin'
9797
check-latest: true
9898
- name: Setup Gradle
9999
uses: gradle/actions/setup-gradle@v4
@@ -139,8 +139,8 @@ jobs:
139139
- name: Set up JDK
140140
uses: actions/setup-java@v5
141141
with:
142-
java-version: 24
143-
distribution: 'corretto'
142+
java-version: 25
143+
distribution: 'temurin'
144144
check-latest: true
145145
- name: Setup Gradle
146146
uses: gradle/actions/setup-gradle@v4
@@ -257,8 +257,8 @@ jobs:
257257
- name: Set up JDK
258258
uses: actions/setup-java@v5
259259
with:
260-
java-version: 24
261-
distribution: 'corretto'
260+
java-version: 25
261+
distribution: 'temurin'
262262
check-latest: true
263263
- name: Setup Gradle
264264
uses: gradle/actions/setup-gradle@v4
@@ -293,8 +293,8 @@ jobs:
293293
- name: Set up JDK
294294
uses: actions/setup-java@v5
295295
with:
296-
java-version: 24
297-
distribution: 'corretto'
296+
java-version: 25
297+
distribution: 'temurin'
298298
check-latest: true
299299
- name: Generate JBang cache key
300300
id: cache-key
@@ -342,8 +342,8 @@ jobs:
342342
- name: Set up JDK
343343
uses: actions/setup-java@v5
344344
with:
345-
java-version: 24
346-
distribution: 'corretto'
345+
java-version: 25
346+
distribution: 'temurin'
347347
check-latest: true
348348
- name: Setup Gradle
349349
uses: gradle/actions/setup-gradle@v4
@@ -392,8 +392,8 @@ jobs:
392392
- name: Set up JDK
393393
uses: actions/setup-java@v5
394394
with:
395-
java-version: 24
396-
distribution: 'corretto'
395+
java-version: 25
396+
distribution: 'temurin'
397397
check-latest: true
398398
- name: Setup Gradle
399399
uses: gradle/actions/setup-gradle@v4
@@ -441,8 +441,8 @@ jobs:
441441
- name: Set up JDK
442442
uses: actions/setup-java@v5
443443
with:
444-
java-version: 24
445-
distribution: 'corretto'
444+
java-version: 25
445+
distribution: 'temurin'
446446
check-latest: true
447447
- name: Generate JBang cache key
448448
id: cache-key
@@ -482,8 +482,8 @@ jobs:
482482
- name: Set up JDK
483483
uses: actions/setup-java@v5
484484
with:
485-
java-version: 24
486-
distribution: 'corretto'
485+
java-version: 25
486+
distribution: 'temurin'
487487
check-latest: true
488488
- name: Generate JBang cache key
489489
id: cache-key
@@ -559,8 +559,8 @@ jobs:
559559
if: github.ref == 'refs/heads/main'
560560
uses: actions/setup-java@v5
561561
with:
562-
java-version: 24
563-
distribution: 'corretto'
562+
java-version: 25
563+
distribution: 'temurin'
564564
check-latest: true
565565
- name: Setup Gradle
566566
uses: gradle/actions/setup-gradle@v4
@@ -605,8 +605,8 @@ jobs:
605605
- name: Set up JDK
606606
uses: actions/setup-java@v5
607607
with:
608-
java-version: 24
609-
distribution: 'corretto'
608+
java-version: 25
609+
distribution: 'temurin'
610610
check-latest: true
611611
- name: Setup Gradle
612612
uses: gradle/actions/setup-gradle@v4

‎.moderne/moderne.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
specs: specs.moderne.ai/v1/cli
22
java:
3-
selectedJdk: '24'
3+
selectedJdk: '25'

‎.sdkmanrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
java=24.0.2-amzn
1+
java=25-tem
22
#visualvm=2.1.10

‎build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ java {
1212
// - .github/workflows/binaries*.yml
1313
// - .github/workflows/publish.yml
1414
// - .github/workflows/tests*.yml
15-
// - .github/workflows/update-gradle-wrapper.yml
1615
// - docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md
1716
// - .sdkmanrc
1817
languageVersion = JavaLanguageVersion.of(24)

0 commit comments

Comments
 (0)