updated dev version on master with merge fixes

This commit is contained in:
nb-droid 2020-03-19 18:19:10 +00:00 committed by Jonathan Shook
parent 5506858edf
commit fe1e72176c
26 changed files with 70 additions and 88 deletions

View File

@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,7 +23,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -24,7 +24,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cql</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -20,7 +20,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,13 +23,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-stdout</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

View File

@ -9,7 +9,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -105,17 +105,17 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-processors</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-userlibs</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,16 +23,9 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>engine-docker</artifactId>-->
<!-- <version>3.12.48-SNAPSHOT</version>-->
<!-- <classifier>shaded</classifier>-->
<!-- </dependency>-->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@ -60,7 +53,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docker</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -28,7 +28,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -55,17 +55,6 @@
<artifactId>docker-java-transport-okhttp</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.docker-java</groupId>-->
<!-- <artifactId>docker-java-transport-jersey</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.github.docker-java</groupId>-->
<!-- <artifactId>docker-java-transport-netty</artifactId>-->
<!-- <version>3.2.0-rc2</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
@ -89,7 +78,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -28,7 +28,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>docsys</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

View File

@ -6,7 +6,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -25,61 +25,61 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-cli</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docs</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-extensions</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-stdout</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-diag</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-tcp</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-http</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cql</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cqlverify</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>mvn-defaults</relativePath>
</parent>
@ -100,7 +100,7 @@
scm:git:https://github.com/nosqlbench/nosqlbench.git
</developerConnection>
<url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
<tag>nosqlbench-2.0.102-SNAPSHOT</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -18,17 +18,17 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-processors</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lang</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -32,7 +32,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -20,7 +20,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -29,7 +29,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -18,7 +18,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -17,38 +17,38 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-realdata</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-realer</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-random</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>virtdata-lib-basics</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>virtdata-lib-curves4</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>docsys</artifactId>
<version>3.12.48-SNAPSHOT</version>
<version>3.12.49-SNAPSHOT</version>
</dependency>
<dependency>