Skip to content

Commit 7e0a43a

Browse files
jasonmcintoshjasonmcintosh
authored
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
1 parent cae9b39 commit 7e0a43a

File tree

9 files changed

+9
-101
lines changed

9 files changed

+9
-101
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
- uses: actions/setup-java@v4
2727
with:
2828
java-version: |
29-
11
3029
17
3130
distribution: 'zulu'
3231
cache: 'gradle'
@@ -38,7 +37,7 @@ jobs:
3837
- name: Build
3938
env:
4039
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
41-
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
40+
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
4241
- name: Build local slim container image for testing
4342
uses: docker/build-push-action@v6
4443
with:
@@ -87,28 +86,3 @@ jobs:
8786
tags: |
8887
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
8988
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
90-
- name: Build and publish slim JRE 11 container image
91-
# Only run this on repositories in the 'spinnaker' org, not on forks.
92-
if: startsWith(github.repository, 'spinnaker/')
93-
uses: docker/build-push-action@v6
94-
with:
95-
context: .
96-
file: Dockerfile.java11.slim
97-
platforms: linux/amd64,linux/arm64
98-
push: true
99-
tags: |
100-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated"
101-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated"
102-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-slim"
103-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
104-
- name: Build and publish ubuntu JRE 11 container image
105-
# Only run this on repositories in the 'spinnaker' org, not on forks.
106-
if: startsWith(github.repository, 'spinnaker/')
107-
uses: docker/build-push-action@v6
108-
with:
109-
context: .
110-
file: Dockerfile.java11.ubuntu
111-
push: true
112-
tags: |
113-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu"
114-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"

‎.github/workflows/pr.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- uses: actions/setup-java@v4
2121
with:
2222
java-version: |
23-
11
2423
17
2524
distribution: 'zulu'
2625
cache: 'gradle'
@@ -32,7 +31,7 @@ jobs:
3231
- name: Build
3332
env:
3433
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
35-
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
34+
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
3635
- name: Build slim container image
3736
uses: docker/build-push-action@v6
3837
with:
@@ -53,26 +52,6 @@ jobs:
5352
tags: |
5453
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
5554
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"
56-
- name: Build slim JRE 11 container image
57-
uses: docker/build-push-action@v6
58-
with:
59-
context: .
60-
file: Dockerfile.java11.slim
61-
platforms: linux/amd64,linux/arm64
62-
tags: |
63-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11"
64-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11"
65-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-slim"
66-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-slim"
67-
- name: Build ubuntu JRE 11 container image
68-
uses: docker/build-push-action@v6
69-
with:
70-
context: .
71-
file: Dockerfile.java11.ubuntu
72-
platforms: linux/amd64,linux/arm64
73-
tags: |
74-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu"
75-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
7655
- name: Build local slim container image for testing
7756
uses: docker/build-push-action@v6
7857
with:

‎.github/workflows/release.yml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
- uses: actions/setup-java@v4
2525
with:
2626
java-version: |
27-
11
2827
17
2928
distribution: 'zulu'
3029
cache: 'gradle'
@@ -52,14 +51,14 @@ jobs:
5251
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
5352
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
5453
run: |
55-
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
54+
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
5655
- name: Publish apt packages to Google Artifact Registry
5756
env:
5857
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
5958
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
6059
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
6160
run: |
62-
./gradlew -PenableCrossCompilerPlugin=true --info publish
61+
./gradlew --info publish
6362
- name: Login to Google Cloud
6463
# Only run this on repositories in the 'spinnaker' org, not on forks.
6564
if: startsWith(github.repository, 'spinnaker/')
@@ -110,31 +109,6 @@ jobs:
110109
tags: |
111110
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
112111
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
113-
- name: Build and publish slim JRE 11 container image
114-
# Only run this on repositories in the 'spinnaker' org, not on forks.
115-
if: startsWith(github.repository, 'spinnaker/')
116-
uses: docker/build-push-action@v6
117-
with:
118-
context: .
119-
file: Dockerfile.java11.slim
120-
platforms: linux/amd64,linux/arm64
121-
push: true
122-
tags: |
123-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated"
124-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-slim"
125-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
126-
- name: Build and publish ubuntu JRE 11 container image
127-
# Only run this on repositories in the 'spinnaker' org, not on forks.
128-
if: startsWith(github.repository, 'spinnaker/')
129-
uses: docker/build-push-action@v6
130-
with:
131-
context: .
132-
file: Dockerfile.java11.ubuntu
133-
platforms: linux/amd64,linux/arm64
134-
push: true
135-
tags: |
136-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-ubuntu"
137-
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
138112
- name: Create release
139113
if: steps.release_info.outputs.SKIP_RELEASE == 'false'
140114
uses: softprops/action-gh-release@v2

‎Dockerfile.compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ RUN apk add --update \
55
LABEL maintainer="sig-platform@spinnaker.io"
66
ENV GRADLE_USER_HOME /workspace/.gradle
77
ENV GRADLE_OPTS -Xmx4g
8-
CMD ./gradlew -PenableCrossCompilerPlugin=true --no-daemon gate-web:installDist -x test
8+
CMD ./gradlew --no-daemon gate-web:installDist -x test

‎Dockerfile.java11.slim

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Dockerfile.java11.ubuntu

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ korkVersion=7.243.0
55
kotlinVersion=1.6.21
66
org.gradle.parallel=true
77
spinnakerGradleVersion=8.32.1
8-
targetJava17=false
8+
targetJava17=true
99

1010
# To enable a composite reference to a project, set the
1111
# project property `'<projectName>Composite=true'`.

‎gradle/kotlin-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ dependencies {
3333
compileTestKotlin {
3434
kotlinOptions {
3535
languageVersion = "1.6"
36-
jvmTarget = "11"
36+
jvmTarget = "17"
3737
}
3838
}

‎gradle/kotlin.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ apply plugin: "kotlin-spring"
2020
compileKotlin {
2121
kotlinOptions {
2222
languageVersion = "1.6"
23-
jvmTarget = "11"
23+
jvmTarget = "17"
2424
}
2525
}
2626

2727
compileTestKotlin {
2828
kotlinOptions {
2929
languageVersion = "1.6"
30-
jvmTarget = "11"
30+
jvmTarget = "17"
3131
}
3232
}
3333

0 commit comments

Comments
 (0)