From b375a91ac5153ef2c6781dec4968a2cd5a40ab26 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 10 Jun 2026 09:33:32 +0300 Subject: [PATCH 1/3] Java 25 --- .github/workflows/maven.yml | 16 ++++++++-------- build.gradle | 6 +++--- pom-central.xml | 10 +++++----- pom-central21.xml | 6 +++--- pom.xml | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bcdebc243..75ad880ac 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,11 +20,11 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: distribution: 'corretto' - java-version: '17' + java-version: '25' cache: 'gradle' - name: Cache SonarCloud packages uses: actions/cache@v5 @@ -47,11 +47,11 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: distribution: 'corretto' - java-version: '17' + java-version: '25' cache: 'gradle' - name: Build with Gradle run: ./gradlew test --no-daemon @@ -65,11 +65,11 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: distribution: 'corretto' - java-version: '17' + java-version: '25' cache: 'gradle' - name: Build with Gradle run: chmod +x gradlew && ./gradlew test --no-daemon @@ -81,11 +81,11 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: distribution: 'corretto' - java-version: '17' + java-version: '25' cache: 'maven' - name: Build and analyze run: mvn -B compile diff --git a/build.gradle b/build.gradle index 657436fc2..da7640a6e 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,10 @@ repositories { } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter:[5.13.3,)' + testImplementation 'org.junit.jupiter:junit-jupiter:[5.14.4,)' testImplementation 'org.hamcrest:hamcrest-core:[3.0,)' testImplementation 'org.zapodot:embedded-db-junit-jupiter:[2.2.3,)' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher:[1.13.3,)' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher:[1.14.4,)' } test { @@ -26,7 +26,7 @@ test { group = 'com.github.javadev' version = '1.49-SNAPSHOT' description = 'leetcode-in-java' -java.sourceCompatibility = JavaVersion.VERSION_17 +java.sourceCompatibility = JavaVersion.VERSION_25 java { withSourcesJar() diff --git a/pom-central.xml b/pom-central.xml index 30105e979..86166c64e 100644 --- a/pom-central.xml +++ b/pom-central.xml @@ -44,8 +44,8 @@ maven-compiler-plugin 3.14.0 - 17 - 17 + 25 + 25 UTF-8 -Xlint:unchecked @@ -61,7 +61,7 @@ org.junit.jupiter junit-jupiter-engine - [5.13.3,) + [5.14.4,) @@ -179,13 +179,13 @@ org.junit.jupiter junit-jupiter-api - [5.13.3,) + [5.14.4,) test org.junit.jupiter junit-jupiter-engine - [5.13.3,) + [5.14.4,) test diff --git a/pom-central21.xml b/pom-central21.xml index 211c32598..7f705fa46 100644 --- a/pom-central21.xml +++ b/pom-central21.xml @@ -42,7 +42,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.15.0 21 21 @@ -185,13 +185,13 @@ org.junit.jupiter junit-jupiter-api - [5.13.3,) + [5.14.4,) test org.junit.jupiter junit-jupiter-engine - [5.13.3,) + [5.14.4,) test diff --git a/pom.xml b/pom.xml index ab9c3e468..e2328440e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,8 @@ maven-compiler-plugin 3.15.0 - 17 - 17 + 25 + 25 UTF-8 -Xlint:unchecked @@ -60,7 +60,7 @@ org.junit.jupiter junit-jupiter-engine - [5.13.3,) + [5.14.4,) @@ -172,19 +172,19 @@ org.junit.jupiter junit-jupiter-api - [5.13.3,) + [5.14.4,) test org.junit.jupiter junit-jupiter-engine - [5.13.3,) + [5.14.4,) test org.junit.platform junit-platform-launcher - [1.13.3,) + [1.14.4,) test From eeebd741804e89c14f7ebc0c2df395c26d487a21 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 10 Jun 2026 10:04:42 +0300 Subject: [PATCH 2/3] Update Spotless and Google Java Format versions --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index da7640a6e..1197e79bc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'maven-publish' - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' id 'org.sonarqube' version '6.2.0.5505' id 'jacoco' } @@ -46,7 +46,7 @@ spotless { } importOrder '\\#', '', '*' removeUnusedImports() - googleJavaFormat('1.22.0').aosp() + googleJavaFormat('1.25.2').aosp() toggleOffOn() endWithNewline() } From b30a92f27e1dda2a47e35512210f3ce6f97c56d8 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 10 Jun 2026 10:09:03 +0300 Subject: [PATCH 3/3] Update googleJavaFormat version to 1.30.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1197e79bc..63f403290 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ spotless { } importOrder '\\#', '', '*' removeUnusedImports() - googleJavaFormat('1.25.2').aosp() + googleJavaFormat('1.30.0').aosp() toggleOffOn() endWithNewline() }