From 2d348be5b2bb8be6f6826cf4e7b7838d4a7e8967 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Mon, 26 Oct 2020 13:26:11 -0500
Subject: [PATCH] DATAMONGO-2629 - Use JDK 15 for next CI jobs.

---
 Jenkinsfile                                            | 10 +++++-----
 .../Dockerfile                                         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ci/{openjdk14-mongodb-4.2 => openjdk15-mongodb-4.2}/Dockerfile (94%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 16a4d3592..4f1379af2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,16 +46,16 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 14 + MongoDB 4.2') {
+				stage('Publish JDK 15 + MongoDB 4.2') {
 					when {
-						changeset "ci/openjdk14-mongodb-4.2/**"
+						changeset "ci/openjdk15-mongodb-4.2/**"
 					}
 					agent { label 'data' }
 					options { timeout(time: 30, unit: 'MINUTES') }
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk14-with-mongodb-4.2.0", "ci/openjdk14-mongodb-4.2/")
+							def image = docker.build("springci/spring-data-openjdk15-with-mongodb-4.2.0", "ci/openjdk15-mongodb-4.2/")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
@@ -139,10 +139,10 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk14)") {
+				stage("test: baseline (jdk15)") {
 					agent {
 						docker {
-							image 'springci/spring-data-openjdk14-with-mongodb-4.2.0:latest'
+							image 'springci/spring-data-openjdk15-with-mongodb-4.2.0:latest'
 							label 'data'
 							args '-v $HOME:/tmp/jenkins-home'
 						}
diff --git a/ci/openjdk14-mongodb-4.2/Dockerfile b/ci/openjdk15-mongodb-4.2/Dockerfile
similarity index 94%
rename from ci/openjdk14-mongodb-4.2/Dockerfile
rename to ci/openjdk15-mongodb-4.2/Dockerfile
index 5f7d26c92..5f09d5c1d 100644
--- a/ci/openjdk14-mongodb-4.2/Dockerfile
+++ b/ci/openjdk15-mongodb-4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk14:latest
+FROM adoptopenjdk/openjdk15:latest
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive