Skip to content

Commit

Permalink
Replace Java 19 by 21 (LTS) in CI
Browse files Browse the repository at this point in the history
* Bump Spring Boot test to v3.1.3
  • Loading branch information
abelsromero committed Sep 21, 2023
1 parent 9f2d1ff commit bc53d02
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
java:
- '11'
- '17'
- '19'
- '21'
os:
- ubuntu-latest
- macos-latest
Expand All @@ -50,7 +50,7 @@ jobs:
java:
- '11'
- '17'
- '19'
- '21'
os:
- windows-latest
runs-on: ${{ matrix.os }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Build Improvement::
* Set JUnit5 as default test engine (#1186) (@abelsromero)
* Removed pollutedTest Gradle task using junit-pioneer (#1193) (@abelsromero)
* Ignore 'docs/**' changes in CI (#1225) (@abelsromero)
* Run tests on Java 21 (#1236) (@abelsromero)

Documentation::

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version '3.1.0'
id 'org.springframework.boot' version '3.1.3'
id 'java'
}

Expand Down Expand Up @@ -31,8 +31,8 @@ java {

def getToolchainVersion() {
if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
return 19
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21))
return 21
}
return 17
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ configure(subprojects.findAll { !it.name.endsWith('-distribution') && ! it.name.
// Windows workaround to fix invalid toolchain detection
def getToolchainVersion() {
if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
return 19
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21))
return 21
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17))
return 17
}
Expand Down

0 comments on commit bc53d02

Please sign in to comment.