Skip to content

Test on Java 21 #1242

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Test on Java 21 #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions .evergreen/.evg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,10 @@ axes:
- id: jdk
display_name: JDK
values:
- id: "jdk21"
display_name: JDK21
variables:
JAVA_VERSION: "21"
- id: "jdk17"
display_name: JDK17
variables:
Expand Down Expand Up @@ -2012,7 +2016,8 @@ buildvariants:
- name: "test"

- matrix_name: "tests-jdk-secure"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk8", "jdk17" ], version: [ "3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "latest" ],
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk8", "jdk17", "jdk21"],
version: [ "3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "latest" ],
topology: "*", os: "linux" }
display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: ["tests-variant"]
Expand All @@ -2027,26 +2032,28 @@ buildvariants:
- name: "test"

- matrix_name: "tests-require-api-version"
matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: ["jdk17"], version: ["5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" }
matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: ["jdk21"], version: ["5.0", "6.0", "7.0", "latest"],
topology: "standalone", os: "linux" }
display_name: "${version} ${topology} ${api-version} "
tags: ["tests-variant"]
tasks:
- name: "test"

- matrix_name: "tests-load-balancer-secure"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk17"], version: ["5.0", "6.0", "7.0", "latest"], topology: "sharded-cluster", os: "ubuntu" }
matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk21"], version: ["5.0", "6.0", "7.0", "latest"], topology: "sharded-cluster",
os: "ubuntu" }
display_name: "Load Balancer ${version} ${auth} ${ssl} ${jdk} ${os}"
tasks:
- name: "load-balancer-test"

- matrix_name: "tests-serverless"
matrix_spec: { jdk: ["jdk17"], os: "ubuntu" }
matrix_spec: { jdk: ["jdk21"], os: "ubuntu" }
display_name: "Serverless"
tasks:
- name: "serverless-test"

- matrix_name: "tests-slow"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["7.0"], topology: "standalone", os: "linux" }
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk21", version: ["7.0"], topology: "standalone", os: "linux" }
display_name: "Slow: ${version} ${topology} ${ssl} ${jdk} ${os} "
tags: ["tests-slow-variant"]
tasks:
Expand Down Expand Up @@ -2088,7 +2095,7 @@ buildvariants:
- name: "socket-test"

- matrix_name: "test-gssapi"
matrix_spec: { jdk: ["jdk8", "jdk17"], os: "linux", gssapi-login-context-name: "*"}
matrix_spec: { jdk: ["jdk8", "jdk17", "jdk21"], os: "linux", gssapi-login-context-name: "*"}
display_name: "GSSAPI (Kerberos) Auth test ${jdk} ${os} ${gssapi-login-context-name}"
tags: ["test-gssapi-variant"]
tasks:
Expand Down Expand Up @@ -2120,15 +2127,15 @@ buildvariants:
- name: "test_atlas_task_group_search_indexes"

- matrix_name: "aws-auth-test"
matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu",
matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17", "jdk21"], version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu",
aws-credential-provider: "*" }
display_name: "MONGODB-AWS Basic Auth test ${version} ${jdk} ${aws-credential-provider}"
run_on: ubuntu2004-small
tasks:
- name: "aws-auth-test-with-regular-aws-credentials"

- matrix_name: "aws-ec2-auth-test"
matrix_spec: { ssl: "nossl", jdk: ["jdk17"], version: ["7.0"], os: "ubuntu", aws-credential-provider: "*" }
matrix_spec: { ssl: "nossl", jdk: ["jdk21"], version: ["7.0"], os: "ubuntu", aws-credential-provider: "*" }
display_name: "MONGODB-AWS Advanced Auth test ${version} ${jdk} ${aws-credential-provider}"
run_on: ubuntu2004-small
tasks:
Expand All @@ -2139,14 +2146,14 @@ buildvariants:
- name: "aws-auth-test-with-web-identity-credentials"

- matrix_name: "accept-api-version-2-test"
matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk17", version: ["5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" }
matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk21", version: ["5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" }
display_name: "Accept API Version 2 ${version}"
run_on: ubuntu2004-small
tasks:
- name: "accept-api-version-2-test"

- matrix_name: "ocsp-test"
matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk17", version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu" }
matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk21", version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu" }
display_name: "OCSP test ${version} ${os}"
tasks:
- name: ".ocsp"
Expand Down Expand Up @@ -2176,14 +2183,14 @@ buildvariants:
- name: "reactive-streams-tck-test"

- matrix_name: "scala-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["7.0"], topology: "replicaset", scala: "*", os: "ubuntu" }
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk21", version: ["7.0"], topology: "replicaset", scala: "*", os: "ubuntu" }
display_name: "${scala} ${version} ${topology} ${os}"
tags: ["test-scala-variant"]
tasks:
- name: "scala-tests"

- matrix_name: "kotlin-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["7.0"], topology: "replicaset", os: "ubuntu" }
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: ["jdk8", "jdk17", "jdk21"], version: ["7.0"], topology: "replicaset", os: "ubuntu" }
display_name: "Kotlin: ${jdk} ${version} ${topology} ${os}"
tags: ["test-kotlin-variant"]
tasks:
Expand Down
1 change: 1 addition & 0 deletions .evergreen/javaConfig.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
export JDK8="/opt/java/jdk8"
export JDK11="/opt/java/jdk11"
export JDK17="/opt/java/jdk17"
export JDK21="/opt/java/jdk21"

if [ -d "$JDK17" ]; then
export JAVA_HOME=$JDK17
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ configure(javaCodeCheckedProjects) {
testImplementation platform('org.spockframework:spock-bom:2.1-groovy-3.0')
testImplementation 'org.spockframework:spock-core'
testImplementation 'org.spockframework:spock-junit4'
testImplementation("org.mockito:mockito-core:3.8.0")
testImplementation("org.mockito:mockito-inline:3.8.0")
testImplementation("org.mockito:mockito-core:5.6.0")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of the 5.3.0 release. mockito-inline is no longer published. It's functionality is now part of mockito-core

testImplementation 'cglib:cglib-nodep:2.2.2'
testImplementation 'org.objenesis:objenesis:1.3'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
Expand Down
2 changes: 1 addition & 1 deletion driver-reactive-streams/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
testImplementation project(':driver-core').sourceSets.test.output
testImplementation 'org.reactivestreams:reactive-streams-tck:1.0.4'
testImplementation 'io.projectreactor:reactor-test'
testImplementation 'org.mockito:mockito-junit-jupiter:3.5.13'
testImplementation 'org.mockito:mockito-junit-jupiter:5.6.0'
testRuntimeOnly project(path: ':driver-core', configuration: 'consumableTestRuntimeOnly')
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ scalaVersions=2.11.12,2.12.15,2.13.6
defaultScalaVersions=2.13.6
runOnceTasks=clean,release
org.gradle.java.installations.auto-download=false
org.gradle.java.installations.fromEnv=JDK8,JDK11,JDK17
org.gradle.java.installations.fromEnv=JDK8,JDK11,JDK17,JDK21