From 8d3ab1cc7d55d9e819975b3aa2d742bba8ddefdb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 18 Mar 2020 14:26:04 +0100 Subject: [PATCH] Polish "Add Java 14 CI" See gh-20413 --- .../springframework/boot/build/ConventionsPlugin.java | 11 +---------- ci/images/get-jdk-url.sh | 2 +- ci/images/setup.sh | 10 ---------- ci/images/spring-boot-ci-image/Dockerfile | 2 +- ci/images/spring-boot-jdk11-ci-image/Dockerfile | 2 +- ci/images/spring-boot-jdk13-ci-image/Dockerfile | 2 +- ci/images/spring-boot-jdk14-ci-image/Dockerfile | 2 +- ci/pipeline.yml | 2 +- ci/scripts/build-project.sh | 11 +---------- ci/scripts/detect-jdk-updates.sh | 4 ++-- ci/scripts/get-secondary-java-version.sh | 4 ---- 11 files changed, 10 insertions(+), 42 deletions(-) delete mode 100755 ci/scripts/get-secondary-java-version.sh diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java index f39690ab7d8..1941228ed48 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java @@ -141,7 +141,6 @@ public class ConventionsPlugin implements Plugin { }); project.getTasks().withType(Test.class, (test) -> { withOptionalBuildJavaHome(project, (javaHome) -> test.setExecutable(javaHome + "/bin/java")); - withOptionalTestJavaHome(project, (javaHome) -> test.setExecutable(javaHome + "/bin/java")); test.useJUnitPlatform(); test.setMaxHeapSize("1024M"); }); @@ -200,15 +199,7 @@ public class ConventionsPlugin implements Plugin { } private void withOptionalBuildJavaHome(Project project, Consumer consumer) { - withOptionalJavaHome(project, consumer, "buildJavaHome"); - } - - private void withOptionalTestJavaHome(Project project, Consumer consumer) { - withOptionalJavaHome(project, consumer, "testJavaHome"); - } - - private void withOptionalJavaHome(Project project, Consumer consumer, String javaHome) { - String buildJavaHome = (String) project.findProperty(javaHome); + String buildJavaHome = (String) project.findProperty("buildJavaHome"); if (buildJavaHome != null && !buildJavaHome.isEmpty()) { consumer.accept(buildJavaHome); } diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 41bec8d0ad3..5fa09c71e03 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in echo "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz" ;; java14) - echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14-2020-03-05-04-06/OpenJDK14-jdk_x64_linux_hotspot_2020-03-05-04-06.tar.gz" + echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 697c0644ff5..7bda9979235 100755 --- a/ci/images/setup.sh +++ b/ci/images/setup.sh @@ -23,16 +23,6 @@ curl -L ${JDK_URL} | tar zx --strip-components=1 test -f /opt/openjdk/bin/java test -f /opt/openjdk/bin/javac -if [[ $1 != $2 ]]; then - SECONDARY_JDK_URL=$( ./get-jdk-url.sh $2 ) - - mkdir -p /opt/openjdk-secondary - cd /opt/openjdk-secondary - curl -L ${SECONDARY_JDK_URL} | tar zx --strip-components=1 - test -f /opt/openjdk-secondary/bin/java - test -f /opt/openjdk-secondary/bin/javac -fi - ########################################################### # DOCKER diff --git a/ci/images/spring-boot-ci-image/Dockerfile b/ci/images/spring-boot-ci-image/Dockerfile index c0253fade21..6a5e7700690 100644 --- a/ci/images/spring-boot-ci-image/Dockerfile +++ b/ci/images/spring-boot-ci-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java8 java8 +RUN ./setup.sh java8 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/spring-boot-jdk11-ci-image/Dockerfile b/ci/images/spring-boot-jdk11-ci-image/Dockerfile index a4be4bcb93f..30aaffe8734 100644 --- a/ci/images/spring-boot-jdk11-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk11-ci-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java11 java11 +RUN ./setup.sh java11 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/spring-boot-jdk13-ci-image/Dockerfile b/ci/images/spring-boot-jdk13-ci-image/Dockerfile index c08bde65621..b9e18adb08f 100644 --- a/ci/images/spring-boot-jdk13-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk13-ci-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java13 java13 +RUN ./setup.sh java13 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/spring-boot-jdk14-ci-image/Dockerfile b/ci/images/spring-boot-jdk14-ci-image/Dockerfile index 45b1e3c75f5..91c8a675333 100644 --- a/ci/images/spring-boot-jdk14-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk14-ci-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java8 java14 +RUN ./setup.sh java14 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/pipeline.yml b/ci/pipeline.yml index f410f893a19..73273b1bed7 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -410,7 +410,7 @@ jobs: plan: - get: spring-boot-jdk14-ci-image - get: git-repo - trigger: false + trigger: true - put: repo-status-jdk14-build params: { state: "pending", commit: "git-repo" } - do: diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh index d2823da3251..3844d1a3ddb 100755 --- a/ci/scripts/build-project.sh +++ b/ci/scripts/build-project.sh @@ -5,14 +5,5 @@ source $(dirname $0)/common.sh repository=$(pwd)/distribution-repository pushd git-repo > /dev/null -if [[ -d /opt/openjdk-secondary ]]; then - java_version=$( ./$(dirname $0)/get-secondary-java-version.sh ) - if [[ ${java_version} = "14" ]]; then - ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PtestJavaHome=/opt/openjdk-secondary -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository -x :spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin:test - else - ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PtestJavaHome=/opt/openjdk-secondary -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository - fi -else - ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository -fi +./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository popd > /dev/null diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 0124ac58658..42503f97913 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -14,7 +14,7 @@ case "$JDK_VERSION" in ISSUE_TITLE="Upgrade Java 13 version in CI image" ;; java14) - BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14/ea" + BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14" ISSUE_TITLE="Upgrade Java 14 version in CI image" ;; *) @@ -22,7 +22,7 @@ case "$JDK_VERSION" in exit 1; esac -response=$( curl -s ${BASE_URL}\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk ) +response=$( curl -s ${BASE_URL}\/ga\?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/ci/scripts/get-secondary-java-version.sh b/ci/scripts/get-secondary-java-version.sh deleted file mode 100755 index ae15a573e8a..00000000000 --- a/ci/scripts/get-secondary-java-version.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e - -/opt/openjdk-secondary/bin/java -XshowSettings:properties -version 2>&1 | grep "java.specification.version" | awk '{split($0,parts,"="); print parts[2]}' | awk '{$1=$1;print}' \ No newline at end of file