-
Notifications
You must be signed in to change notification settings - Fork 2.4k
maven: ubuntu focal and jammy to noble #19180
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.
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sapmachine-11 is now only available on amd64 docker-library#19167
This comment has been minimized.
This comment has been minimized.
Diff for ea53ab6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b9b7190..ffaa130 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -102,10 +102,10 @@ Tags: 3.9.9-eclipse-temurin-8-alpine, 3.9-eclipse-temurin-8-alpine, 3-eclipse-te
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: eclipse-temurin-8-alpine
-Tags: 3.9.9-eclipse-temurin-8-focal, 3.9-eclipse-temurin-8-focal, 3-eclipse-temurin-8-focal
+Tags: 3.9.9-eclipse-temurin-8-noble, 3.9-eclipse-temurin-8-noble, 3-eclipse-temurin-8-noble
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: eclipse-temurin-8-focal
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: eclipse-temurin-8-noble
Tags: 3.9.9-eclipse-temurin-11, 3.9-eclipse-temurin-11, 3-eclipse-temurin-11
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -116,10 +116,10 @@ Tags: 3.9.9-eclipse-temurin-11-alpine, 3.9-eclipse-temurin-11-alpine, 3-eclipse-
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: eclipse-temurin-11-alpine
-Tags: 3.9.9-eclipse-temurin-11-focal, 3.9-eclipse-temurin-11-focal, 3-eclipse-temurin-11-focal
+Tags: 3.9.9-eclipse-temurin-11-noble, 3.9-eclipse-temurin-11-noble, 3-eclipse-temurin-11-noble
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: eclipse-temurin-11-focal
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: eclipse-temurin-11-noble
Tags: 3.9.9-eclipse-temurin-17, 3.9-eclipse-temurin-17, 3-eclipse-temurin-17
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
@@ -130,10 +130,10 @@ Tags: 3.9.9-eclipse-temurin-17-alpine, 3.9-eclipse-temurin-17-alpine, 3-eclipse-
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: eclipse-temurin-17-alpine
-Tags: 3.9.9-eclipse-temurin-17-focal, 3.9-eclipse-temurin-17-focal, 3-eclipse-temurin-17-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: eclipse-temurin-17-focal
+Tags: 3.9.9-eclipse-temurin-17-noble, 3.9-eclipse-temurin-17-noble, 3-eclipse-temurin-17-noble
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: eclipse-temurin-17-noble
Tags: 3.9.9-eclipse-temurin-21, 3.9.9, 3.9.9-eclipse-temurin, 3.9-eclipse-temurin-21, 3.9, 3.9-eclipse-temurin, 3-eclipse-temurin-21, 3, latest, 3-eclipse-temurin, eclipse-temurin
Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
@@ -145,10 +145,10 @@ Architectures: amd64, arm64v8
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: eclipse-temurin-21-alpine
-Tags: 3.9.9-eclipse-temurin-21-jammy, 3.9-eclipse-temurin-21-jammy, 3-eclipse-temurin-21-jammy
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: eclipse-temurin-21-jammy
+Tags: 3.9.9-eclipse-temurin-21-noble, 3.9-eclipse-temurin-21-noble, 3-eclipse-temurin-21-noble
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: eclipse-temurin-21-noble
Tags: 3.9.9-eclipse-temurin-24, 3.9-eclipse-temurin-24, 3-eclipse-temurin-24
Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
@@ -170,23 +170,22 @@ Architectures: amd64, ppc64le, s390x
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: ibmjava-8
-Tags: 3.9.9-ibm-semeru-11-focal, 3.9-ibm-semeru-11-focal, 3-ibm-semeru-11-focal
+Tags: 3.9.9-ibm-semeru-11-noble, 3.9-ibm-semeru-11-noble, 3-ibm-semeru-11-noble
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: ibm-semeru-11-focal
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: ibm-semeru-11-noble
-Tags: 3.9.9-ibm-semeru-17-focal, 3.9-ibm-semeru-17-focal, 3-ibm-semeru-17-focal
+Tags: 3.9.9-ibm-semeru-17-noble, 3.9-ibm-semeru-17-noble, 3-ibm-semeru-17-noble
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: ibm-semeru-17-focal
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: ibm-semeru-17-noble
-Tags: 3.9.9-ibm-semeru-21-jammy, 3.9-ibm-semeru-21-jammy, 3-ibm-semeru-21-jammy
+Tags: 3.9.9-ibm-semeru-21-noble, 3.9-ibm-semeru-21-noble, 3-ibm-semeru-21-noble
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
-Directory: ibm-semeru-21-jammy
+GitCommit: 999b218fb0188c75751755c9cb1aebedecb70351
+Directory: ibm-semeru-21-noble
Tags: 3.9.9-sapmachine-11, 3.9-sapmachine-11, 3-sapmachine-11
-Architectures: amd64, arm64v8, ppc64le
GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
Directory: sapmachine-11
diff --git a/_bashbrew-list b/_bashbrew-list
index 9898452..5fa9fc6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -25,24 +25,24 @@ maven:3-amazoncorretto-24-alpine
maven:3-eclipse-temurin
maven:3-eclipse-temurin-8
maven:3-eclipse-temurin-8-alpine
-maven:3-eclipse-temurin-8-focal
+maven:3-eclipse-temurin-8-noble
maven:3-eclipse-temurin-11
maven:3-eclipse-temurin-11-alpine
-maven:3-eclipse-temurin-11-focal
+maven:3-eclipse-temurin-11-noble
maven:3-eclipse-temurin-17
maven:3-eclipse-temurin-17-alpine
-maven:3-eclipse-temurin-17-focal
+maven:3-eclipse-temurin-17-noble
maven:3-eclipse-temurin-21
maven:3-eclipse-temurin-21-alpine
-maven:3-eclipse-temurin-21-jammy
+maven:3-eclipse-temurin-21-noble
maven:3-eclipse-temurin-24
maven:3-eclipse-temurin-24-alpine
maven:3-eclipse-temurin-24-noble
maven:3-ibmjava
maven:3-ibmjava-8
-maven:3-ibm-semeru-11-focal
-maven:3-ibm-semeru-17-focal
-maven:3-ibm-semeru-21-jammy
+maven:3-ibm-semeru-11-noble
+maven:3-ibm-semeru-17-noble
+maven:3-ibm-semeru-21-noble
maven:3-sapmachine
maven:3-sapmachine-11
maven:3-sapmachine-17
@@ -75,24 +75,24 @@ maven:3.9-amazoncorretto-24-alpine
maven:3.9-eclipse-temurin
maven:3.9-eclipse-temurin-8
maven:3.9-eclipse-temurin-8-alpine
-maven:3.9-eclipse-temurin-8-focal
+maven:3.9-eclipse-temurin-8-noble
maven:3.9-eclipse-temurin-11
maven:3.9-eclipse-temurin-11-alpine
-maven:3.9-eclipse-temurin-11-focal
+maven:3.9-eclipse-temurin-11-noble
maven:3.9-eclipse-temurin-17
maven:3.9-eclipse-temurin-17-alpine
-maven:3.9-eclipse-temurin-17-focal
+maven:3.9-eclipse-temurin-17-noble
maven:3.9-eclipse-temurin-21
maven:3.9-eclipse-temurin-21-alpine
-maven:3.9-eclipse-temurin-21-jammy
+maven:3.9-eclipse-temurin-21-noble
maven:3.9-eclipse-temurin-24
maven:3.9-eclipse-temurin-24-alpine
maven:3.9-eclipse-temurin-24-noble
maven:3.9-ibmjava
maven:3.9-ibmjava-8
-maven:3.9-ibm-semeru-11-focal
-maven:3.9-ibm-semeru-17-focal
-maven:3.9-ibm-semeru-21-jammy
+maven:3.9-ibm-semeru-11-noble
+maven:3.9-ibm-semeru-17-noble
+maven:3.9-ibm-semeru-21-noble
maven:3.9-sapmachine
maven:3.9-sapmachine-11
maven:3.9-sapmachine-17
@@ -125,24 +125,24 @@ maven:3.9.9-amazoncorretto-24-alpine
maven:3.9.9-eclipse-temurin
maven:3.9.9-eclipse-temurin-8
maven:3.9.9-eclipse-temurin-8-alpine
-maven:3.9.9-eclipse-temurin-8-focal
+maven:3.9.9-eclipse-temurin-8-noble
maven:3.9.9-eclipse-temurin-11
maven:3.9.9-eclipse-temurin-11-alpine
-maven:3.9.9-eclipse-temurin-11-focal
+maven:3.9.9-eclipse-temurin-11-noble
maven:3.9.9-eclipse-temurin-17
maven:3.9.9-eclipse-temurin-17-alpine
-maven:3.9.9-eclipse-temurin-17-focal
+maven:3.9.9-eclipse-temurin-17-noble
maven:3.9.9-eclipse-temurin-21
maven:3.9.9-eclipse-temurin-21-alpine
-maven:3.9.9-eclipse-temurin-21-jammy
+maven:3.9.9-eclipse-temurin-21-noble
maven:3.9.9-eclipse-temurin-24
maven:3.9.9-eclipse-temurin-24-alpine
maven:3.9.9-eclipse-temurin-24-noble
maven:3.9.9-ibmjava
maven:3.9.9-ibmjava-8
-maven:3.9.9-ibm-semeru-11-focal
-maven:3.9.9-ibm-semeru-17-focal
-maven:3.9.9-ibm-semeru-21-jammy
+maven:3.9.9-ibm-semeru-11-noble
+maven:3.9.9-ibm-semeru-17-noble
+maven:3.9.9-ibm-semeru-21-noble
maven:3.9.9-sapmachine
maven:3.9.9-sapmachine-11
maven:3.9.9-sapmachine-17
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3b8583b..7aeba73 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,14 +1,14 @@
maven:3-eclipse-temurin-17
maven:3-eclipse-temurin-17-alpine
-maven:3-eclipse-temurin-17-focal
+maven:3-eclipse-temurin-17-noble
maven:3-eclipse-temurin-21-alpine
-maven:3-eclipse-temurin-21-jammy
+maven:3-eclipse-temurin-21-noble
maven:3-eclipse-temurin-24
maven:3-eclipse-temurin-24-alpine
maven:3-eclipse-temurin-24-noble
-maven:3-ibm-semeru-11-focal
-maven:3-ibm-semeru-17-focal
-maven:3-ibm-semeru-21-jammy
+maven:3-ibm-semeru-11-noble
+maven:3-ibm-semeru-17-noble
+maven:3-ibm-semeru-21-noble
maven:3-sapmachine-11
maven:3-sapmachine-17
maven:3-sapmachine-24
@@ -35,7 +35,7 @@ maven:3-amazoncorretto-24
maven:3-amazoncorretto-24-alpine
maven:3-eclipse-temurin-8
maven:3-eclipse-temurin-8-alpine
-maven:3-eclipse-temurin-8-focal
+maven:3-eclipse-temurin-8-noble
maven:3-eclipse-temurin-11
maven:3-eclipse-temurin-11-alpine
-maven:3-eclipse-temurin-11-focal
+maven:3-eclipse-temurin-11-noble
diff --git a/maven_3-eclipse-temurin-11-focal/Dockerfile b/maven_3-eclipse-temurin-11-noble/Dockerfile
similarity index 97%
rename from maven_3-eclipse-temurin-11-focal/Dockerfile
rename to maven_3-eclipse-temurin-11-noble/Dockerfile
index a413fbc..c438975 100644
--- a/maven_3-eclipse-temurin-11-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-11-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jdk-focal
+FROM eclipse-temurin:11-jdk-noble
RUN apt-get update \
&& apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
diff --git a/maven_3-eclipse-temurin-17-focal/Dockerfile b/maven_3-eclipse-temurin-17-noble/Dockerfile
similarity index 97%
rename from maven_3-eclipse-temurin-17-focal/Dockerfile
rename to maven_3-eclipse-temurin-17-noble/Dockerfile
index 2cc2727..9b56b29 100644
--- a/maven_3-eclipse-temurin-17-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-17-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-focal
+FROM eclipse-temurin:17-jdk-noble
RUN apt-get update \
&& apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
diff --git a/maven_3-eclipse-temurin-21-jammy/Dockerfile b/maven_3-eclipse-temurin-21-noble/Dockerfile
similarity index 97%
rename from maven_3-eclipse-temurin-21-jammy/Dockerfile
rename to maven_3-eclipse-temurin-21-noble/Dockerfile
index 56aa119..50715b8 100644
--- a/maven_3-eclipse-temurin-21-jammy/Dockerfile
+++ b/maven_3-eclipse-temurin-21-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
RUN apt-get update \
&& apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
diff --git a/maven_3-eclipse-temurin-8-focal/Dockerfile b/maven_3-eclipse-temurin-8-noble/Dockerfile
similarity index 97%
rename from maven_3-eclipse-temurin-8-focal/Dockerfile
rename to maven_3-eclipse-temurin-8-noble/Dockerfile
index 92d2d4e..91b8c80 100644
--- a/maven_3-eclipse-temurin-8-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-8-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8-jdk-focal
+FROM eclipse-temurin:8-jdk-noble
RUN apt-get update \
&& apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
diff --git a/maven_3-ibm-semeru-11-focal/Dockerfile b/maven_3-ibm-semeru-11-noble/Dockerfile
similarity index 96%
rename from maven_3-ibm-semeru-11-focal/Dockerfile
rename to maven_3-ibm-semeru-11-noble/Dockerfile
index fa69aee..fbd5254 100644
--- a/maven_3-ibm-semeru-11-focal/Dockerfile
+++ b/maven_3-ibm-semeru-11-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-11-jdk-focal
+FROM ibm-semeru-runtimes:open-11-jdk-noble
RUN apt-get update \
&& apt-get install -y git openssh-client --no-install-recommends \
diff --git a/maven_3-ibm-semeru-17-focal/Dockerfile b/maven_3-ibm-semeru-17-noble/Dockerfile
similarity index 96%
rename from maven_3-ibm-semeru-17-focal/Dockerfile
rename to maven_3-ibm-semeru-17-noble/Dockerfile
index 7271877..d577dc3 100644
--- a/maven_3-ibm-semeru-17-focal/Dockerfile
+++ b/maven_3-ibm-semeru-17-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-17-jdk-focal
+FROM ibm-semeru-runtimes:open-17-jdk-noble
RUN apt-get update \
&& apt-get install -y git openssh-client --no-install-recommends \
diff --git a/maven_3-ibm-semeru-21-jammy/Dockerfile b/maven_3-ibm-semeru-21-noble/Dockerfile
similarity index 96%
rename from maven_3-ibm-semeru-21-jammy/Dockerfile
rename to maven_3-ibm-semeru-21-noble/Dockerfile
index a1f7360..fcbff46 100644
--- a/maven_3-ibm-semeru-21-jammy/Dockerfile
+++ b/maven_3-ibm-semeru-21-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-21-jdk-jammy
+FROM ibm-semeru-runtimes:open-21-jdk-noble
RUN apt-get update \
&& apt-get install -y git openssh-client --no-install-recommends \ Relevant Maintainers:
|
yosifkit
approved these changes
Jun 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sapmachine-11 is now only available on amd64
#19167