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: switch openjdk latest to 17 #10981

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Conversation

carlossg
Copy link
Contributor

No description provided.

library/maven Outdated
@@ -41,7 +41,7 @@ Architectures: amd64, arm64v8
GitCommit: 0a7b1ef030687a5d95ce3e7567a4c279ab87dc81
Directory: openjdk-11-slim

Tags: 3.8.2-openjdk-16, 3.8.2, 3.8.2-openjdk, 3.8-openjdk-16, 3.8, 3.8-openjdk, 3-openjdk-16, 3, latest, 3-openjdk, openjdk
Tags: 3.8.2-openjdk-16, 3.8.2, 3.8-openjdk-16, 3.8, 3-openjdk-16, 3, latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you also want 3.8.2, 3.8, 3, and latest to move to JDK 17?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that a change that you are working on? It looks like I can add commits if you'd like me to just move them down.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry I was reading it on the phone and didn't catch the issue, it should be fixed now

@github-actions
Copy link

Diff for fc95949:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 771e7d4..920d330 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -110,7 +110,7 @@ Architectures: amd64, arm64v8
 GitCommit: 0a7b1ef030687a5d95ce3e7567a4c279ab87dc81
 Directory: openjdk-11-slim
 
-Tags: 3.8.2-openjdk-16, 3.8.2, 3.8.2-openjdk, 3.8-openjdk-16, 3.8, 3.8-openjdk, 3-openjdk-16, 3, latest, 3-openjdk, openjdk
+Tags: 3.8.2-openjdk-16, 3.8-openjdk-16, 3-openjdk-16
 Architectures: amd64, arm64v8
 GitCommit: 0a7b1ef030687a5d95ce3e7567a4c279ab87dc81
 Directory: openjdk-16
@@ -120,7 +120,7 @@ Architectures: amd64, arm64v8
 GitCommit: 0a7b1ef030687a5d95ce3e7567a4c279ab87dc81
 Directory: openjdk-16-slim
 
-Tags: 3.8.2-openjdk-17, 3.8-openjdk-17, 3-openjdk-17
+Tags: 3.8.2-openjdk-17, 3.8.2, 3.8.2-openjdk, 3.8-openjdk-17, 3.8, 3.8-openjdk, 3-openjdk-17, 3, latest, 3-openjdk, openjdk
 Architectures: amd64, arm64v8
 GitCommit: 0a7b1ef030687a5d95ce3e7567a4c279ab87dc81
 Directory: openjdk-17
diff --git a/maven_openjdk/Dockerfile b/maven_3-openjdk-16/Dockerfile
similarity index 100%
copy from maven_openjdk/Dockerfile
copy to maven_3-openjdk-16/Dockerfile
diff --git a/maven_3-openjdk-17/mvn-entrypoint.sh b/maven_3-openjdk-16/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-openjdk-17/mvn-entrypoint.sh
rename to maven_3-openjdk-16/mvn-entrypoint.sh
diff --git a/maven_3-openjdk-17/settings-docker.xml b/maven_3-openjdk-16/settings-docker.xml
similarity index 100%
rename from maven_3-openjdk-17/settings-docker.xml
rename to maven_3-openjdk-16/settings-docker.xml
diff --git a/maven_3-openjdk-17/Dockerfile b/maven_3-openjdk-17/Dockerfile
deleted file mode 100644
index 84383b4..0000000
diff --git a/maven_openjdk/Dockerfile b/maven_openjdk/Dockerfile
index a558957..84383b4 100644
--- a/maven_openjdk/Dockerfile
+++ b/maven_openjdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:16-jdk-oraclelinux8
+FROM openjdk:17-jdk-oraclelinux8
 
 ARG MAVEN_VERSION=3.8.2
 ARG USER_HOME_DIR="/root"

@yosifkit yosifkit merged commit 605a76a into docker-library:master Sep 30, 2021
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