From ae2e02c273ec0e6a24dac17b1a3310639cf78627 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 May 2021 18:18:23 +0200 Subject: [PATCH 1/3] Upgrade Ubuntu version in CI images Closes gh-1233 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk16/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 15ae6f50..df7ace7e 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk16/Dockerfile b/ci/images/ci-image-jdk16/Dockerfile index 7a1fdf49..7b573af5 100644 --- a/ci/images/ci-image-jdk16/Dockerfile +++ b/ci/images/ci-image-jdk16/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index c825b290..66ee7fcd 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 5a976ac49251af34226884eae6ad49614dace82a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 May 2021 18:19:05 +0200 Subject: [PATCH 2/3] Upgrade Java 16 version in CI image Closes gh-1234 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index c539e19d..91d2dc99 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -9,7 +9,7 @@ case "$1" in echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz" ;; java16) - echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz" + echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz" ;; *) echo $"Unknown java version" From f893653398cc07ff8c05b7d1f5e5f85a0779cc34 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 May 2021 18:24:22 +0200 Subject: [PATCH 3/3] Upgrade to Gradle 6.9 Closes gh-1238 --- .../gradle/6/wrapper/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/GradleKtsProjectGenerationConfigurationTests.java | 2 +- .../build/gradle/GradleProjectGenerationConfigurationTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/initializr-generator-spring/src/main/resources/gradle/6/wrapper/gradle/wrapper/gradle-wrapper.properties b/initializr-generator-spring/src/main/resources/gradle/6/wrapper/gradle/wrapper/gradle-wrapper.properties index 442d9132..549d8442 100644 --- a/initializr-generator-spring/src/main/resources/gradle/6/wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/initializr-generator-spring/src/main/resources/gradle/6/wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java index a1b6ee0e..8c2607df 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java @@ -85,7 +85,7 @@ class GradleKtsProjectGenerationConfigurationTests { } static Stream gradleWrapperParameters() { - return Stream.of(Arguments.arguments("2.1.3.RELEASE", "5.6.4"), Arguments.arguments("2.2.3.RELEASE", "6.8.3")); + return Stream.of(Arguments.arguments("2.1.3.RELEASE", "5.6.4"), Arguments.arguments("2.2.3.RELEASE", "6.9")); } @ParameterizedTest(name = "Spring Boot {0}") diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java index 8e98406c..b641dba6 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java @@ -84,7 +84,7 @@ class GradleProjectGenerationConfigurationTests { static Stream gradleWrapperParameters() { return Stream.of(Arguments.arguments("2.0.6.RELEASE", "4.10.3"), Arguments.arguments("2.1.3.RELEASE", "5.6.4"), - Arguments.arguments("2.2.3.RELEASE", "6.8.3")); + Arguments.arguments("2.2.3.RELEASE", "6.9")); } @ParameterizedTest(name = "Spring Boot {0}")