IntenseFinance/nosqlbench
3
0 Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2026-10-13 18:02:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

start supporting Java 25 (#2209)

Browse Source 
* start supporting Java 25

* update GHA Java to 25

* update AppImage deps and dependencies
This commit is contained in:
Jonathan Shook authored and GitHub committed 2025-09-24 17:10:32 -05:00
1 parent 9766b4c6cf
commit d5a99fbc85
15 files changed
+51 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build.yml
+4 -1
View File
@@ -23,11 +23,14 @@ jobs:
architecture: x64
distribution: 'oracle'
java-package: jdk
java-version: '24'
java-version: '25'
- name: install fuse2
run: sudo apt install libfuse2
- name: install desktop-file-utils
run: sudo apt install desktop-file-utils
- name: Cache Maven packages
uses: actions/cache@v4
with:
.github/workflows/preview.yml
+4 -1
View File
@@ -28,7 +28,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'oracle'
java-version: '24'
java-version: '25'
java-package: jdk
architecture: x64
@@ -49,6 +49,9 @@ jobs:
- name: install fuse2
run: sudo apt install libfuse2
- name: install desktop-file-utils
run: sudo apt install desktop-file-utils
- name: read versions
id: versions
run: |
.github/workflows/release.yml
+4 -1
View File
@@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'oracle'
java-version: '24'
java-version: '25'
java-package: jdk
architecture: x64
@@ -52,6 +52,9 @@ jobs:
- name: install fuse2
run: sudo apt install libfuse2
- name: install desktop-file-utils
run: sudo apt install desktop-file-utils
- name: Cache Maven packages
uses: actions/cache@v4
with:
mvn-defaults/pom.xml
+10 -10
View File
@@ -26,7 +26,7 @@
<properties>
<revision>5.23.0-SNAPSHOT</revision>
<revision>5.25.0-SNAPSHOT</revision>
<!-- Set this level to override the logging level for tests during build -->
<project.testlevel>INFO</project.testlevel>
<!-- Set this level to override the logging level for tests logging configuration during build -->
@@ -35,9 +35,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javadoc.name>nosqlbench ${revision}</javadoc.name>
<maven.compiler.source>24</maven.compiler.source>
<maven.compiler.target>24</maven.compiler.target>
<maven.compiler.release>24</maven.compiler.release>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
<maven.compiler.release>25</maven.compiler.release>
<PROG>nb5</PROG>
<maven.plugin.validation>VERBOSE</maven.plugin.validation>
@@ -522,7 +522,7 @@
<target>${maven.compiler.target}</target>
<release>${maven.compiler.release}</release>
<compilerArgs>
<arg>--enable-preview</arg>
<!-- <arg>&#45;&#45;enable-preview</arg>-->
<!-- <compilerArg>-Xdoclint:all</compilerArg>-->
<!-- <compilerArg>-Xlint:all</compilerArg>-->
</compilerArgs>
@@ -535,7 +535,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- <argLine>-ea @{argLine}</argLine> -->
<argLine>--enable-preview @{argLine}</argLine>
<!-- <argLine>&#45;&#45;enable-preview @{argLine}</argLine>-->
<systemPropertyVariables>
<Log4jContextSelector>
org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
@@ -623,7 +623,7 @@
</execution>
</executions>
<configuration>
<argLine>--enable-preview @{argLine}</argLine>
<!-- <argLine>&#45;&#45;enable-preview @{argLine}</argLine>-->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<includes>
@@ -708,7 +708,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[24,)</version>
<version>[25,)</version>
</requireJavaVersion>
<requireProfileIdsExist/>
</rules>
@@ -916,8 +916,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOptions>--enable-preview</additionalJOptions>
<release>24</release>
<!-- <additionalJOptions>&#45;&#45;enable-preview</additionalJOptions>-->
<release>25</release>
<doctitle>${javadoc.name}</doctitle>
<header>${javadoc.name}</header>
<windowtitle>${javadoc.name}</windowtitle>
nb-adapters/adapter-dataapi/pom.xml
+2 -2
View File
@@ -51,11 +51,11 @@
<artifactId>astra-db-java</artifactId>
<version>1.1.1</version>
</dependency>
<!-- Override Lombok version for Java 24 compatibility -->
<!-- Override Lombok version for Java 25 compatibility -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.38</version>
<version>1.18.42</version>
</dependency>
</dependencies>
nb-adapters/adapter-weaviate/pom.xml
+12
View File
@@ -40,4 +40,16 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
</configuration>
</plugin>
</plugins>
</build>
</project>
nb-engine/nb-engine-core/pom.xml
-1
View File
@@ -142,7 +142,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--enable-preview @{argLine}</argLine>
<groups>perf</groups>
</configuration>
</plugin>
nb-virtdata/pom.xml
-1
View File
@@ -57,7 +57,6 @@
</execution>
</executions>
<configuration>
<argLine>--enable-preview @{argLine}</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${project.basedir}/target/virtdata-userlibs-${project.version}.jar
</additionalClasspathElement>
nb5-proof/pom.xml
-1
View File
@@ -94,7 +94,6 @@
</execution>
</executions>
<configuration>
<argLine>--enable-preview @{argLine}</argLine>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<includes>
nb5/nb-appimage/build-bin.sh
+8 -8
View File
@@ -22,8 +22,8 @@ set -x
APPDIR=target/NB.AppDir
JAR_NAME="nb5.jar"
BIN_NAME="nb5"
JAVA_VERSION="23"
UNPACKED_NAME="jdk-23.0.1"
JAVA_VERSION="25"
UNPACKED_NAME="jdk-25"
mkdir -p ${APPDIR}
@@ -40,20 +40,20 @@ cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre"
jdkname="jdk${JAVA_VERSION}"
if [ "${jdkname}" == "jdk23" ]
if [ "${jdkname}" == "jdk25" ]
then
if [ ! -d "cache/${jdkname}" ] ; then
printf "getting ${jdkname} once into cache/${jdkname}\n";
filename='openjdk-23.0.1_linux-x64_bin.tar.gz'
filename='openjdk-25_linux-x64_bin.tar.gz'
mkdir -p cache
(cd cache && (
curl -O https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL/${filename}
curl -O https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/${filename}
tar -xf ${filename}
mv ${UNPACKED_NAME} jdk23
mv ${UNPACKED_NAME} ${jdkname}
rm ${filename}
))
fi
rsync -av cache/jdk23/ "${APPDIR}/usr/bin/jre/"
rsync -av cache/${jdkname}/ "${APPDIR}/usr/bin/jre/"
else
printf "Unknown java version indicated in $0"
exit 2
@@ -72,7 +72,7 @@ printf "getting appimage tool and building image...\n";
( cd target && (
if [ ! -x "appimagetool-x86_64.AppImage" ]
then
wget -c https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage
curl -L -O https://github.com/AppImage/appimagetool/releases/download/1.9.0/appimagetool-x86_64.AppImage
chmod +x appimagetool-x86_64.AppImage
fi
nbr-demos/pom.xml
-1
View File
@@ -75,7 +75,6 @@
</execution>
</executions>
<configuration>
<argLine>--enable-preview @{argLine}</argLine>
<parallel>methods</parallel>
<!-- <additionalClasspathElements>-->
<!-- <additionalClasspathElement>${project.basedir}/target/virtdata-userlibs-${project.version}.jar-->
nbr/build-bin-nbr.sh
+7 -9
View File
@@ -22,32 +22,30 @@ set -x
APPDIR=target/NB.AppDir
JAR_NAME="nbr.jar"
BIN_NAME="nbr"
JAVA_VERSION="23"
UNPACKED_NAME="jdk-23.0.1"
JAVA_VERSION="25"
UNPACKED_NAME="jdk-25"
mkdir -p ${APPDIR}
if [ ! -f target/${JAR_NAME} ]
then
printf "target/${JAR_NAME} does not exist"
exit 2
fi
rsync -av appimage/skel/ "${APPDIR}/"
rsync -av nb-appimage/skel/ "${APPDIR}/"
cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre"
jdkname="jdk${JAVA_VERSION}"
if [ "${jdkname}" == "jdk23" ]
if [ "${jdkname}" == "jdk25" ]
then
if [ ! -d "cache/${jdkname}" ] ; then
printf "getting ${jdkname} once into cache/${jdkname}\n";
filename='openjdk-23.0.1_linux-x64_bin.tar.gz'
filename='openjdk-25_linux-x64_bin.tar.gz'
mkdir -p cache
(cd cache && (
curl -O https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL/${filename}
curl -O https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/${filename}
tar -xf ${filename}
mv ${UNPACKED_NAME} ${jdkname}
rm ${filename}
@@ -72,7 +70,7 @@ printf "getting appimage tool and building image...\n";
( cd target && (
if [ ! -x "appimagetool-x86_64.AppImage" ]
then
wget -c https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage
curl -L -O https://github.com/AppImage/appimagetool/releases/download/1.9.0/appimagetool-x86_64.AppImage
chmod +x appimagetool-x86_64.AppImage
fi
nbr/appimage/skel/nbr.desktop → nbr/nb-appimage/skel/nbr.desktop
View File
File renamed without changes.
nbr/appimage/skel/nbr.png → nbr/nb-appimage/skel/nbr.png
View File
File renamed without changes.
nbr/appimage/skel/usr/bin/nbr → nbr/nb-appimage/skel/usr/bin/nbr
View File
File renamed without changes.