From 235c7d8fb322502779724df9ad499b1dee334625 Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Tue, 9 Jul 2024 15:25:27 +0200 Subject: [PATCH] Update Maven and Gradle modules Update to Maven 3.9.8 Update to Gradle 8.8 --- .../quarkus/images/modules/GradleModule.java | 4 +-- .../quarkus/images/modules/MavenModule.java | 4 +-- .../io/quarkus/images/MavenAndGradleTest.java | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 jdock/src/test/java/io/quarkus/images/MavenAndGradleTest.java diff --git a/jdock/src/main/java/io/quarkus/images/modules/GradleModule.java b/jdock/src/main/java/io/quarkus/images/modules/GradleModule.java index ea738866..0b3c0d49 100644 --- a/jdock/src/main/java/io/quarkus/images/modules/GradleModule.java +++ b/jdock/src/main/java/io/quarkus/images/modules/GradleModule.java @@ -12,8 +12,8 @@ public class GradleModule extends AbstractModule { - private static final String VERSION = "8.1.1"; - private static final String SHA = "e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f"; + private static final String VERSION = "8.8"; + private static final String SHA = "a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612"; private static final String SCRIPT_INSTALL = """ unzip %s \\ diff --git a/jdock/src/main/java/io/quarkus/images/modules/MavenModule.java b/jdock/src/main/java/io/quarkus/images/modules/MavenModule.java index 2fd172d2..89425046 100644 --- a/jdock/src/main/java/io/quarkus/images/modules/MavenModule.java +++ b/jdock/src/main/java/io/quarkus/images/modules/MavenModule.java @@ -27,8 +27,8 @@ public class MavenModule extends AbstractModule { && sh ${APP_HOME}/.m2/configure-maven.sh"""; private static final String MAVEN_HOME = "/usr/share/maven"; - private static final String VERSION = "3.9.2"; - private static final String SHA = "809ef3220c6d179195c06c324cb9a6d34d8ecba566c5cfd8eb83167bc034117d"; + private static final String VERSION = "3.9.8"; + private static final String SHA = "067672629075b740e3d0a928e21021dd615a53287af36d4ccca44e87e081d102"; private final String url; diff --git a/jdock/src/test/java/io/quarkus/images/MavenAndGradleTest.java b/jdock/src/test/java/io/quarkus/images/MavenAndGradleTest.java new file mode 100644 index 00000000..f35ec7d3 --- /dev/null +++ b/jdock/src/test/java/io/quarkus/images/MavenAndGradleTest.java @@ -0,0 +1,28 @@ +package io.quarkus.images; + +import io.quarkus.images.modules.GradleModule; +import io.quarkus.images.modules.MavenModule; +import io.quarkus.images.modules.QuarkusUserModule; +import io.quarkus.images.modules.UsLangModule; +import org.junit.jupiter.api.Test; + +public class MavenAndGradleTest { + + @Test + void verifyMavenAndGradleInstallation() { + Dockerfile cmd = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10") + .user("root") + .install("tar", "gzip", "gcc", "glibc-devel", "zlib-devel", "shadow-utils", "unzip", "gcc-c++", "tzdata") + .install("glibc-langpack-en") + .module(new UsLangModule()) + .module(new QuarkusUserModule()) + .module(new MavenModule()) + .module(new GradleModule()) + .env("PATH", "$PATH:$JAVA_HOME/bin") + .user("1001") + .workdir("${APP_HOME}") + .expose(8080) + .cmd("/usr/libexec/s2i/run"); + cmd.build(); + } +}