Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

update jdk version 17 #96

Merged
merged 1 commit into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions buildpacks/jvm-common/bin/java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ arm64)
# JDK_URL_1_7=${JDK_URL_1_7:-"$JDK_BASE_URL/do_not_support_1.7_anymore"}
# JDK_URL_1_6=${JDK_URL_1_6:-"$JDK_BASE_URL/do_not_support_1.6_anymore"}
JDK_BASE_URL=${JDK_BASE_URL:-"${LANG_GOODRAIN_ME:-http://lang.goodrain.me}/jdk/jammy-22"}
JDK_URL_17=${JDK_URL_17:-"$JDK_BASE_URL/arm64/openjdk_17.tar.gz"}
JDK_URL_16=${JDK_URL_16:-"$JDK_BASE_URL/arm64/openjdk16.0.2_7.tar.gz"}
JDK_URL_15=${JDK_URL_15:-"$JDK_BASE_URL/arm64/openjdk15.0.2_7.tar.gz"}
JDK_URL_14=${JDK_URL_14:-"$JDK_BASE_URL/arm64/openjdk14.0.2_12.tar.gz"}
Expand Down Expand Up @@ -56,6 +57,7 @@ x86_64)

DEFAULT_JDK_VERSION="1.8"
JDK_BASE_URL=${JDK_BASE_URL:-"${LANG_GOODRAIN_ME:-http://lang.goodrain.me}/jdk/jammy-22"}
JDK_URL_17=${JDK_URL_17:-"$JDK_BASE_URL/openjdk_17.0.9.tar.gz"}
JDK_URL_16=${JDK_URL_16:-"$JDK_BASE_URL/openjdk16.0.2_7.tar.gz"}
JDK_URL_15=${JDK_URL_15:-"$JDK_BASE_URL/openjdk15.0.2_7.tar.gz"}
JDK_URL_14=${JDK_URL_14:-"$JDK_BASE_URL/openjdk14.0.2_12.tar.gz"}
Expand Down Expand Up @@ -216,6 +218,8 @@ _get_jdk_download_url() {
local jdkUrl="${JDK_URL_15}"
elif [ "${jdkVersion}" = "16" ]; then
local jdkUrl="${JDK_URL_16}"
elif [ "${jdkVersion}" = "17" ]; then
local jdkUrl="${JDK_URL_17}"
elif [ "$(expr "${jdkVersion}" : '^1[0-2]')" != 0 ]; then
local jdkUrl="${JDK_BASE_URL}/openjdk${jdkVersion}.tar.gz"
elif [ "$(expr "${jdkVersion}" : '^1.[6-9]$')" != 0 ]; then
Expand Down
12 changes: 12 additions & 0 deletions pre-compile/lib/runtimes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ runtimes::jar() {
16)
echo "java.runtime.version=16" >${BUILD_DIR}/$JAVARuntimefile
;;
17)
echo "java.runtime.version=17" >${BUILD_DIR}/$JAVARuntimefile
;;
*)
echo "java.runtime.version=1.8" >${BUILD_DIR}/$JAVARuntimefile
;;
Expand Down Expand Up @@ -83,6 +86,9 @@ runtimes::war() {
16)
echo "java.runtime.version=16" >${BUILD_DIR}/$JAVARuntimefile
;;
17)
echo "java.runtime.version=17" >${BUILD_DIR}/$JAVARuntimefile
;;
*)
echo "java.runtime.version=1.8" >${BUILD_DIR}/$JAVARuntimefile
;;
Expand Down Expand Up @@ -127,6 +133,9 @@ runtimes::gradle() {
16)
echo "java.runtime.version=16" >${BUILD_DIR}/$JAVARuntimefile
;;
17)
echo "java.runtime.version=17" >${BUILD_DIR}/$JAVARuntimefile
;;
*)
echo "java.runtime.version=1.8" >${BUILD_DIR}/$JAVARuntimefile
;;
Expand Down Expand Up @@ -171,6 +180,9 @@ runtimes::maven() {
16)
echo "java.runtime.version=16" >${BUILD_DIR}/$JAVARuntimefile
;;
17)
echo "java.runtime.version=17" >${BUILD_DIR}/$JAVARuntimefile
;;
*)
echo "java.runtime.version=1.8" >${BUILD_DIR}/$JAVARuntimefile
;;
Expand Down