From ac304fba6fdc5548a3ac3847e0d44cbd81bd30aa Mon Sep 17 00:00:00 2001
From: Manuel Fuchs <manuel.fuchs@salesforce.com>
Date: Thu, 26 Sep 2024 16:16:36 +0200
Subject: [PATCH] Add OpenJDK 23 support (#728)

---
 buildpacks/jvm/CHANGELOG.md                      |  4 ++++
 buildpacks/jvm/openjdk_inventory.toml            | 16 ++++++++++++++++
 .../jvm/test-apps/java-22-app/system.properties  |  1 -
 .../jvm/test-apps/java-23-app/system.properties  |  1 +
 buildpacks/jvm/tests/integration/versions.rs     |  6 +++---
 5 files changed, 24 insertions(+), 4 deletions(-)
 delete mode 100644 buildpacks/jvm/test-apps/java-22-app/system.properties
 create mode 100644 buildpacks/jvm/test-apps/java-23-app/system.properties

diff --git a/buildpacks/jvm/CHANGELOG.md b/buildpacks/jvm/CHANGELOG.md
index 8f524cea..1e3a2160 100644
--- a/buildpacks/jvm/CHANGELOG.md
+++ b/buildpacks/jvm/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Support for OpenJDK 23. ([#728](https://github.com/heroku/buildpacks-jvm/pull/728))
+
 ## [6.0.2] - 2024-09-25
 
 - No changes.
diff --git a/buildpacks/jvm/openjdk_inventory.toml b/buildpacks/jvm/openjdk_inventory.toml
index c9994d28..98b9abe7 100644
--- a/buildpacks/jvm/openjdk_inventory.toml
+++ b/buildpacks/jvm/openjdk_inventory.toml
@@ -589,3 +589,19 @@ arch = "arm64"
 url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/22.0.2.tar.gz"
 checksum = "sha256:3b782afb494715651bee99214b491be199bc013359df3869f529752c32e6a2ef"
 metadata.distribution = "zulu"
+
+[[artifacts]]
+version = "23.0.0"
+os = "linux"
+arch = "amd64"
+url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/23.0.0.tar.gz"
+checksum = "sha256:ee59eff4694494fe7b65ac63d86488877a42052961b9869d48e13af1c0784133"
+metadata.distribution = "zulu"
+
+[[artifacts]]
+version = "23.0.0"
+os = "linux"
+arch = "arm64"
+url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/23.0.0.tar.gz"
+checksum = "sha256:20c01b010e437231a431be55843226ef4b3d4d40bf80056002b1a34ed8f774cf"
+metadata.distribution = "zulu"
diff --git a/buildpacks/jvm/test-apps/java-22-app/system.properties b/buildpacks/jvm/test-apps/java-22-app/system.properties
deleted file mode 100644
index 44adfe9c..00000000
--- a/buildpacks/jvm/test-apps/java-22-app/system.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.runtime.version = 22
diff --git a/buildpacks/jvm/test-apps/java-23-app/system.properties b/buildpacks/jvm/test-apps/java-23-app/system.properties
new file mode 100644
index 00000000..f9bb81b4
--- /dev/null
+++ b/buildpacks/jvm/test-apps/java-23-app/system.properties
@@ -0,0 +1 @@
+java.runtime.version = 23
diff --git a/buildpacks/jvm/tests/integration/versions.rs b/buildpacks/jvm/tests/integration/versions.rs
index 1713fca7..b0a6d0e5 100644
--- a/buildpacks/jvm/tests/integration/versions.rs
+++ b/buildpacks/jvm/tests/integration/versions.rs
@@ -112,11 +112,11 @@ fn openjdk_21() {
 
 #[test]
 #[ignore = "integration test"]
-fn openjdk_22() {
-    TestRunner::default().build(default_build_config("test-apps/java-22-app"), |context| {
+fn openjdk_23() {
+    TestRunner::default().build(default_build_config("test-apps/java-23-app"), |context| {
         assert_contains!(
             context.run_shell_command("java -version").stderr,
-            "openjdk version \"22.0.2\""
+            "openjdk version \"23\""
         );
     });
 }