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

Update openjdk #17584

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Update openjdk #17584

merged 1 commit into from
Sep 18, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 18, 2024

Changes:

Changes:

- docker-library/openjdk@07a131d: Merge pull request docker-library/openjdk#540 from infosiftr/23-ga
- docker-library/openjdk@96f1580: Remove 23 (now GA, no longer EA)
@tianon tianon requested a review from a team as a code owner September 18, 2024 20:57
Copy link

Diff for 23b4252:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 47efefa..18afea4 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: 23-rc-jdk-bookworm, 23-rc-bookworm, 23-jdk-bookworm, 23-bookworm
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/bookworm
-
-Tags: 23-rc-jdk-bullseye, 23-rc-bullseye, 23-jdk-bullseye, 23-bullseye
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/bullseye
-
-Tags: 23-rc-jdk-nanoserver-1809, 23-rc-nanoserver-1809, 23-jdk-nanoserver-1809, 23-nanoserver-1809
-SharedTags: 23-rc-jdk-nanoserver, 23-rc-nanoserver, 23-jdk-nanoserver, 23-nanoserver
-Architectures: windows-amd64
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
-Directory: 23/jdk/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 23-rc-jdk-oraclelinux8, 23-rc-oraclelinux8, 23-jdk-oraclelinux8, 23-oraclelinux8
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/oraclelinux8
-
-Tags: 23-rc-jdk-oraclelinux9, 23-rc-oraclelinux9, 23-jdk-oraclelinux9, 23-oraclelinux9, 23-rc-jdk-oracle, 23-rc-oracle, 23-jdk-oracle, 23-oracle
-SharedTags: 23-rc-jdk, 23-rc, 23-jdk, 23
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/oraclelinux9
-
-Tags: 23-rc-jdk-slim-bookworm, 23-rc-slim-bookworm, 23-jdk-slim-bookworm, 23-slim-bookworm, 23-rc-jdk-slim, 23-rc-slim, 23-jdk-slim, 23-slim
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/slim-bookworm
-
-Tags: 23-rc-jdk-slim-bullseye, 23-rc-slim-bullseye, 23-jdk-slim-bullseye, 23-slim-bullseye
-Architectures: amd64, arm64v8
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/slim-bullseye
-
-Tags: 23-rc-jdk-windowsservercore-1809, 23-rc-windowsservercore-1809, 23-jdk-windowsservercore-1809, 23-windowsservercore-1809
-SharedTags: 23-rc-jdk-windowsservercore, 23-rc-windowsservercore, 23-jdk-windowsservercore, 23-windowsservercore, 23-rc-jdk, 23-rc, 23-jdk, 23
-Architectures: windows-amd64
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 23-rc-jdk-windowsservercore-ltsc2022, 23-rc-windowsservercore-ltsc2022, 23-jdk-windowsservercore-ltsc2022, 23-windowsservercore-ltsc2022
-SharedTags: 23-rc-jdk-windowsservercore, 23-rc-windowsservercore, 23-jdk-windowsservercore, 23-windowsservercore, 23-rc-jdk, 23-rc, 23-jdk, 23
-Architectures: windows-amd64
-GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
-Directory: 23/jdk/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
 Tags: 24-ea-15-jdk-bookworm, 24-ea-15-bookworm, 24-ea-jdk-bookworm, 24-ea-bookworm, 24-jdk-bookworm, 24-bookworm
 Architectures: amd64, arm64v8
 GitCommit: cedd4fc621435a892fc347d0a7d6fb9fca063196
diff --git a/_bashbrew-list b/_bashbrew-list
index 29f62e6..ae345f7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,59 +1,3 @@
-openjdk:23
-openjdk:23-bookworm
-openjdk:23-bullseye
-openjdk:23-jdk
-openjdk:23-jdk-bookworm
-openjdk:23-jdk-bullseye
-openjdk:23-jdk-nanoserver
-openjdk:23-jdk-nanoserver-1809
-openjdk:23-jdk-oracle
-openjdk:23-jdk-oraclelinux8
-openjdk:23-jdk-oraclelinux9
-openjdk:23-jdk-slim
-openjdk:23-jdk-slim-bookworm
-openjdk:23-jdk-slim-bullseye
-openjdk:23-jdk-windowsservercore
-openjdk:23-jdk-windowsservercore-1809
-openjdk:23-jdk-windowsservercore-ltsc2022
-openjdk:23-nanoserver
-openjdk:23-nanoserver-1809
-openjdk:23-oracle
-openjdk:23-oraclelinux8
-openjdk:23-oraclelinux9
-openjdk:23-rc
-openjdk:23-rc-bookworm
-openjdk:23-rc-bullseye
-openjdk:23-rc-jdk
-openjdk:23-rc-jdk-bookworm
-openjdk:23-rc-jdk-bullseye
-openjdk:23-rc-jdk-nanoserver
-openjdk:23-rc-jdk-nanoserver-1809
-openjdk:23-rc-jdk-oracle
-openjdk:23-rc-jdk-oraclelinux8
-openjdk:23-rc-jdk-oraclelinux9
-openjdk:23-rc-jdk-slim
-openjdk:23-rc-jdk-slim-bookworm
-openjdk:23-rc-jdk-slim-bullseye
-openjdk:23-rc-jdk-windowsservercore
-openjdk:23-rc-jdk-windowsservercore-1809
-openjdk:23-rc-jdk-windowsservercore-ltsc2022
-openjdk:23-rc-nanoserver
-openjdk:23-rc-nanoserver-1809
-openjdk:23-rc-oracle
-openjdk:23-rc-oraclelinux8
-openjdk:23-rc-oraclelinux9
-openjdk:23-rc-slim
-openjdk:23-rc-slim-bookworm
-openjdk:23-rc-slim-bullseye
-openjdk:23-rc-windowsservercore
-openjdk:23-rc-windowsservercore-1809
-openjdk:23-rc-windowsservercore-ltsc2022
-openjdk:23-slim
-openjdk:23-slim-bookworm
-openjdk:23-slim-bullseye
-openjdk:23-windowsservercore
-openjdk:23-windowsservercore-1809
-openjdk:23-windowsservercore-ltsc2022
 openjdk:24
 openjdk:24-bookworm
 openjdk:24-bullseye
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 9c2a852..9970360 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,11 +1,3 @@
-openjdk:23-bookworm
-openjdk:23-bullseye
-openjdk:23-oracle
-openjdk:23-oraclelinux8
-openjdk:23-slim
-openjdk:23-slim-bullseye
-openjdk:23-windowsservercore-1809
-openjdk:23-windowsservercore-ltsc2022
 openjdk:24-bookworm
 openjdk:24-bullseye
 openjdk:24-oracle
@@ -14,5 +6,4 @@ openjdk:24-slim
 openjdk:24-slim-bullseye
 openjdk:24-windowsservercore-1809
 openjdk:24-windowsservercore-ltsc2022
-openjdk:23-nanoserver-1809
 openjdk:24-nanoserver-1809
diff --git a/openjdk_23-bookworm/Dockerfile b/openjdk_23-bookworm/Dockerfile
deleted file mode 100644
index 8f630b4..0000000
diff --git a/openjdk_23-bullseye/Dockerfile b/openjdk_23-bullseye/Dockerfile
deleted file mode 100644
index e25ebf6..0000000
diff --git a/openjdk_23-nanoserver-1809/Dockerfile b/openjdk_23-nanoserver-1809/Dockerfile
deleted file mode 100644
index af342cd..0000000
diff --git a/openjdk_23-oracle/Dockerfile b/openjdk_23-oracle/Dockerfile
deleted file mode 100644
index 2df8445..0000000
diff --git a/openjdk_23-oraclelinux8/Dockerfile b/openjdk_23-oraclelinux8/Dockerfile
deleted file mode 100644
index f11596e..0000000
diff --git a/openjdk_23-slim-bullseye/Dockerfile b/openjdk_23-slim-bullseye/Dockerfile
deleted file mode 100644
index 2f2af45..0000000
diff --git a/openjdk_23-slim/Dockerfile b/openjdk_23-slim/Dockerfile
deleted file mode 100644
index d0557f3..0000000
diff --git a/openjdk_23-windowsservercore-1809/Dockerfile b/openjdk_23-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 42a3cda..0000000
diff --git a/openjdk_23-windowsservercore-ltsc2022/Dockerfile b/openjdk_23-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 5acb792..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit b97b8fe into docker-library:master Sep 18, 2024
13 checks passed
@yosifkit yosifkit deleted the openjdk branch September 18, 2024 23:41
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.

3 participants