Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Maven and Gradle modules #277

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Update Maven and Gradle modules #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jdock/src/main/java/io/quarkus/images/modules/GradleModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \\
Expand Down
4 changes: 2 additions & 2 deletions jdock/src/main/java/io/quarkus/images/modules/MavenModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
28 changes: 28 additions & 0 deletions jdock/src/test/java/io/quarkus/images/MavenAndGradleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
Loading