chore(java): Upgrade fully to java 17 (#1846)

* chore(java): Upgrade fully to java 17 * chore(java): Remove cross compilation flag * chore(java): Full Java 17 support only
spinnaker · Nov 15, 2024 · 7e0a43a · 7e0a43a
1 parent cae9b39
commit 7e0a43a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 101 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'
@@ -38,7 +37,7 @@ jobs:
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
-        run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
+        run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
       - name: Build local slim container image for testing
         uses: docker/build-push-action@v6
         with:
@@ -87,28 +86,3 @@ jobs:
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
-      - name: Build and publish slim JRE 11 container image
-        # Only run this on repositories in the 'spinnaker' org, not on forks.
-        if: startsWith(github.repository, 'spinnaker/')
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.slim
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-slim"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
-      - name: Build and publish ubuntu JRE 11 container image
-        # Only run this on repositories in the 'spinnaker' org, not on forks.
-        if: startsWith(github.repository, 'spinnaker/')
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.ubuntu
-          push: true
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -20,7 +20,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'
@@ -32,7 +31,7 @@ jobs:
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
-        run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
+        run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
       - name: Build slim container image
         uses: docker/build-push-action@v6
         with:
@@ -53,26 +52,6 @@ jobs:
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"
-      - name: Build slim JRE 11 container image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.slim
-          platforms: linux/amd64,linux/arm64
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-slim"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-slim"
-      - name: Build ubuntu JRE 11 container image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.ubuntu
-          platforms: linux/amd64,linux/arm64
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
       - name: Build local slim container image for testing
         uses: docker/build-push-action@v6
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'
@@ -52,14 +51,14 @@ jobs:
           ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
         run: |
-          ./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
+          ./gradlew --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 -PenableCrossCompilerPlugin=true --info publish
+          ./gradlew --info publish
       - name: Login to Google Cloud
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
@@ -110,31 +109,6 @@ jobs:
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
-      - name: Build and publish slim JRE 11 container image
-        # Only run this on repositories in the 'spinnaker' org, not on forks.
-        if: startsWith(github.repository, 'spinnaker/')
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.slim
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-slim"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
-      - name: Build and publish ubuntu JRE 11 container image
-        # Only run this on repositories in the 'spinnaker' org, not on forks.
-        if: startsWith(github.repository, 'spinnaker/')
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile.java11.ubuntu
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-ubuntu"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
       - name: Create release
         if: steps.release_info.outputs.SKIP_RELEASE == 'false'
         uses: softprops/action-gh-release@v2

diff --git a/Dockerfile.compile b/Dockerfile.compile
@@ -5,4 +5,4 @@ RUN apk add --update \
 LABEL maintainer="[email protected]"
 ENV GRADLE_USER_HOME /workspace/.gradle
 ENV GRADLE_OPTS -Xmx4g
-CMD ./gradlew -PenableCrossCompilerPlugin=true --no-daemon gate-web:installDist -x test
+CMD ./gradlew --no-daemon gate-web:installDist -x test
diff --git a/Dockerfile.java11.slim b/Dockerfile.java11.slim
diff --git a/Dockerfile.java11.ubuntu b/Dockerfile.java11.ubuntu
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ korkVersion=7.243.0
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
-targetJava17=false
+targetJava17=true
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.

diff --git a/gradle/kotlin-test.gradle b/gradle/kotlin-test.gradle
@@ -33,6 +33,6 @@ dependencies {
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -20,14 +20,14 @@ apply plugin: "kotlin-spring"
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }