Update openjdk #14071
Merged
Update openjdk #14071
Conversation
This file contains 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
Changes: - docker-library/openjdk@7fdff8f: Merge pull request docker-library/openjdk#522 from infosiftr/drop-18 - docker-library/openjdk@3345e54: JDK 18 is EOL
|
FYI @carlossg (the only maintainer still |
Diff for 326e613:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0c9dc00..d828906 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,58 +1,6 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/openjdk.git
-Tags: 18.0.2.1-jdk-bullseye, 18.0.2.1-bullseye, 18.0.2-jdk-bullseye, 18.0.2-bullseye, 18.0-jdk-bullseye, 18.0-bullseye, 18-jdk-bullseye, 18-bullseye, jdk-bullseye, bullseye
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/bullseye
-
-Tags: 18.0.2.1-jdk-buster, 18.0.2.1-buster, 18.0.2-jdk-buster, 18.0.2-buster, 18.0-jdk-buster, 18.0-buster, 18-jdk-buster, 18-buster, jdk-buster, buster
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/buster
-
-Tags: 18.0.2.1-jdk-nanoserver-1809, 18.0.2.1-nanoserver-1809, 18.0.2-jdk-nanoserver-1809, 18.0.2-nanoserver-1809, 18.0-jdk-nanoserver-1809, 18.0-nanoserver-1809, 18-jdk-nanoserver-1809, 18-nanoserver-1809, jdk-nanoserver-1809, nanoserver-1809
-SharedTags: 18.0.2.1-jdk-nanoserver, 18.0.2.1-nanoserver, 18.0.2-jdk-nanoserver, 18.0.2-nanoserver, 18.0-jdk-nanoserver, 18.0-nanoserver, 18-jdk-nanoserver, 18-nanoserver, jdk-nanoserver, nanoserver
-Architectures: windows-amd64
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 18.0.2.1-jdk-oraclelinux7, 18.0.2.1-oraclelinux7, 18.0.2-jdk-oraclelinux7, 18.0.2-oraclelinux7, 18.0-jdk-oraclelinux7, 18.0-oraclelinux7, 18-jdk-oraclelinux7, 18-oraclelinux7, jdk-oraclelinux7, oraclelinux7
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/oraclelinux7
-
-Tags: 18.0.2.1-jdk-oraclelinux8, 18.0.2.1-oraclelinux8, 18.0.2-jdk-oraclelinux8, 18.0.2-oraclelinux8, 18.0-jdk-oraclelinux8, 18.0-oraclelinux8, 18-jdk-oraclelinux8, 18-oraclelinux8, jdk-oraclelinux8, oraclelinux8, 18.0.2.1-jdk-oracle, 18.0.2.1-oracle, 18.0.2-jdk-oracle, 18.0.2-oracle, 18.0-jdk-oracle, 18.0-oracle, 18-jdk-oracle, 18-oracle, jdk-oracle, oracle
-SharedTags: 18.0.2.1-jdk, 18.0.2.1, 18.0.2-jdk, 18.0.2, 18.0-jdk, 18.0, 18-jdk, 18, jdk, latest
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/oraclelinux8
-
-Tags: 18.0.2.1-jdk-slim-bullseye, 18.0.2.1-slim-bullseye, 18.0.2-jdk-slim-bullseye, 18.0.2-slim-bullseye, 18.0-jdk-slim-bullseye, 18.0-slim-bullseye, 18-jdk-slim-bullseye, 18-slim-bullseye, jdk-slim-bullseye, slim-bullseye, 18.0.2.1-jdk-slim, 18.0.2.1-slim, 18.0.2-jdk-slim, 18.0.2-slim, 18.0-jdk-slim, 18.0-slim, 18-jdk-slim, 18-slim, jdk-slim, slim
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/slim-bullseye
-
-Tags: 18.0.2.1-jdk-slim-buster, 18.0.2.1-slim-buster, 18.0.2-jdk-slim-buster, 18.0.2-slim-buster, 18.0-jdk-slim-buster, 18.0-slim-buster, 18-jdk-slim-buster, 18-slim-buster, jdk-slim-buster, slim-buster
-Architectures: amd64, arm64v8
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/slim-buster
-
-Tags: 18.0.2.1-jdk-windowsservercore-1809, 18.0.2.1-windowsservercore-1809, 18.0.2-jdk-windowsservercore-1809, 18.0.2-windowsservercore-1809, 18.0-jdk-windowsservercore-1809, 18.0-windowsservercore-1809, 18-jdk-windowsservercore-1809, 18-windowsservercore-1809, jdk-windowsservercore-1809, windowsservercore-1809
-SharedTags: 18.0.2.1-jdk-windowsservercore, 18.0.2.1-windowsservercore, 18.0.2-jdk-windowsservercore, 18.0.2-windowsservercore, 18.0-jdk-windowsservercore, 18.0-windowsservercore, 18-jdk-windowsservercore, 18-windowsservercore, jdk-windowsservercore, windowsservercore, 18.0.2.1-jdk, 18.0.2.1, 18.0.2-jdk, 18.0.2, 18.0-jdk, 18.0, 18-jdk, 18, jdk, latest
-Architectures: windows-amd64
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 18.0.2.1-jdk-windowsservercore-ltsc2022, 18.0.2.1-windowsservercore-ltsc2022, 18.0.2-jdk-windowsservercore-ltsc2022, 18.0.2-windowsservercore-ltsc2022, 18.0-jdk-windowsservercore-ltsc2022, 18.0-windowsservercore-ltsc2022, 18-jdk-windowsservercore-ltsc2022, 18-windowsservercore-ltsc2022, jdk-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 18.0.2.1-jdk-windowsservercore, 18.0.2.1-windowsservercore, 18.0.2-jdk-windowsservercore, 18.0.2-windowsservercore, 18.0-jdk-windowsservercore, 18.0-windowsservercore, 18-jdk-windowsservercore, 18-windowsservercore, jdk-windowsservercore, windowsservercore, 18.0.2.1-jdk, 18.0.2.1, 18.0.2-jdk, 18.0.2, 18.0-jdk, 18.0, 18-jdk, 18, jdk, latest
-Architectures: windows-amd64
-GitCommit: 4b928d2e5767b0e12058d3b5eceabeb0aa48aec3
-Directory: 18/jdk/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
Tags: 20-ea-35-jdk-bullseye, 20-ea-35-bullseye, 20-ea-jdk-bullseye, 20-ea-bullseye, 20-jdk-bullseye, 20-bullseye
Architectures: amd64, arm64v8
GitCommit: 65b377582250dd8cc6429d89963d3bf60a1edf47
diff --git a/_bashbrew-list b/_bashbrew-list
index 830bdf9..923e4a9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,115 +1,3 @@
-openjdk:18
-openjdk:18-bullseye
-openjdk:18-buster
-openjdk:18-jdk
-openjdk:18-jdk-bullseye
-openjdk:18-jdk-buster
-openjdk:18-jdk-nanoserver
-openjdk:18-jdk-nanoserver-1809
-openjdk:18-jdk-oracle
-openjdk:18-jdk-oraclelinux7
-openjdk:18-jdk-oraclelinux8
-openjdk:18-jdk-slim
-openjdk:18-jdk-slim-bullseye
-openjdk:18-jdk-slim-buster
-openjdk:18-jdk-windowsservercore
-openjdk:18-jdk-windowsservercore-1809
-openjdk:18-jdk-windowsservercore-ltsc2022
-openjdk:18-nanoserver
-openjdk:18-nanoserver-1809
-openjdk:18-oracle
-openjdk:18-oraclelinux7
-openjdk:18-oraclelinux8
-openjdk:18-slim
-openjdk:18-slim-bullseye
-openjdk:18-slim-buster
-openjdk:18-windowsservercore
-openjdk:18-windowsservercore-1809
-openjdk:18-windowsservercore-ltsc2022
-openjdk:18.0
-openjdk:18.0-bullseye
-openjdk:18.0-buster
-openjdk:18.0-jdk
-openjdk:18.0-jdk-bullseye
-openjdk:18.0-jdk-buster
-openjdk:18.0-jdk-nanoserver
-openjdk:18.0-jdk-nanoserver-1809
-openjdk:18.0-jdk-oracle
-openjdk:18.0-jdk-oraclelinux7
-openjdk:18.0-jdk-oraclelinux8
-openjdk:18.0-jdk-slim
-openjdk:18.0-jdk-slim-bullseye
-openjdk:18.0-jdk-slim-buster
-openjdk:18.0-jdk-windowsservercore
-openjdk:18.0-jdk-windowsservercore-1809
-openjdk:18.0-jdk-windowsservercore-ltsc2022
-openjdk:18.0-nanoserver
-openjdk:18.0-nanoserver-1809
-openjdk:18.0-oracle
-openjdk:18.0-oraclelinux7
-openjdk:18.0-oraclelinux8
-openjdk:18.0-slim
-openjdk:18.0-slim-bullseye
-openjdk:18.0-slim-buster
-openjdk:18.0-windowsservercore
-openjdk:18.0-windowsservercore-1809
-openjdk:18.0-windowsservercore-ltsc2022
-openjdk:18.0.2
-openjdk:18.0.2-bullseye
-openjdk:18.0.2-buster
-openjdk:18.0.2-jdk
-openjdk:18.0.2-jdk-bullseye
-openjdk:18.0.2-jdk-buster
-openjdk:18.0.2-jdk-nanoserver
-openjdk:18.0.2-jdk-nanoserver-1809
-openjdk:18.0.2-jdk-oracle
-openjdk:18.0.2-jdk-oraclelinux7
-openjdk:18.0.2-jdk-oraclelinux8
-openjdk:18.0.2-jdk-slim
-openjdk:18.0.2-jdk-slim-bullseye
-openjdk:18.0.2-jdk-slim-buster
-openjdk:18.0.2-jdk-windowsservercore
-openjdk:18.0.2-jdk-windowsservercore-1809
-openjdk:18.0.2-jdk-windowsservercore-ltsc2022
-openjdk:18.0.2-nanoserver
-openjdk:18.0.2-nanoserver-1809
-openjdk:18.0.2-oracle
-openjdk:18.0.2-oraclelinux7
-openjdk:18.0.2-oraclelinux8
-openjdk:18.0.2-slim
-openjdk:18.0.2-slim-bullseye
-openjdk:18.0.2-slim-buster
-openjdk:18.0.2-windowsservercore
-openjdk:18.0.2-windowsservercore-1809
-openjdk:18.0.2-windowsservercore-ltsc2022
-openjdk:18.0.2.1
-openjdk:18.0.2.1-bullseye
-openjdk:18.0.2.1-buster
-openjdk:18.0.2.1-jdk
-openjdk:18.0.2.1-jdk-bullseye
-openjdk:18.0.2.1-jdk-buster
-openjdk:18.0.2.1-jdk-nanoserver
-openjdk:18.0.2.1-jdk-nanoserver-1809
-openjdk:18.0.2.1-jdk-oracle
-openjdk:18.0.2.1-jdk-oraclelinux7
-openjdk:18.0.2.1-jdk-oraclelinux8
-openjdk:18.0.2.1-jdk-slim
-openjdk:18.0.2.1-jdk-slim-bullseye
-openjdk:18.0.2.1-jdk-slim-buster
-openjdk:18.0.2.1-jdk-windowsservercore
-openjdk:18.0.2.1-jdk-windowsservercore-1809
-openjdk:18.0.2.1-jdk-windowsservercore-ltsc2022
-openjdk:18.0.2.1-nanoserver
-openjdk:18.0.2.1-nanoserver-1809
-openjdk:18.0.2.1-oracle
-openjdk:18.0.2.1-oraclelinux7
-openjdk:18.0.2.1-oraclelinux8
-openjdk:18.0.2.1-slim
-openjdk:18.0.2.1-slim-bullseye
-openjdk:18.0.2.1-slim-buster
-openjdk:18.0.2.1-windowsservercore
-openjdk:18.0.2.1-windowsservercore-1809
-openjdk:18.0.2.1-windowsservercore-ltsc2022
openjdk:20
openjdk:20-bullseye
openjdk:20-buster
@@ -278,31 +166,3 @@ openjdk:21-slim-buster
openjdk:21-windowsservercore
openjdk:21-windowsservercore-1809
openjdk:21-windowsservercore-ltsc2022
-openjdk:bullseye
-openjdk:buster
-openjdk:jdk
-openjdk:jdk-bullseye
-openjdk:jdk-buster
-openjdk:jdk-nanoserver
-openjdk:jdk-nanoserver-1809
-openjdk:jdk-oracle
-openjdk:jdk-oraclelinux7
-openjdk:jdk-oraclelinux8
-openjdk:jdk-slim
-openjdk:jdk-slim-bullseye
-openjdk:jdk-slim-buster
-openjdk:jdk-windowsservercore
-openjdk:jdk-windowsservercore-1809
-openjdk:jdk-windowsservercore-ltsc2022
-openjdk:latest
-openjdk:nanoserver
-openjdk:nanoserver-1809
-openjdk:oracle
-openjdk:oraclelinux7
-openjdk:oraclelinux8
-openjdk:slim
-openjdk:slim-bullseye
-openjdk:slim-buster
-openjdk:windowsservercore
-openjdk:windowsservercore-1809
-openjdk:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index da3b4c8..19dcfb7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,11 +1,3 @@
-openjdk:bullseye
-openjdk:buster
-openjdk:oraclelinux7
-openjdk:oracle
-openjdk:slim
-openjdk:slim-buster
-openjdk:windowsservercore-1809
-openjdk:windowsservercore-ltsc2022
openjdk:20-bullseye
openjdk:20-buster
openjdk:20-oraclelinux7
@@ -22,6 +14,5 @@ openjdk:21-slim
openjdk:21-slim-buster
openjdk:21-windowsservercore-1809
openjdk:21-windowsservercore-ltsc2022
-openjdk:nanoserver-1809
openjdk:20-nanoserver-1809
openjdk:21-nanoserver-1809
diff --git a/openjdk_bullseye/Dockerfile b/openjdk_bullseye/Dockerfile
deleted file mode 100644
index c6b7de9..0000000
diff --git a/openjdk_buster/Dockerfile b/openjdk_buster/Dockerfile
deleted file mode 100644
index 77113e4..0000000
diff --git a/openjdk_nanoserver-1809/Dockerfile b/openjdk_nanoserver-1809/Dockerfile
deleted file mode 100644
index 8d436e4..0000000
diff --git a/openjdk_oracle/Dockerfile b/openjdk_oracle/Dockerfile
deleted file mode 100644
index 5830a91..0000000
diff --git a/openjdk_oraclelinux7/Dockerfile b/openjdk_oraclelinux7/Dockerfile
deleted file mode 100644
index 45e3bb6..0000000
diff --git a/openjdk_slim-buster/Dockerfile b/openjdk_slim-buster/Dockerfile
deleted file mode 100644
index 7f6a4c0..0000000
diff --git a/openjdk_slim/Dockerfile b/openjdk_slim/Dockerfile
deleted file mode 100644
index 9134a69..0000000
diff --git a/openjdk_windowsservercore-1809/Dockerfile b/openjdk_windowsservercore-1809/Dockerfile
deleted file mode 100644
index 0eb28c4..0000000
diff --git a/openjdk_windowsservercore-ltsc2022/Dockerfile b/openjdk_windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index a2b857a..0000000Relevant Maintainers: |
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.
Changes: