Skip to content

Commit 1a84fdd

Browse files
authored
feat: [FFM-12612]: Fix build to work with Java 25 (#209)
* feat: [FFM-12612]: Fix build to work with Java 25 * fix github action
1 parent 313989d commit 1a84fdd

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/ci_gradle.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ jobs:
2525
- uses: actions/checkout@v3
2626
with:
2727
submodules: true
28-
- name: Set up JDK 11
29-
uses: actions/setup-java@v3
28+
- name: Setup Java
29+
uses: actions/setup-java@v4
3030
with:
31-
java-version: '11'
3231
distribution: 'temurin'
32+
java-version: 17
33+
- name: Setup Gradle
34+
uses: gradle/actions/setup-gradle@v4
3335
- name: Build with Gradle
34-
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
35-
with:
36-
arguments: build
37-
gradle-version: 8.5
38-
36+
run: ./gradlew build

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ allprojects {
4242
resolutionStrategy {
4343
// version overrides for CVE fixes
4444
force 'org.apache.commons:commons-lang3:3.18.0' // CVE-2025-48924
45-
force "ch.qos.logback:logback-classic:1.3.15" // CVE-2024-12798, CVE-2024-12801
45+
force 'ch.qos.logback:logback-classic:1.3.15' // CVE-2024-12798, CVE-2024-12801
4646
force 'com.google.code.gson:gson:2.13.1' // CVE-2025-53864
47+
48+
// JDK 25 fix for spotless plugin
49+
force 'com.google.googlejavaformat:google-java-format:1.27.0'
4750
}
4851
}
4952

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencyResolutionManagement {
3838
// do not upgrade openapi, doing so will break compatibility with customers using SpringBoot 2.5.x
3939
// (newer 5.x.x generators use APIs not present in okhttp 3.14.9)
4040
version('openapi.generator', '4.3.1')
41-
version('spotless', '7.1.0')
41+
version('spotless', '7.2.1')
4242
version('depsize', '0.2.0')
4343
version('spotbugs', '6.2.3')
4444
version('depcheck', '12.1.3')

0 commit comments

Comments
 (0)