Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Enable jdk21 builds #2702

Merged
merged 1 commit into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-prb-reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
# Matrix should be coordinated with ci-prb.yml.
matrix:
java: [ 8, 11, 17, 20 ]
java: [ 8, 11, 17, 21 ]
os: [ ubuntu-latest ]
steps:
- name: Download Artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-prb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ 8, 11, 17, 20 ]
java: [ 8, 11, 17, 21 ]
os: [ ubuntu-latest ]
steps:
- name: Checkout Code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-prq-reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11, 17, 20 ]
java: [ 8, 11, 17, 21 ]
steps:
- name: Download Artifacts
uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-prq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11, 17, 20 ]
java: [ 8, 11, 17, 21 ]
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ task validateLocalDocSite(type: Exec) {
quality.dependsOn validateLocalDocSite

subprojects {
// mockito 5 only supports jdk11+
if (JavaVersion.current() < JavaVersion.VERSION_11) {
project.setProperty("mockitoCoreVersion", "4.11.0")
}
// Used by ci-release.yaml to determine which modules need to be built/released with JDK11.
task printJavaTargetCompatibility {
doLast {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ junit5Version=5.9.3
testngVersion=7.5
assertJCoreVersion=3.24.2
hamcrestVersion=2.2
mockitoCoreVersion=4.11.0
# mockito version is overridden for <jdk11 in build.gradle
mockitoCoreVersion=5.5.0
spotbugsPluginVersion=5.0.13

apacheDirectoryServerVersion=1.5.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
xml.enabled = project.ext.isCiBuild
html.enabled = !project.ext.isCiBuild
}
// https://github.com/spotbugs/spotbugs/issues/2567
enabled = JavaVersion.current() < JavaVersion.VERSION_21
}

tasks.withType(SpotBugsTask).all {
Expand Down
Loading