From d86bd7d016c12f3a4df4c132fe13967489e2c2f8 Mon Sep 17 00:00:00 2001 From: AntonKtrue Date: Fri, 11 Mar 2022 09:21:22 +0300 Subject: [PATCH] JDK17 support (#24) Co-authored-by: Anton K --- gradle/wrapper/gradle-wrapper.properties | 2 +- projects/01-java-app/gradle/wrapper/gradle-wrapper.properties | 2 +- projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties | 2 +- .../03-kotlin-app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy | 3 +++ .../jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy | 2 +- .../jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties b/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties +++ b/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties b/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties +++ b/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties b/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties +++ b/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties b/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties +++ b/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties b/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties index 05679dc..41dfb87 100644 --- a/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties +++ b/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy b/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy index cc2ead2..57397bb 100644 --- a/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy +++ b/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy @@ -251,6 +251,7 @@ class DockerPlugin implements Plugin { case 14: case 15: case 16: + case 17: flags << "-XX:MaxRAMPercentage=70" flags << "-XX:MinRAMPercentage=50" flags << "-XX:InitialRAMPercentage=50" @@ -269,6 +270,8 @@ class DockerPlugin implements Plugin { return 'openjdk:12-jdk-oracle' } else if (javaVersion == 13) { return 'openjdk:13' + } else if (javaVersion == 17) { + return 'openjdk:17-jdk-slim' } else { // default fallback version return 'openjdk:8-jre-alpine' diff --git a/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy b/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy index 20e6162..cce066d 100644 --- a/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy +++ b/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy @@ -8,7 +8,7 @@ import spock.lang.TempDir import java.nio.file.Path class BaseIntegrationTest extends Specification { - private static final String defaultGradleVersion = '7.1.1' + private static final String defaultGradleVersion = '7.4' @TempDir Path testProjectDir diff --git a/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy b/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy index 0fe8971..cadbf8a 100644 --- a/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy +++ b/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy @@ -12,7 +12,7 @@ class GradleProjectExecutor { Logger logger = LoggerFactory.getLogger(GradleProjectExecutor.class) - private static final String defaultGradleVersion = '7.1.1' + private static final String defaultGradleVersion = '7.4' File projectDir protected File buildFile