From 596cf1dea18a5b76e9e582afba1d99131094144d Mon Sep 17 00:00:00 2001
From: Matt Gogerly <matt.gogerly@jpmchase.com>
Date: Fri, 26 Jul 2024 12:39:33 +0100
Subject: [PATCH] chore(build): upgrade to Java 17 targeting Java 11

---
 .github/workflows/build.yml   | 6 ++++--
 .github/workflows/pr.yml      | 6 ++++--
 .github/workflows/release.yml | 8 +++++---
 Dockerfile.compile            | 4 ++--
 Dockerfile.slim               | 2 +-
 Dockerfile.ubuntu             | 2 +-
 gradle.properties             | 2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af85971da4..4c5ada541b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Prepare build variables
@@ -36,7 +38,7 @@ jobs:
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
-        run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
+        run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
       - name: Build local slim container image for testing
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2b068dfafd..38dd10158f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -19,7 +19,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Prepare build variables
@@ -30,7 +32,7 @@ jobs:
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
-        run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
+        run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
       - name: Build slim container image
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0e68513fc1..ad50f28f71 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Assemble release info
@@ -50,14 +52,14 @@ jobs:
           ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
         run: |
-          ./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
+          ./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
       - name: Publish apt packages to Google Artifact Registry
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
           ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
           GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
         run: |
-          ./gradlew --info publish
+          ./gradlew -PenableCrossCompilerPlugin=true --info publish
       - name: Login to GAR
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
diff --git a/Dockerfile.compile b/Dockerfile.compile
index 202cbe6cb9..9a21fc019e 100644
--- a/Dockerfile.compile
+++ b/Dockerfile.compile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic
 RUN apt-get update && apt-get install -y \
-    openjdk-11-jdk \
+    openjdk-17-jdk \
  && rm -rf /var/lib/apt/lists/*
 LABEL maintainer="sig-platform@spinnaker.io"
 ENV GRADLE_USER_HOME /workspace/.gradle
@@ -9,4 +9,4 @@ ARG VERSION
 # You can't use an ARG in a CMD (because it isn't available anymore when you run
 # the container) so we have to store it in an ENV.
 ENV VERSIONARG="-Pversion=$VERSION"
-CMD ./gradlew --no-daemon $VERSIONARG halyard-web:installDist -x test
+CMD ./gradlew -PenableCrossCompilerPlugin=true --no-daemon $VERSIONARG halyard-web:installDist -x test
diff --git a/Dockerfile.slim b/Dockerfile.slim
index b2cd71021e..13cecb930c 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -9,7 +9,7 @@ ENV AWS_CLI_VERSION=1.18.18
 RUN apk --no-cache add --update \
       bash \
       curl \
-      openjdk11-jre \
+      openjdk17-jre \
       openssl \
       py-pip \
       python \
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 69be710006..91363b626a 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -9,7 +9,7 @@ ENV AWS_CLI_VERSION=1.18.18
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
-      openjdk-11-jre-headless \
+      openjdk-17-jre-headless \
       curl \
       python-pip && \
     rm -rf /var/lib/apt/lists/* && \
diff --git a/gradle.properties b/gradle.properties
index 6a72f50a4e..1faacf3a29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ fiatVersion=1.48.0
 front50Version=2.32.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
-targetJava11=true
+targetJava17=false
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.