diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 264497027..1a0e830f0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -95,11 +95,6 @@ jobs:
MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
-# - name: prepare_release
-# run: mvn --global-settings deploy.xml --batch-mode clean release:prepare -DdevelopmentVersion=${NEXT_SNAPSHOT} -DreleaseVersion=${RELEASE_VERSION}
-# - name: perform_release
-# run: mvn --global-settings deploy.xml --batch-mode release:perform
-
- name: upload artifacts
run: |
pwd
@@ -116,28 +111,60 @@ jobs:
with:
name: guidebook
path: guidebook
- - name: find latest release
- run: |
- LATEST_GH_RELEASE_ID=$(curl --silent "https://api.github.com/repos/nosqlbench/nosqlbench/releases/latest" | jq -r .id)
- echo "::set-env name=LATEST_GH_RELEASE_ID::${LATEST_GH_RELEASE_ID}"
- - name: upload jar
- uses: actions/upload-release-asset@v1
+
+ - name: Create Release
+ id: create_release
+ uses: actions/create-release@v1
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
- asset_path: nb/target/nb.jar
- asset_name: nb.jar
- asset_content_type: application/octet-stream
- upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets?name=nb.jar
- - name: upload binary
+ tag_name: ${{ github.ref }}
+ release_name: Release ${{ github.ref }}
+ draft: false
+ prerelease: false
+ - name: Upload nb.jar
+ id: upload-nb-jar
uses: actions/upload-release-asset@v1
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- asset_path: nb/target/nb
- asset_name: nb
- asset_content_type: application/octet-stream
- upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets?name=nb
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: nb/target/nb.jar
+ asset_name: nb.jar
+ asset_content_type: application/octet-stream
+ - name: Upload nb
+ id: upload-nb-binary
+ uses: actions/upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: nb/target/nb
+ asset_name: nb
+ asset_content_type: application/octet-stream
+
+# - name: find latest release
+# run: |
+# LATEST_GH_RELEASE_ID=$(curl --silent "https://api.github.com/repos/nosqlbench/nosqlbench/releases/latest" | jq -r .id)
+# echo "::set-env name=LATEST_GH_RELEASE_ID::${LATEST_GH_RELEASE_ID}"
+# - name: upload jar
+# uses: actions/upload-release-asset@v1
+# env:
+# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+# with:
+# asset_path: nb/target/nb.jar
+# asset_name: nb.jar
+# asset_content_type: application/octet-stream
+# upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets{?name,label}
+# - name: upload binary
+# uses: actions/upload-release-asset@v1
+# env:
+# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+# with:
+# asset_path: nb/target/nb
+# asset_name: nb
+# asset_content_type: application/octet-stream
+# upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets{?name,label}
docs:
needs: release
diff --git a/AUTOMATION.md b/AUTOMATION.md
deleted file mode 100644
index 184cd605d..000000000
--- a/AUTOMATION.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## CI and Github Actions
-
-This project uses github actions to manage continuous integration.
-Below is a sketch of how the automation currently works.
-
-### releases
-
-The releases workflow is responsible for thie following:
-
-1. Build nb and nb.jar binaries and application content.
-2. Publish new nb.jar releases to maven via Sonatype OSSRH.
-3. Upload release assets to the newly published release.
-4. Upload updated docs to the github pages site for docs.nosqlbench.io
-5. (future) upload updated javadocs ot the github pages site for javadoc.nosqlbench.io/...
-
-### build
-
-The build workflow simply builds the project and then verifies it in that order
-using the standard maven mojo.
diff --git a/BUILDING.md b/BUILDING.md
index 2d833acd7..c4b74a0bc 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -4,7 +4,9 @@
You need Java 11 or newer to build NoSQLBench.
-# mvn package
+# Building Locally
+
+## mvn package
To build NoSQLBench in its entirety, you simply need to run
@@ -19,7 +21,7 @@ within the Maven build mojo, including the following:
- Building the static guidebook in nb/target/guidebook
- Exporting all the bundled markdown into nb/target/guidebook
-# mvn verify
+## mvn verify
The integration tests for NoSQLBench are run in the verify phase.
You can run these tests with `mvn verify`. These tests are based
@@ -28,4 +30,26 @@ output. They can take quite a bit of time, but there is no substitute
for this level of testing, particularly for a tool that is used
to test other systems.
+# Automation
+
+## CI and Github Actions
+
+This project uses github actions to manage continuous integration.
+Below is a sketch of how the automation currently works.
+
+### releases
+
+The releases workflow is responsible for thie following:
+
+1. Build nb and nb.jar binaries and application content.
+2. Publish new nb.jar releases to maven via Sonatype OSSRH.
+3. Upload release assets to the newly published release.
+4. Upload updated docs to the github pages site for docs.nosqlbench.io
+5. (future) upload updated javadocs ot the github pages site for javadoc.nosqlbench.io/...
+
+### build
+
+The build workflow simply builds the project and then verifies it in that order
+using the standard maven mojo.
+
diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml
index 7bc892688..25639a400 100644
--- a/activitytype-cql/pom.xml
+++ b/activitytype-cql/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -23,7 +23,7 @@
io.nosqlbench
engine-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/activitytype-cqlverify/pom.xml b/activitytype-cqlverify/pom.xml
index 51d064618..9c7e61d12 100644
--- a/activitytype-cqlverify/pom.xml
+++ b/activitytype-cqlverify/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -24,7 +24,7 @@
io.nosqlbench
activitytype-cql
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/activitytype-diag/pom.xml b/activitytype-diag/pom.xml
index 8d5f64328..c16ed3ebb 100644
--- a/activitytype-diag/pom.xml
+++ b/activitytype-diag/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -20,7 +20,7 @@
io.nosqlbench
engine-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/activitytype-http/pom.xml b/activitytype-http/pom.xml
index 7a4674ed4..c935a5feb 100644
--- a/activitytype-http/pom.xml
+++ b/activitytype-http/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/activitytype-stdout/pom.xml b/activitytype-stdout/pom.xml
index 07c1c5c6d..7946d870a 100644
--- a/activitytype-stdout/pom.xml
+++ b/activitytype-stdout/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/activitytype-tcp/pom.xml b/activitytype-tcp/pom.xml
index 4394a2ef3..f8258458e 100644
--- a/activitytype-tcp/pom.xml
+++ b/activitytype-tcp/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -23,13 +23,13 @@
io.nosqlbench
engine-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
io.nosqlbench
activitytype-stdout
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
diff --git a/docsys/pom.xml b/docsys/pom.xml
index 3545a6aeb..e78116e84 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
mvn-defaults
io.nosqlbench
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
../mvn-defaults
@@ -105,17 +105,17 @@
io.nosqlbench
virtdata-processors
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
io.nosqlbench
virtdata-annotations
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
io.nosqlbench
virtdata-api
- 3.12.43-SNAPSHOT
+ 3.12.48-SNAPSHOT
org.slf4j
@@ -127,15 +127,6 @@
-
-
- maven-compiler-plugin
-
- 12
- 12
- 12
-
-
maven-shade-plugin
org.apache.maven.plugins
diff --git a/docsys/src/main/resources/docsys-guidebook/200.html b/docsys/src/main/resources/docsys-guidebook/200.html
index 671314ac1..82220588a 100644
--- a/docsys/src/main/resources/docsys-guidebook/200.html
+++ b/docsys/src/main/resources/docsys-guidebook/200.html
@@ -1,9 +1,9 @@
- guidebookNoSQLBench Docs
+ guidebookNoSQLBench Docs
-
+