From 84ca6939edebfd9d5fca8289a54be8c51c329fc3 Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Wed, 7 Oct 2020 16:36:01 -0400 Subject: [PATCH] chore(java11): Target Java 11 (#1039) --- .github/workflows/build.yml | 7 +------ .github/workflows/pr.yml | 7 +------ .github/workflows/release.yml | 7 +------ Dockerfile.compile | 5 +---- .../notification/GoogleCloudBuildNotificationSpec.groovy | 8 ++++---- .../echo/pubsub/GoogleCloudBuildEventCreator.java | 2 +- .../echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy | 8 ++++---- gradle.properties | 1 + gradle/kotlin.gradle | 4 ++-- 9 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46f9ed3f0..c37af4862 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,11 +16,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # Install Java 8 for cross-compilation support. Setting it up before - # Java 11 means it comes later in $PATH (because of how setup-java works) - - uses: actions/setup-java@v1 - with: - java-version: 8 - uses: actions/setup-java@v1 with: java-version: 11 @@ -31,4 +26,4 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Build - run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace + run: ./gradlew build --stacktrace diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d13d376af..124004429 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,11 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # Install Java 8 for cross-compilation support. Setting it up before - # Java 11 means it comes later in $PATH (because of how setup-java works) - - uses: actions/setup-java@v1 - with: - java-version: 8 - uses: actions/setup-java@v1 with: java-version: 11 @@ -25,4 +20,4 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Build - run: ./gradlew -PenableCrossCompilerPlugin=true build + run: ./gradlew build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c9823464..a75638a95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,11 +15,6 @@ jobs: steps: - uses: actions/checkout@v2 - run: git fetch --prune --unshallow - # Install Java 8 for cross-compilation support. Setting it up before - # Java 11 means it comes later in $PATH (because of how setup-java works) - - uses: actions/setup-java@v1 - with: - java-version: 8 - uses: actions/setup-java@v1 with: java-version: 11 @@ -45,7 +40,7 @@ jobs: BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }} RELEASE_VERSION: ${{ steps.release_info.outputs.RELEASE_VERSION }} run: | - ./gradlew -PenableCrossCompilerPlugin=true --info -Pversion="${RELEASE_VERSION}" -PbintrayUser="${BINTRAY_USER}" -PbintrayKey="${BINTRAY_API_KEY}" publish + ./gradlew --info -Pversion="${RELEASE_VERSION}" -PbintrayUser="${BINTRAY_USER}" -PbintrayKey="${BINTRAY_API_KEY}" publish - name: Create release if: steps.release_info.outputs.SKIP_RELEASE == 'false' uses: actions/create-release@v1 diff --git a/Dockerfile.compile b/Dockerfile.compile index 37753ba08..65e7817e2 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,11 +1,8 @@ FROM alpine:3.11 RUN apk add --update \ openjdk11 \ - openjdk8 \ && rm -rf /var/cache/apk LABEL maintainer="sig-platform@spinnaker.io" -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -ENV JDK_18 /usr/lib/jvm/java-1.8-openjdk ENV GRADLE_USER_HOME /workspace/.gradle ENV GRADLE_OPTS -Xmx4g -CMD ./gradlew --no-daemon -PenableCrossCompilerPlugin=true echo-web:installDist -x test +CMD ./gradlew --no-daemon echo-web:installDist -x test diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationSpec.groovy index a08920efd..f959571ec 100644 --- a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationSpec.groovy +++ b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationSpec.groovy @@ -31,10 +31,10 @@ class GoogleCloudBuildNotificationSpec extends Specification { RetrySupport retrySupport = new RetrySupport() ObjectMapper objectMapper = EchoObjectMapper.getInstance() - final String ACCOUNT_NAME = "my-account" - final String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b" - final String BUILD_STATUS = "QUEUED" - final String PAYLOAD = objectMapper.writeValueAsString([ + String ACCOUNT_NAME = "my-account" + String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b" + String BUILD_STATUS = "QUEUED" + String PAYLOAD = objectMapper.writeValueAsString([ "key": "value" ]) diff --git a/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreator.java b/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreator.java index 2beed10f4..7249c21b2 100644 --- a/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreator.java +++ b/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreator.java @@ -36,7 +36,7 @@ public class GoogleCloudBuildEventCreator implements EventCreator { public Event createEvent(MessageDescription description) { log.debug("Processing pubsub event with payload {}", description.getMessagePayload()); - Event event = new Event(); + var event = new Event(); Map content = new HashMap<>(); content.put("messageDescription", description); diff --git a/echo-pubsub-core/src/test/groovy/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy b/echo-pubsub-core/src/test/groovy/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy index 33a8585c6..a4d2a0ebe 100644 --- a/echo-pubsub-core/src/test/groovy/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy +++ b/echo-pubsub-core/src/test/groovy/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy @@ -22,10 +22,10 @@ import spock.lang.Specification import spock.lang.Subject class GoogleCloudBuildEventCreatorSpec extends Specification { - final String ACCOUNT_NAME = "my-account" - final String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b" - final String BUILD_STATUS = "QUEUED" - final String PAYLOAD = "test payload" + String ACCOUNT_NAME = "my-account" + String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b" + String BUILD_STATUS = "QUEUED" + String PAYLOAD = "test payload" @Subject GoogleCloudBuildEventCreator eventCreator = new GoogleCloudBuildEventCreator() diff --git a/gradle.properties b/gradle.properties index 4ebd798c6..d3704313e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ korkVersion=7.76.3 kotlinVersion=1.4.0 org.gradle.parallel=true spinnakerGradleVersion=8.9.0 +targetJava11=true # To enable a composite reference to a project, set the # project property `'Composite=true'`. diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle index 1de2a1c1a..f848bdc96 100644 --- a/gradle/kotlin.gradle +++ b/gradle/kotlin.gradle @@ -19,14 +19,14 @@ apply plugin: "kotlin" compileKotlin { kotlinOptions { languageVersion = "1.4" - jvmTarget = "1.8" + jvmTarget = "11" } } compileTestKotlin { kotlinOptions { languageVersion = "1.4" - jvmTarget = "1.8" + jvmTarget = "11" } }