Skip to content
This repository was archived by the owner on Dec 20, 2025. It is now read-only.

Commit f6180f1

Browse files
authored
chore(java17): Upgrade java runtime to JRE17 and compilation using JDK17, but target remains Java11 (#2189)
1 parent 927ef4f commit f6180f1

File tree

7 files changed

+18
-15
lines changed

7 files changed

+18
-15
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ jobs:
2525
uses: docker/setup-buildx-action@v3
2626
- uses: actions/setup-java@v4
2727
with:
28-
java-version: 11
28+
java-version: |
29+
17
30+
11
2931
distribution: 'zulu'
3032
cache: 'gradle'
3133
- name: Prepare build variables
@@ -36,7 +38,7 @@ jobs:
3638
- name: Build
3739
env:
3840
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
39-
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
41+
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
4042
- name: Build local slim container image for testing
4143
uses: docker/build-push-action@v6
4244
with:

.github/workflows/pr.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ jobs:
1919
uses: docker/setup-buildx-action@v3
2020
- uses: actions/setup-java@v4
2121
with:
22-
java-version: 11
22+
java-version: |
23+
17
24+
11
2325
distribution: 'zulu'
2426
cache: 'gradle'
2527
- name: Prepare build variables
@@ -30,7 +32,7 @@ jobs:
3032
- name: Build
3133
env:
3234
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
33-
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
35+
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
3436
- name: Build slim container image
3537
uses: docker/build-push-action@v6
3638
with:

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
uses: docker/setup-buildx-action@v3
2424
- uses: actions/setup-java@v4
2525
with:
26-
java-version: 11
26+
java-version: |
27+
17
28+
11
2729
distribution: 'zulu'
2830
cache: 'gradle'
2931
- name: Assemble release info
@@ -50,14 +52,14 @@ jobs:
5052
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
5153
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
5254
run: |
53-
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
55+
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
5456
- name: Publish apt packages to Google Artifact Registry
5557
env:
5658
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
5759
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
5860
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
5961
run: |
60-
./gradlew --info publish
62+
./gradlew -PenableCrossCompilerPlugin=true --info publish
6163
- name: Login to GAR
6264
# Only run this on repositories in the 'spinnaker' org, not on forks.
6365
if: startsWith(github.repository, 'spinnaker/')

Dockerfile.compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:bionic
22
RUN apt-get update && apt-get install -y \
3-
openjdk-11-jdk \
3+
openjdk-17-jdk \
44
&& rm -rf /var/lib/apt/lists/*
55
LABEL maintainer="sig-platform@spinnaker.io"
66
ENV GRADLE_USER_HOME /workspace/.gradle

Dockerfile.slim

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.11
1+
FROM python:3.7-alpine3.16
22
LABEL maintainer="sig-platform@spinnaker.io"
33
ARG TARGETARCH
44

@@ -9,13 +9,10 @@ ENV AWS_CLI_VERSION=1.18.18
99
RUN apk --no-cache add --update \
1010
bash \
1111
curl \
12-
openjdk11-jre \
12+
openjdk17-jre \
1313
openssl \
14-
py-pip \
15-
python \
1614
&& pip install --upgrade awscli==${AWS_CLI_VERSION} \
1715
&& apk --purge del \
18-
py-pip \
1916
&& rm -rf /var/cache/apk
2017

2118
RUN echo '#!/usr/bin/env bash' > /usr/local/bin/hal && \

Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV AWS_CLI_VERSION=1.18.18
99
RUN apt-get update && \
1010
apt-get upgrade -y && \
1111
apt-get install -y \
12-
openjdk-11-jre-headless \
12+
openjdk-17-jre-headless \
1313
curl \
1414
python-pip && \
1515
rm -rf /var/lib/apt/lists/* && \

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ fiatVersion=1.50.0
44
front50Version=2.35.0
55
org.gradle.parallel=true
66
spinnakerGradleVersion=8.32.1
7-
targetJava11=true
7+
targetJava17=false
88

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

0 commit comments

Comments
 (0)