IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-28 01:31:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

base project on jdk21 toolchain and runtime

Browse Source
This commit is contained in:
Jonathan Shook 2023-09-15 22:12:10 -05:00
parent 41f393c0f5
commit b9b33f1a9d
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java
View File

@ -58,7 +58,7 @@ public class ScenarioController implements NBLabeledElement {
ActivitiesExceptionHandler exceptionHandler = new ActivitiesExceptionHandler(this); ActivitiesExceptionHandler exceptionHandler = new ActivitiesExceptionHandler(this);
IndexedThreadFactory indexedThreadFactory = new IndexedThreadFactory("ACTIVITY", exceptionHandler); IndexedThreadFactory indexedThreadFactory = new IndexedThreadFactory("ACTIVITY", exceptionHandler);
this.activitiesExecutor = Executors.newCachedThreadPool(indexedThreadFactory); this.activitiesExecutor = Executors.newVirtualThreadPerTaskExecutor();
} }
/** /**

10
mvn-defaults/pom.xml
View File

@ -26,7 +26,7 @@
<properties> <properties>
<revision>5.17.4-SNAPSHOT</revision> <revision>5.21.1-SNAPSHOT</revision>
<!-- Set this level to override the logging level for tests during build --> <!-- Set this level to override the logging level for tests during build -->
<project.testlevel>INFO</project.testlevel> <project.testlevel>INFO</project.testlevel>
<!-- Set this level to override the logging level for tests logging configuration during build --> <!-- Set this level to override the logging level for tests logging configuration during build -->
@ -523,9 +523,9 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<debug>true</debug> <debug>true</debug>
<target>17</target> <target>21</target>
<source>17</source> <source>21</source>
<release>17</release> <release>21</release>
<compilerArgs> <compilerArgs>
<!-- <compilerArg>-Xdoclint:all</compilerArg>--> <!-- <compilerArg>-Xdoclint:all</compilerArg>-->
<!-- <compilerArg>-Xlint:all</compilerArg>--> <!-- <compilerArg>-Xlint:all</compilerArg>-->
@ -638,7 +638,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<release>17</release> <release>21</release>
<doctitle>${javadoc.name}</doctitle> <doctitle>${javadoc.name}</doctitle>
<windowtitle>${javadoc.name}</windowtitle> <windowtitle>${javadoc.name}</windowtitle>
<isOffline>false</isOffline> <isOffline>false</isOffline>

21
nb5/build-bin.sh
View File

@ -22,7 +22,7 @@ set -x
APPDIR=target/NB.AppDir APPDIR=target/NB.AppDir
JAR_NAME="nb5.jar" JAR_NAME="nb5.jar"
BIN_NAME="nb5" BIN_NAME="nb5"
JAVA_VERSION="17" JAVA_VERSION="21"
mkdir -p ${APPDIR} mkdir -p ${APPDIR}
@ -38,20 +38,21 @@ rsync -av appimage/skel/ "${APPDIR}/"
cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}" cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre" mkdir -p "${APPDIR}/usr/bin/jre"
jdkname="jdk${JAVA_VERSION}"
if [ "$JAVA_VERSION" == "17" ] if [ "${jdkname}" == "jdk21" ]
then then
if [ ! -d "cache/jdk17" ] ; then if [ ! -d "cache/${jdkname}" ] ; then
printf "getting jdk17 once into cache/jdk17\n"; printf "getting ${jdkname} once into cache/${jdkname}\n";
filename='openjdk-21_linux-x64_bin.tar.gz'
mkdir -p cache mkdir -p cache
(cd cache && ( (cd cache && (
wget -c https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz curl -O https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/${filename}
tar -xf OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz tar -xf ${filename}
mv jdk-17.0.1+12 jdk17 mv jdk-21 jdk21
rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz rm ${filename}
)) ))
fi fi
rsync -av cache/jdk17/ "${APPDIR}/usr/bin/jre/" rsync -av cache/jdk21/ "${APPDIR}/usr/bin/jre/"
else else
printf "Unknown java version indicated in $0" printf "Unknown java version indicated in $0"
exit 2 exit 2

21
nbr/build-bin-nbr.sh
View File

@ -22,7 +22,7 @@ set -x
APPDIR=target/NB.AppDir APPDIR=target/NB.AppDir
JAR_NAME="nbr.jar" JAR_NAME="nbr.jar"
BIN_NAME="nbr" BIN_NAME="nbr"
JAVA_VERSION="17" JAVA_VERSION="21"
mkdir -p ${APPDIR} mkdir -p ${APPDIR}
@ -38,20 +38,21 @@ rsync -av appimage/skel/ "${APPDIR}/"
cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}" cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre" mkdir -p "${APPDIR}/usr/bin/jre"
jdkname="jdk${JAVA_VERSION}"
if [ "$JAVA_VERSION" == "17" ] if [ "${jdkname}" == "jdk21" ]
then then
if [ ! -d "cache/jdk17" ] ; then if [ ! -d "cache/${jdkname}" ] ; then
printf "getting jdk17 once into cache/jdk17\n"; printf "getting ${jdkname} once into cache/${jdkname}\n";
filename='openjdk-21_linux-x64_bin.tar.gz'
mkdir -p cache mkdir -p cache
(cd cache && ( (cd cache && (
wget -c https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz curl -O https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/${filename}
tar -xf OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz tar -xf ${filename}
mv jdk-17.0.1+12 jdk17 mv jdk-21 jdk21
rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz rm ${filename}
)) ))
fi fi
rsync -av cache/jdk17/ "${APPDIR}/usr/bin/jre/" rsync -av cache/jdk21/ "${APPDIR}/usr/bin/jre/"
else else
printf "Unknown java version indicated in $0" printf "Unknown java version indicated in $0"
exit 2 exit 2