diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml index 0736ff34e..b2c60ae4d 100644 --- a/activitytype-cql/pom.xml +++ b/activitytype-cql/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/activitytype-cql/src/main/resources/activities/cql-tabular.yaml b/activitytype-cql/src/main/resources/activities/cql-tabular.yaml index f214450a3..9ca7c4d7f 100644 --- a/activitytype-cql/src/main/resources/activities/cql-tabular.yaml +++ b/activitytype-cql/src/main/resources/activities/cql-tabular.yaml @@ -1,4 +1,4 @@ -# nb -v run driver=cql yaml=cql-tabular tags=phase:schema host=dsehost +# nb -v cql-tabular rampup-cycles=1E6 main-cycles=1E9 scenarios: default: - run driver=cql tags==phase:schema threads==1 diff --git a/activitytype-cqlverify/pom.xml b/activitytype-cqlverify/pom.xml index 80e48126c..6a3446e58 100644 --- a/activitytype-cqlverify/pom.xml +++ b/activitytype-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench activitytype-cql - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/activitytype-diag/pom.xml b/activitytype-diag/pom.xml index 78ebcb261..c1601415f 100644 --- a/activitytype-diag/pom.xml +++ b/activitytype-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/activitytype-http/pom.xml b/activitytype-http/pom.xml index f2a5c5398..ee8876d90 100644 --- a/activitytype-http/pom.xml +++ b/activitytype-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/activitytype-stdout/pom.xml b/activitytype-stdout/pom.xml index 0dc4a1043..5c5eb8947 100644 --- a/activitytype-stdout/pom.xml +++ b/activitytype-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/activitytype-tcp/pom.xml b/activitytype-tcp/pom.xml index 4e1b9995d..f290b5027 100644 --- a/activitytype-tcp/pom.xml +++ b/activitytype-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-stdout - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/docsys/pom.xml b/docsys/pom.xml index 6bfca9ff1..381d6ad80 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -105,17 +105,17 @@ io.nosqlbench virtdata-processors - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-annotations - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT org.slf4j diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 5eec8ddeb..b1efc2ce2 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench virtdata-userlibs - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index bb84bceb5..cca3dd032 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT @@ -53,7 +53,7 @@ io.nosqlbench engine-docker - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 62643d548..7ad359b18 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 6da9c0053..61cc7c260 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -78,7 +77,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index c7bab494d..894640a7b 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 902fcd604..98bd00086 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d2acf867f..6b31a505a 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT pom @@ -243,12 +242,6 @@ ${docker.java.version} - - com.github.docker-java - docker-java-transport-jersey - ${docker.java.version} - - com.github.docker-java docker-java-transport-okhttp @@ -531,6 +524,7 @@ jar + @@ -584,8 +578,7 @@ - + true false diff --git a/nb/gendocs.sh b/nb/gendocs.sh index 4e0523b0f..316f1ba7d 100755 --- a/nb/gendocs.sh +++ b/nb/gendocs.sh @@ -1,5 +1,7 @@ #!/bin/bash # update nuxt +set -x +set -e GUIDEBOOK="target/guidebook" diff --git a/nb/nb-scripts/link-jar-name.sh b/nb/nb-scripts/link-jar-name.sh index 69ee06e78..fe5b3849c 100755 --- a/nb/nb-scripts/link-jar-name.sh +++ b/nb/nb-scripts/link-jar-name.sh @@ -9,8 +9,15 @@ cd target if [ -e "nb.jar" ] then echo "nb.jar link exists, skipping" -else - echo "linking $JARNAME to nb.jar" - ln -s $JARNAME nb.jar + exit 0 +fi +if [ ! -e "$JARNAME" ] +then + echo "$JARNAME does not exist, skipping" + exit 0 fi +echo "linking $JARNAME to nb.jar" +ln -s $JARNAME nb.jar +echo "linked $JARNAME to nb.jar, exiting" + diff --git a/nb/pom.xml b/nb/pom.xml index dbd214809..b43ac347b 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -25,61 +24,61 @@ io.nosqlbench engine-cli - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench engine-docs - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench engine-core - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench engine-extensions - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-stdout - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-diag - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-tcp - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-http - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-cql - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench activitytype-cqlverify - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT @@ -164,8 +163,7 @@ topics.md - + io.nosqlbench.engine.cli.NBCLI @@ -269,7 +267,7 @@ maven-enforcer-plugin - + diff --git a/nb/src/main/java/io/nosqlbench/nb/PlaceHolder.java b/nb/src/main/java/io/nosqlbench/nb/PlaceHolder.java new file mode 100644 index 000000000..d970a1667 --- /dev/null +++ b/nb/src/main/java/io/nosqlbench/nb/PlaceHolder.java @@ -0,0 +1,8 @@ +package io.nosqlbench.nb; + +/** + * This class is just a place holder. It holds a place. + * If only nexus understood aggregator module without src... + */ +public class PlaceHolder { +} diff --git a/pom.xml b/pom.xml index e5b79fb5a..b42529a51 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT mvn-defaults diff --git a/virtdata-annotations/pom.xml b/virtdata-annotations/pom.xml index d4fdb7246..637d21d49 100644 --- a/virtdata-annotations/pom.xml +++ b/virtdata-annotations/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 97cf846d9..bd42af119 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -18,17 +18,17 @@ io.nosqlbench virtdata-processors - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-annotations - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-lang - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 1ad786589..d9359a638 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 615380ae6..06902f3cb 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -32,7 +32,7 @@ io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 6c32747d3..0d9604e7d 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d92aadafa..268ce4c47 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index d5b038d5b..4770df710 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -29,7 +29,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-processors/pom.xml b/virtdata-processors/pom.xml index 8d9f0dcc9..1c5076fc1 100644 --- a/virtdata-processors/pom.xml +++ b/virtdata-processors/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench virtdata-annotations - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 36136b7d6..0ab277e6d 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 91094e6c0..10ed3ef02 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT ../mvn-defaults @@ -17,38 +17,38 @@ io.nosqlbench virtdata-realdata - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-api - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT virtdata-lib-curves4 io.nosqlbench - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT io.nosqlbench docsys - 3.12.49-SNAPSHOT + 3.12.50-SNAPSHOT