From 9028076cb7cef893f58fadd5d1cd999cc4547375 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 18 Mar 2021 08:45:20 +0100
Subject: [PATCH] Switch CI build from Java 15 to Java 16

Closes gh-1203
---
 .../Dockerfile                                |  2 +-
 ci/images/get-jdk-url.sh                      |  4 +--
 ci/pipeline.yml                               | 32 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename ci/images/{ci-image-jdk15 => ci-image-jdk16}/Dockerfile (86%)

diff --git a/ci/images/ci-image-jdk15/Dockerfile b/ci/images/ci-image-jdk16/Dockerfile
similarity index 86%
rename from ci/images/ci-image-jdk15/Dockerfile
rename to ci/images/ci-image-jdk16/Dockerfile
index 3d7547c0..17b65256 100644
--- a/ci/images/ci-image-jdk15/Dockerfile
+++ b/ci/images/ci-image-jdk16/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:focal-20210217
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java15
+RUN ./setup.sh java16
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
\ No newline at end of file
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 02d6b8f8..e636ac5c 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -8,8 +8,8 @@ case "$1" in
 	java11)
 		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
 	;;
-	java15)
-		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
+	java16)
+		 echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 3ae3eb5f..e6159bc8 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -112,12 +112,12 @@ resources:
   source:
     <<: *registry-image-resource-source
     repository: ((docker-hub-organization))/initializr-ci-jdk11
-- name: ci-image-jdk15
+- name: ci-image-jdk16
   type: registry-image
   icon: docker
   source:
     <<: *registry-image-resource-source
-    repository: ((docker-hub-organization))/initializr-ci-jdk15
+    repository: ((docker-hub-organization))/initializr-ci-jdk16
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -142,14 +142,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk15-build
+- name: repo-status-jdk16-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk15-build
+    context: jdk16-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -180,13 +180,13 @@ jobs:
         image: ci-image-jdk11
       vars:
         ci-image-name: ci-image-jdk11
-    - task: build-ci-image-jdk15
+    - task: build-ci-image-jdk16
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
       output_mapping:
-        image: ci-image-jdk15
+        image: ci-image-jdk16
       vars:
-        ci-image-name: ci-image-jdk15
+        ci-image-name: ci-image-jdk16
   - in_parallel:
     - put: ci-image
       params:
@@ -194,9 +194,9 @@ jobs:
     - put: ci-image-jdk11
       params:
         image: ci-image-jdk11/image.tar
-    - put: ci-image-jdk15
+    - put: ci-image-jdk16
       params:
-        image: ci-image-jdk15/image.tar
+        image: ci-image-jdk16/image.tar
 - name: build
   serial: true
   public: true
@@ -256,28 +256,28 @@ jobs:
     - put: slack-alert
       params:
         <<: *slack-success-params
-- name: jdk15-build
+- name: jdk16-build
   serial: true
   public: true
   plan:
-    - get: ci-image-jdk15
+    - get: ci-image-jdk16
     - get: git-repo
     - get: daily
       trigger: true
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "pending", commit: "git-repo" }
     - do:
         - task: build-project
-          image: ci-image-jdk15
+          image: ci-image-jdk16
           <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk15-build
+          - put: repo-status-jdk16-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "success", commit: "git-repo" }
     - put: slack-alert
       params:
@@ -393,7 +393,7 @@ jobs:
       body: generated-changelog/changelog.md
 groups:
 - name: "build"
-  jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
+  jobs: ["build", "jdk11-build", "jdk16-build", "windows-build"]
 - name: "releases"
   jobs: ["stage-release", "promote-release", "create-github-release"]
 - name: "ci-images"