From eec6cea507fbadea492ce5c0015f4a3c27d1d088 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Thu, 13 May 2021 15:52:30 -0500
Subject: [PATCH] Update CI to JDK 16.

See #3603.
---
 Jenkinsfile                                            | 10 +++++-----
 .../Dockerfile                                         |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename ci/{openjdk15-mongodb-4.4 => openjdk16-mongodb-4.4}/Dockerfile (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6c2c3e17f..1eb84755a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,16 +46,16 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 15 + MongoDB 4.4') {
+				stage('Publish JDK 16 + MongoDB 4.4') {
 					when {
-						changeset "ci/openjdk15-mongodb-4.4/**"
+						changeset "ci/openjdk16-mongodb-4.4/**"
 					}
 					agent { label 'data' }
 					options { timeout(time: 30, unit: 'MINUTES') }
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.4.4", "ci/openjdk15-mongodb-4.4/")
+							def image = docker.build("springci/spring-data-openjdk16-with-mongodb-4.4.4", "ci/openjdk16-mongodb-4.4/")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
@@ -151,7 +151,7 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk15)") {
+				stage("test: baseline (jdk16)") {
 					agent {
 						label 'data'
 					}
@@ -162,7 +162,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('springci/spring-data-openjdk15-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('springci/spring-data-openjdk16-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
 									sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
 									sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
 									sh 'sleep 10'
diff --git a/ci/openjdk15-mongodb-4.4/Dockerfile b/ci/openjdk16-mongodb-4.4/Dockerfile
similarity index 100%
rename from ci/openjdk15-mongodb-4.4/Dockerfile
rename to ci/openjdk16-mongodb-4.4/Dockerfile