From 22e285394dc476b3c23e20db39679ac19be66494 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 15 Sep 2020 19:30:34 -0500
Subject: [PATCH] stub in dedicated driver api module

---
 driver-cql-shaded/pom.xml |  6 +++++
 driver-cqld4/pom.xml      | 47 +++++----------------------------------
 driver-cqlverify/pom.xml  | 10 ++++++++-
 driver-diag/pom.xml       |  6 +++++
 driver-http/pom.xml       |  6 +++++
 driver-jmx/pom.xml        |  6 +++++
 driver-kafka/pom.xml      | 38 ++++++++++++++++++-------------
 driver-mongodb/pom.xml    |  6 +++++
 driver-stdout/pom.xml     |  6 +++++
 driver-tcp/pom.xml        | 26 +++++++++++++---------
 driver-web/pom.xml        |  6 +++++
 drivers-api/pom.xml       | 39 ++++++++++++++++++++++++++++++++
 engine-api/pom.xml        | 11 +++++++--
 engine-core/pom.xml       | 10 +++++++--
 pom.xml                   |  2 ++
 15 files changed, 153 insertions(+), 72 deletions(-)
 create mode 100644 drivers-api/pom.xml

diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml
index 4466d6ac1..831cb3cd0 100644
--- a/driver-cql-shaded/pom.xml
+++ b/driver-cql-shaded/pom.xml
@@ -26,6 +26,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.datastax.dse</groupId>
             <artifactId>dse-java-driver-core</artifactId>
diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml
index db0556ec9..38caefefd 100644
--- a/driver-cqld4/pom.xml
+++ b/driver-cqld4/pom.xml
@@ -26,6 +26,12 @@
             <version>3.12.141-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
 
         <dependency>
             <groupId>com.datastax.oss</groupId>
@@ -71,47 +77,6 @@
             <artifactId>snappy-java</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>io.netty</groupId>-->
-<!--            <artifactId>netty-transport-native-epoll</artifactId>-->
-<!--            <version>4.1.36.Final</version>-->
-<!--            <classifier>linux-x86_64</classifier>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.yaml</groupId>-->
-<!--            <artifactId>snakeyaml</artifactId>-->
-<!--            <version>1.23</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.commons</groupId>-->
-<!--            <artifactId>commons-lang3</artifactId>-->
-<!--            <version>3.7</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.slf4j</groupId>-->
-<!--            <artifactId>slf4j-api</artifactId>-->
-<!--            <version>1.7.25</version>-->
-<!--        </dependency>-->
-
-        <!-- test only scope -->
-
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-api</artifactId>
-            <version>3.12.141-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-api</artifactId>
-            <version>3.12.141-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml
index a2aceb397..8195edcb1 100644
--- a/driver-cqlverify/pom.xml
+++ b/driver-cqlverify/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -27,6 +29,12 @@
       <version>3.12.145-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.nosqlbench</groupId>
+      <artifactId>drivers-api</artifactId>
+      <version>3.12.145-SNAPSHOT</version>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml
index fc66b4594..c96078b21 100644
--- a/driver-diag/pom.xml
+++ b/driver-diag/pom.xml
@@ -23,6 +23,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/driver-http/pom.xml b/driver-http/pom.xml
index 1d1bcc235..a4a8bddca 100644
--- a/driver-http/pom.xml
+++ b/driver-http/pom.xml
@@ -25,6 +25,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml
index 0975de1f0..6831e0c14 100644
--- a/driver-jmx/pom.xml
+++ b/driver-jmx/pom.xml
@@ -19,6 +19,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml
index f1ecbec3d..967b93439 100644
--- a/driver-kafka/pom.xml
+++ b/driver-kafka/pom.xml
@@ -21,25 +21,31 @@
 
         <!-- core dependencies -->
 
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>2.0.0</version>
-        </dependency>
+      <dependency>
+        <groupId>org.apache.kafka</groupId>
+        <artifactId>kafka-clients</artifactId>
+        <version>2.0.0</version>
+      </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-api</artifactId>
-            <version>3.12.145-SNAPSHOT</version>
-        </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>engine-api</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-stdout</artifactId>
-            <version>3.12.145-SNAPSHOT</version>
-        </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>drivers-api</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
 
-        <dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>driver-stdout</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml
index 7964d4470..f42530ea1 100644
--- a/driver-mongodb/pom.xml
+++ b/driver-mongodb/pom.xml
@@ -24,6 +24,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-sync</artifactId>
diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml
index 51b0fc101..2904ac8de 100644
--- a/driver-stdout/pom.xml
+++ b/driver-stdout/pom.xml
@@ -25,6 +25,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
 
diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml
index 5b54fb586..5042cdfb0 100644
--- a/driver-tcp/pom.xml
+++ b/driver-tcp/pom.xml
@@ -21,17 +21,23 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>engine-api</artifactId>
-            <version>3.12.145-SNAPSHOT</version>
-        </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>engine-api</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
 
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>driver-stdout</artifactId>
-            <version>3.12.145-SNAPSHOT</version>
-        </dependency>
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>drivers-api</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.nosqlbench</groupId>
+        <artifactId>driver-stdout</artifactId>
+        <version>3.12.145-SNAPSHOT</version>
+      </dependency>
 
     </dependencies>
 
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index e3ae18be8..41b9d82c8 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -25,6 +25,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>htmlunit-driver</artifactId>
diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml
new file mode 100644
index 000000000..f237af472
--- /dev/null
+++ b/drivers-api/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <parent>
+        <artifactId>mvn-defaults</artifactId>
+        <groupId>io.nosqlbench</groupId>
+        <version>3.12.145-SNAPSHOT</version>
+        <relativePath>../mvn-defaults</relativePath>
+    </parent>
+
+    <artifactId>drivers-api</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>
+        The drivers API for nosqlbench;
+        Provides the interfaces needed to build drivers that can be loaded
+        by nosqlbench core
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>nb-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>virtdata-userlibs</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index e57835c32..cb31cb919 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -13,8 +13,9 @@
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>
-        The driver API for nosqlbench;
-        Provides the interfaces needed to build drivers that can be loaded by nosqlbench core
+        The engine API for nosqlbench;
+        Provides the interfaces needed to build internal modules for the
+        nosqlbench core engine
     </description>
 
     <dependencies>
@@ -25,6 +26,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index e830fda97..704a53168 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -21,8 +21,8 @@
 
         <!--<dependency>-->
             <!--<groupId>com.github.oshi</groupId>-->
-            <!--<artifactId>oshi-core</artifactId>-->
-            <!--<version>3.5.0</version>-->
+        <!--<artifactId>oshi-core</artifactId>-->
+        <!--<version>3.5.0</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -31,6 +31,12 @@
             <version>3.12.145-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>drivers-api</artifactId>
+            <version>3.12.145-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/pom.xml b/pom.xml
index 35a14eee6..f0de79971 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,8 @@
         <module>engine-cli</module>
         <module>engine-rest</module>
 
+        <module>drivers-api</module>
+
         <!-- a binary (appimage) build option for nb -->
         <module>nb</module>