From de9bf1d150ec4fd43fc8046cdb5a8016673727d5 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 27 Apr 2023 22:38:02 +0200 Subject: [PATCH 1/2] graal 22.3.2 https://www.graalvm.org/latest/release-notes/22_3/#2232 --- .github/workflows/sonarqube.yml | 2 +- .../io/micronaut/gradle/docker/NativeImageDockerfile.java | 2 +- .../io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy | 2 +- .../gradle/docker/DockerNativeFunctionalTest.groovy | 4 ++-- .../io/micronaut/gradle/lambda/LambdaNativeImageSpec.groovy | 2 +- src/docs/asciidoc/index.adoc | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 849f83e7..1c1a4777 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -37,7 +37,7 @@ jobs: - name: Setup GraalVM CE uses: graalvm/setup-graalvm@v1 with: - version: '22.3.0' + version: '22.3.2' java-version: '11' components: 'native-image' - name: Optional setup step diff --git a/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java b/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java index 2d0b7ab9..fbe352b8 100644 --- a/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java +++ b/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java @@ -56,7 +56,7 @@ public abstract class NativeImageDockerfile extends Dockerfile implements Docker ); private static final String ARM_ARCH = "aarch64"; private static final String X86_64_ARCH = "amd64"; - private static final String GRAAL_VERSION_CONVENTION = "22.3.0"; + private static final String GRAAL_VERSION_CONVENTION = "22.3.2"; /** * @return The JDK version to use with native image. Defaults to the toolchain version, or the current Java version. diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy index e1ffcfe6..1a478935 100644 --- a/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy +++ b/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy @@ -74,7 +74,7 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"] result.task(":optimizedDockerBuildNative").outcome == TaskOutcome.SUCCESS def dockerFile = normalizeLineEndings(file("build/docker/native-optimized/DockerfileNative").text) - dockerFile == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm + dockerFile == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm WORKDIR /home/app COPY layers/libs /home/app/libs COPY layers/classes /home/app/classes diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy index 7394f197..def40160 100644 --- a/functional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy +++ b/functional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy @@ -565,7 +565,7 @@ micronaut: expect: task.outcome == TaskOutcome.SUCCESS dockerFile == """ -FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm +FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm WORKDIR /home/alternate COPY layers/libs /home/alternate/libs COPY layers/classes /home/alternate/classes @@ -680,7 +680,7 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"] then: def dockerfileNative = new File(testProjectDir.root, 'build/docker/native-main/DockerfileNative').text - dockerfileNative == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm + dockerfileNative == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm WORKDIR /home/app COPY layers/libs /home/app/libs COPY server.iprof /home/app/server.iprof diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/lambda/LambdaNativeImageSpec.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/lambda/LambdaNativeImageSpec.groovy index 7dbf6cac..e9e47811 100644 --- a/functional-tests/src/test/groovy/io/micronaut/gradle/lambda/LambdaNativeImageSpec.groovy +++ b/functional-tests/src/test/groovy/io/micronaut/gradle/lambda/LambdaNativeImageSpec.groovy @@ -55,7 +55,7 @@ class LambdaNativeImageSpec extends AbstractFunctionalTest { void 'native lambdas build in docker fetch the correct graalvm for #desc'() { given: - def graalVersion = '22.3.0' + def graalVersion = '22.3.2' settingsFile << "rootProject.name = 'hello-world'" buildFile << """ plugins { diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index e3f16aaf..8b86cc96 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -674,18 +674,18 @@ The default uses an `{default-docker-image}` base image, however you can easily [source, groovy, subs="verbatim,attributes", role="multi-language-sample"] ---- tasks.named("dockerfile") { - baseImage = "oracle/graalvm-ce:22.3.0-java11" + baseImage = "oracle/graalvm-ce:22.3.2-java11" } ---- [source, kotlin, subs="verbatim,attributes", role="multi-language-sample"] ---- tasks.named("dockerfile") { - baseImage.set("oracle/graalvm-ce:22.3.0-java11") + baseImage.set("oracle/graalvm-ce:22.3.2-java11") } ---- -The above examples switches to use GraalVM CE 22.3.0 as a base image. +The above examples switches to use GraalVM CE 22.3.2 as a base image. To build the application into a Native Image you can run: From 4d942ffe5bb4510329b68b68929ec1091ef78c4d Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Thu, 27 Apr 2023 22:38:27 +0200 Subject: [PATCH 2/2] build: Micronaut Build Plugin 5.4.9 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index a3b6288e..59d565bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id 'io.micronaut.build.shared.settings' version '5.4.6' + id 'io.micronaut.build.shared.settings' version '5.4.9' } rootProject.name = 'micronaut-gradle-plugin-parent'