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.

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

maven: JDK 21 amazoncorretto and sapmachine #15418

Merged
merged 1 commit into from
Sep 22, 2023

Conversation

carlossg
Copy link
Contributor

No description provided.

@github-actions
Copy link

Diff for 90516d2:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e774d7d..2683197 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -63,6 +63,11 @@ Architectures: amd64, arm64v8
 GitCommit: d7319e0caa2961b402073e8054bc63e8dc48d969
 Directory: amazoncorretto-20-debian
 
+Tags: 3.9.4-amazoncorretto-21, 3.9-amazoncorretto-21, 3-amazoncorretto-21
+Architectures: amd64, arm64v8
+GitCommit: 7741c2848c3ea3ad6b4180d94b90d669d419c893
+Directory: amazoncorretto-21
+
 Tags: 3.9.4-amazoncorretto-21-debian, 3.9.4-amazoncorretto-21-debian-bookworm, 3.9-amazoncorretto-21-debian, 3.9-amazoncorretto-21-debian-bookworm, 3-amazoncorretto-21-debian, 3-amazoncorretto-21-debian-bookworm
 Architectures: amd64, arm64v8
 GitCommit: 61b5d8d7e9e5706522ff154315db185816d35891
@@ -143,3 +148,8 @@ Tags: 3.9.4-sapmachine-17, 3.9.4-sapmachine, 3.9-sapmachine-17, 3.9-sapmachine,
 Architectures: amd64, arm64v8, ppc64le
 GitCommit: d7319e0caa2961b402073e8054bc63e8dc48d969
 Directory: sapmachine-17
+
+Tags: 3.9.4-sapmachine-21, 3.9-sapmachine-21, 3-sapmachine-21
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: c6ea9b77dab964547324ce49b61ea542fc55f5b5
+Directory: sapmachine-21
diff --git a/_bashbrew-list b/_bashbrew-list
index 34b1c02..587fec6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,6 +16,7 @@ maven:3-amazoncorretto-20
 maven:3-amazoncorretto-20-al2023
 maven:3-amazoncorretto-20-debian
 maven:3-amazoncorretto-20-debian-bookworm
+maven:3-amazoncorretto-21
 maven:3-amazoncorretto-21-debian
 maven:3-amazoncorretto-21-debian-bookworm
 maven:3-eclipse-temurin
@@ -37,6 +38,7 @@ maven:3-ibm-semeru-17-focal
 maven:3-sapmachine
 maven:3-sapmachine-11
 maven:3-sapmachine-17
+maven:3-sapmachine-21
 maven:3.9
 maven:3.9-amazoncorretto
 maven:3.9-amazoncorretto-8
@@ -55,6 +57,7 @@ maven:3.9-amazoncorretto-20
 maven:3.9-amazoncorretto-20-al2023
 maven:3.9-amazoncorretto-20-debian
 maven:3.9-amazoncorretto-20-debian-bookworm
+maven:3.9-amazoncorretto-21
 maven:3.9-amazoncorretto-21-debian
 maven:3.9-amazoncorretto-21-debian-bookworm
 maven:3.9-eclipse-temurin
@@ -76,6 +79,7 @@ maven:3.9-ibm-semeru-17-focal
 maven:3.9-sapmachine
 maven:3.9-sapmachine-11
 maven:3.9-sapmachine-17
+maven:3.9-sapmachine-21
 maven:3.9.4
 maven:3.9.4-amazoncorretto
 maven:3.9.4-amazoncorretto-8
@@ -94,6 +98,7 @@ maven:3.9.4-amazoncorretto-20
 maven:3.9.4-amazoncorretto-20-al2023
 maven:3.9.4-amazoncorretto-20-debian
 maven:3.9.4-amazoncorretto-20-debian-bookworm
+maven:3.9.4-amazoncorretto-21
 maven:3.9.4-amazoncorretto-21-debian
 maven:3.9.4-amazoncorretto-21-debian-bookworm
 maven:3.9.4-eclipse-temurin
@@ -115,6 +120,7 @@ maven:3.9.4-ibm-semeru-17-focal
 maven:3.9.4-sapmachine
 maven:3.9.4-sapmachine-11
 maven:3.9.4-sapmachine-17
+maven:3.9.4-sapmachine-21
 maven:amazoncorretto
 maven:eclipse-temurin
 maven:ibmjava
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 0f328ad..06eb58e 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -11,6 +11,7 @@ maven:3-ibm-semeru-11-focal
 maven:3-ibm-semeru-17-focal
 maven:3-sapmachine-11
 maven:sapmachine
+maven:3-sapmachine-21
 maven:3-amazoncorretto-8
 maven:3-amazoncorretto-8-al2023
 maven:3-amazoncorretto-8-debian-bookworm
@@ -23,6 +24,7 @@ maven:3-amazoncorretto-17-debian-bookworm
 maven:3-amazoncorretto-20
 maven:3-amazoncorretto-20-al2023
 maven:3-amazoncorretto-20-debian-bookworm
+maven:3-amazoncorretto-21
 maven:3-amazoncorretto-21-debian-bookworm
 maven:3-eclipse-temurin-8
 maven:3-eclipse-temurin-8-alpine
diff --git a/maven_amazoncorretto/Dockerfile b/maven_3-amazoncorretto-21/Dockerfile
similarity index 96%
copy from maven_amazoncorretto/Dockerfile
copy to maven_3-amazoncorretto-21/Dockerfile
index e553a4b..b0e2c1a 100644
--- a/maven_amazoncorretto/Dockerfile
+++ b/maven_3-amazoncorretto-21/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11
+FROM amazoncorretto:21
 
 RUN yum install -y tar which gzip # TODO remove
 
diff --git a/maven_3-sapmachine-11/Dockerfile b/maven_3-sapmachine-21/Dockerfile
similarity index 97%
copy from maven_3-sapmachine-11/Dockerfile
copy to maven_3-sapmachine-21/Dockerfile
index 46bfed0..ae8eba0 100644
--- a/maven_3-sapmachine-11/Dockerfile
+++ b/maven_3-sapmachine-21/Dockerfile
@@ -1,4 +1,4 @@
-FROM sapmachine:11
+FROM sapmachine:21
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git --no-install-recommends \

Relevant Maintainers:

@yosifkit yosifkit merged commit 17ddc03 into docker-library:master Sep 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants