Merge branch 'main' into jshook/nb523

This commit is contained in:
Jonathan Shook 2025-01-08 16:43:36 -06:00 committed by GitHub
commit a18311b4ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 45 additions and 10 deletions

View File

@ -144,7 +144,7 @@ jobs:
# https://github.com/softprops/action-gh-release
- name: create github release
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.2.0
if: startsWith(github.ref, 'refs/tags/')
with:
# body: ${{ steps.prepare_summary.outputs.release_summary }}

View File

@ -133,7 +133,7 @@ jobs:
# https://github.com/softprops/action-gh-release
- name: create github release
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.2.0
if: startsWith(github.ref, 'refs/tags/')
with:
# body: ${{ steps.prepare_summary.outputs.release_summary }}

View File

@ -33,8 +33,7 @@
<project.test_logstatuslevel>INFO</project.test_logstatuslevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javadoc.name>nosqlbench</javadoc.name>
<javadoc.name>nosqlbench ${revision}</javadoc.name>
<PROG>nb5</PROG>
<maven.plugin.validation>VERBOSE</maven.plugin.validation>
</properties>
@ -381,7 +380,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.24.2</version>
<version>2.24.3</version>
</dependency>
</dependencies>
@ -394,13 +393,13 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.24.2</version>
<version>2.24.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.2</version>
<version>2.24.3</version>
</dependency>
<dependency>
@ -411,13 +410,13 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.24.2</version>
<version>2.24.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>2.24.2</version>
<version>2.24.3</version>
</dependency>
<dependency>
@ -907,6 +906,7 @@
<additionalJOptions>--enable-preview</additionalJOptions>
<release>23</release>
<doctitle>${javadoc.name}</doctitle>
<header>${javadoc.name}</header>
<windowtitle>${javadoc.name}</windowtitle>
<detectJavaApiLink>false</detectJavaApiLink>
<detectLinks>false</detectLinks>
@ -918,12 +918,47 @@
</additionalOptions>
<!-- <additionalJOption>-Xdoclint:none</additionalJOption>-->
<doclint>none</doclint>
<notimestamp>true</notimestamp>
<groups>
<group>
<title>Adapter Drivers</title>
<packages>io.nosqlbench.adapter.*</packages>
</group>
<group>
<title>Adapters API</title>
<packages>io.nosqlbench.adapters*</packages>
</group>
<group>
<title>Engine</title>
<packages>io.nosqlbench.engine*</packages>
</group>
<group>
<title>NB</title>
<packages>io.nosqlbench.nb*</packages>
</group>
<group>
<title>Scenarios</title>
<packages>io.nosqlbench.scenarios*</packages>
</group>
<group>
<title>CQL Gen</title>
<packages>io.nosqlbench.cqlgen*</packages>
</group>
<group>
<title>Data Mappers</title>
<packages>io.nosqlbench.datamappers*</packages>
</group>
<group>
<title>Virtual Data</title>
<packages>io.nosqlbench.virtdata*</packages>
</group>
</groups>
</configuration>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
<goal>aggregate-jar</goal>
</goals>
</execution>