diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 40195de252e4..f1e56b614f46 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -11,6 +11,9 @@ case "$1" in java14) echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz" ;; + java15) + echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-2020-05-26-19-22/OpenJDK-jdk_x64_linux_hotspot_2020-05-26-11-00.tar.gz" + ;; *) echo $"Unknown java version" exit 1 diff --git a/ci/images/spring-boot-jdk15-ci-image/Dockerfile b/ci/images/spring-boot-jdk15-ci-image/Dockerfile new file mode 100644 index 000000000000..6d0e9d1299f4 --- /dev/null +++ b/ci/images/spring-boot-jdk15-ci-image/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:bionic-20200403 + +ADD setup.sh /setup.sh +ADD get-jdk-url.sh /get-jdk-url.sh +ADD get-docker-url.sh /get-docker-url.sh +RUN ./setup.sh java15 + +ENV JAVA_HOME /opt/openjdk +ENV PATH $JAVA_HOME/bin:$PATH +ADD docker-lib.sh /docker-lib.sh + +ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ] diff --git a/ci/pipeline.yml b/ci/pipeline.yml index fb73f9025e1c..f0e1bce5ee0e 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -94,6 +94,14 @@ resources: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: 2.4.x +- name: spring-boot-jdk15-ci-image + type: docker-image + icon: docker + source: + repository: ((docker-hub-organization))/spring-boot-jdk15-ci-image + username: ((docker-hub-username)) + password: ((docker-hub-password)) + tag: 2.4.x - name: artifactory-repo type: artifactory-resource icon: package-variant @@ -126,6 +134,14 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: jdk14-build +- name: repo-status-jdk15-build + type: github-status-resource + icon: eye-check-outline + source: + repository: ((github-repo-name)) + access_token: ((github-ci-status-token)) + branch: ((branch)) + context: jdk15-build - name: slack-alert type: slack-notification icon: slack @@ -160,6 +176,10 @@ jobs: params: build: ci-images-git-repo/ci/images dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile + - put: spring-boot-jdk15-ci-image + params: + build: ci-images-git-repo/ci/images + dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk15-ci-image/Dockerfile - name: detect-jdk-updates plan: - get: git-repo @@ -197,6 +217,16 @@ jobs: JDK_VERSION: java14 MILESTONE: ((milestone)) image: spring-boot-ci-image + - task: detect-jdk15-update + file: git-repo/ci/tasks/detect-jdk-updates.yml + params: + GITHUB_REPO: spring-boot + GITHUB_ORGANIZATION: spring-projects + GITHUB_PASSWORD: ((github-password)) + GITHUB_USERNAME: ((github-username)) + JDK_VERSION: java15 + MILESTONE: ((milestone)) + image: spring-boot-ci-image - name: detect-ubuntu-image-updates plan: - get: git-repo @@ -421,6 +451,52 @@ jobs: silent: true icon_emoji: ":concourse:" username: concourse-ci +- name: jdk15-build + serial: true + public: true + plan: + - get: spring-boot-jdk15-ci-image + - get: git-repo + trigger: true + - put: repo-status-jdk15-build + params: { state: "pending", commit: "git-repo" } + - do: + - task: build-project + privileged: true + timeout: ((task-timeout)) + image: spring-boot-jdk15-ci-image + file: git-repo/ci/tasks/build-project.yml + params: + BRANCH: ((branch)) + GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) + GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username)) + GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password)) + on_failure: + do: + - put: repo-status-jdk15-build + params: { state: "failure", commit: "git-repo" } + - put: slack-alert + params: + text: > + :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed! + [] + [$TEXT_FILE_CONTENT] + text_file: git-repo/build/build-scan-uri.txt + silent: true + icon_emoji: ":concourse:" + username: concourse-ci + - put: repo-status-jdk15-build + params: { state: "success", commit: "git-repo" } + - put: slack-alert + params: + text: > + :concourse-succeeded: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful! + [] + [$TEXT_FILE_CONTENT] + text_file: git-repo/build/build-scan-uri.txt + silent: true + icon_emoji: ":concourse:" + username: concourse-ci - name: windows-build serial: true plan: @@ -645,7 +721,7 @@ jobs: body: generated-release-notes/release-notes.md groups: - name: "Build" - jobs: ["build", "jdk11-build", "jdk14-build", "windows-build"] + jobs: ["build", "jdk11-build", "jdk14-build", "jdk15-build", "windows-build"] - name: "Release" jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"] - name: "CI Images" diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 8228c116e0c0..f5715c9a64c8 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -2,15 +2,19 @@ case "$JDK_VERSION" in java8) - BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8" + BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8/ga" ISSUE_TITLE="Upgrade Java 8 version in CI image" ;; java11) - BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11" + BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga" ISSUE_TITLE="Upgrade Java 11 version in CI image" ;; java14) - BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14" + BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14/ga" + ISSUE_TITLE="Upgrade Java 14 version in CI image" + ;; + java15) + BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea" ISSUE_TITLE="Upgrade Java 14 version in CI image" ;; *) @@ -18,7 +22,7 @@ case "$JDK_VERSION" in exit 1; esac -response=$( curl -s ${BASE_URL}\/ga\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk ) +response=$( curl -s ${BASE_URL}\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk ) latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" ) current=$( git-repo/ci/images/get-jdk-url.sh ${JDK_VERSION} ) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java index 044e27da9c3c..2f337614a653 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,11 +29,17 @@ public class HandlerFunctionDescription { private final String className; HandlerFunctionDescription(HandlerFunction handlerFunction) { - this.className = handlerFunction.getClass().getCanonicalName(); + this.className = getHandlerFunctionClassName(handlerFunction); } public String getClassName() { return this.className; } + private String getHandlerFunctionClassName(HandlerFunction handlerFunction) { + Class functionClass = handlerFunction.getClass(); + String canonicalName = functionClass.getCanonicalName(); + return (canonicalName != null) ? canonicalName : functionClass.getName(); + } + } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java index 25822d0fcd07..b77492e562da 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java @@ -72,7 +72,11 @@ public StringSequence subSequence(int start, int end) { return new StringSequence(this.source, subSequenceStart, subSequenceEnd); } - boolean isEmpty() { + /** + * Returns {@code true} if the sequence is empty. Public to be compatible with JDK 15. + * @return {@code true} if {@link #length()} is {@code 0}, otherwise {@code false} + */ + public boolean isEmpty() { return length() == 0; } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 7eb5d2d0c2e9..e2dc2e9cdde1 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -46,4 +46,5 @@ +