Update to Java 23 (#2120)

* docs update

* typos

* docs updates

* remove extra code and dependencies

* use Java 23

* update Graal for java 23

* update build chain to J23

* update to correct version

* bump build action to use java 23
This commit is contained in:
Jonathan Shook
2024-12-20 01:52:26 -06:00
committed by GitHub
parent 1784f5dcd0
commit 9ea0266c9a
13 changed files with 161 additions and 204 deletions

View File

@@ -22,7 +22,8 @@ set -x
APPDIR=target/NB.AppDir
JAR_NAME="nb5.jar"
BIN_NAME="nb5"
JAVA_VERSION="21"
JAVA_VERSION="23"
UNPACKED_NAME="jdk-23.0.1"
mkdir -p ${APPDIR}
@@ -39,20 +40,20 @@ cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre"
jdkname="jdk${JAVA_VERSION}"
if [ "${jdkname}" == "jdk21" ]
if [ "${jdkname}" == "jdk23" ]
then
if [ ! -d "cache/${jdkname}" ] ; then
printf "getting ${jdkname} once into cache/${jdkname}\n";
filename='openjdk-21_linux-x64_bin.tar.gz'
filename='openjdk-23.0.1_linux-x64_bin.tar.gz'
mkdir -p cache
(cd cache && (
curl -O https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/${filename}
curl -O https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL/${filename}
tar -xf ${filename}
mv jdk-21 jdk21
mv ${UNPACKED_NAME} jdk23
rm ${filename}
))
fi
rsync -av cache/jdk21/ "${APPDIR}/usr/bin/jre/"
rsync -av cache/jdk23/ "${APPDIR}/usr/bin/jre/"
else
printf "Unknown java version indicated in $0"
exit 2

View File

@@ -41,11 +41,11 @@ fi
if [ "$1" = "-DN" ]
then
shift
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC -XX:+ZGenerational ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar $DIR/nb5.jar "$@"
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar $DIR/nb5.jar "$@"
elif [ "$1" = "-DY" ]
then
shift
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC -XX:+ZGenerational ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005 -jar $DIR/nb5.jar "$@"
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005 -jar $DIR/nb5.jar "$@"
else
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC -XX:+ZGenerational ${JAVA_OPTS} -jar $DIR/nb5.jar "$@"
exec $DIR/jre/bin/java --enable-preview -XX:+UseZGC ${JAVA_OPTS} -jar $DIR/nb5.jar "$@"
fi