From d8f6d42450cbd9973e8ab14931bb8782ae77ac27 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 2 Jan 2025 11:11:59 -0600 Subject: [PATCH 1/7] fix: upgrade org.apache.logging.log4j:log4j-slf4j2-impl from 2.24.2 to 2.24.3 (#2126) Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-slf4j2-impl from 2.24.2 to 2.24.3. See this package in maven: org.apache.logging.log4j:log4j-slf4j2-impl See this project in Snyk: https://app.snyk.io/org/nosqlbench/project/453e17d8-dd56-4df1-a6f6-f11fbe9f6022?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 33bcd4624..dabc1844e 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -411,7 +411,7 @@ org.apache.logging.log4j log4j-slf4j2-impl - 2.24.2 + 2.24.3 From f7d9c7abc382f2576c68dba9923cd4a65d52a319 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 2 Jan 2025 11:12:33 -0600 Subject: [PATCH 2/7] fix: upgrade org.apache.logging.log4j:log4j-api from 2.24.2 to 2.24.3 (#2122) Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.24.2 to 2.24.3. See this package in maven: org.apache.logging.log4j:log4j-api See this project in Snyk: https://app.snyk.io/org/nosqlbench/project/453e17d8-dd56-4df1-a6f6-f11fbe9f6022?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index dabc1844e..63a06b77c 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -394,7 +394,7 @@ org.apache.logging.log4j log4j-api - 2.24.2 + 2.24.3 From fe783a164a38e3a98888358fd730fde3b6e9d6a2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 2 Jan 2025 11:13:16 -0600 Subject: [PATCH 3/7] fix: upgrade org.apache.logging.log4j:log4j-slf4j-impl from 2.24.2 to 2.24.3 (#2125) Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-slf4j-impl from 2.24.2 to 2.24.3. See this package in maven: org.apache.logging.log4j:log4j-slf4j-impl See this project in Snyk: https://app.snyk.io/org/nosqlbench/project/453e17d8-dd56-4df1-a6f6-f11fbe9f6022?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 63a06b77c..54b6df043 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -381,7 +381,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.24.2 + 2.24.3 From f48173c6cd2febab70b45315f42a2bdddaf31b60 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 2 Jan 2025 11:13:49 -0600 Subject: [PATCH 4/7] fix: upgrade org.apache.logging.log4j:log4j-core from 2.24.2 to 2.24.3 (#2123) Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.24.2 to 2.24.3. See this package in maven: org.apache.logging.log4j:log4j-core See this project in Snyk: https://app.snyk.io/org/nosqlbench/project/453e17d8-dd56-4df1-a6f6-f11fbe9f6022?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 54b6df043..218414f2a 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -400,7 +400,7 @@ org.apache.logging.log4j log4j-core - 2.24.2 + 2.24.3 From 3112fae1793a44306929526b5f64f19fa3f646d8 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 2 Jan 2025 11:14:21 -0600 Subject: [PATCH 5/7] fix: upgrade org.apache.logging.log4j:log4j-jcl from 2.24.2 to 2.24.3 (#2124) Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-jcl from 2.24.2 to 2.24.3. See this package in maven: org.apache.logging.log4j:log4j-jcl See this project in Snyk: https://app.snyk.io/org/nosqlbench/project/453e17d8-dd56-4df1-a6f6-f11fbe9f6022?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 218414f2a..181b1efab 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -417,7 +417,7 @@ org.apache.logging.log4j log4j-jcl - 2.24.2 + 2.24.3 From 8bd8e58bb2c59e072785f4921ca76e9b4a431007 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:15:18 -0800 Subject: [PATCH 6/7] Bump softprops/action-gh-release from 2.1.0 to 2.2.0 (#2121) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/preview.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 0713d45c4..1be908cc1 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 319979487..bd71766e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 }} From a1fd8c07db61920115bd58b3863970e4b40bbcca Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Thu, 2 Jan 2025 10:49:21 -0800 Subject: [PATCH 7/7] Change to aggregate javadoc (#2127) * Change to aggregate javadoc * Make in an aggregate jar * Better naming process --- mvn-defaults/pom.xml | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 181b1efab..f5280aab9 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -33,8 +33,7 @@ INFO UTF-8 UTF-8 - - nosqlbench + nosqlbench ${revision} nb5 VERBOSE @@ -907,6 +906,7 @@ --enable-preview 23 ${javadoc.name} +
${javadoc.name}
${javadoc.name} false false @@ -918,12 +918,47 @@ none + true + + + Adapter Drivers + io.nosqlbench.adapter.* + + + Adapters API + io.nosqlbench.adapters* + + + Engine + io.nosqlbench.engine* + + + NB + io.nosqlbench.nb* + + + Scenarios + io.nosqlbench.scenarios* + + + CQL Gen + io.nosqlbench.cqlgen* + + + Data Mappers + io.nosqlbench.datamappers* + + + Virtual Data + io.nosqlbench.virtdata* + + attach-javadoc - jar + aggregate-jar