Merge pull request brianfrankcooper#493 from allanbank/nosqldb-cleanup

Nosqldb re-added to the build and checkstyle cleanup
adally · Jan 26, 2016 · 9520ff2 · 9520ff2
2 parents 808152d + 89d3de0
commit 9520ff2
Show file tree

Hide file tree

Showing 5 changed files with 255 additions and 192 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -124,6 +124,11 @@ LICENSE file.
       <artifactId>mongodb-binding</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.ycsb</groupId>
+      <artifactId>nosqldb-binding</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>
       <artifactId>orientdb-binding</artifactId>

diff --git a/nosqldb/pom.xml b/nosqldb/pom.xml
@@ -27,12 +27,13 @@ LICENSE file.
 
   <artifactId>nosqldb-binding</artifactId>
   <name>Oracle NoSQL Database Binding</name>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>kvclient</artifactId>
-      <version>1.2.123</version>
+      <groupId>com.oracle.kv</groupId>
+      <artifactId>oracle-nosql-client</artifactId>
+      <version>3.0.5</version>
     </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>
@@ -41,4 +42,28 @@ LICENSE file.
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.15</version>
+        <configuration>
+          <consoleOutput>true</consoleOutput>
+          <configLocation>../checkstyle.xml</configLocation>
+          <failOnViolation>true</failOnViolation>
+          <failsOnError>true</failsOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>checkstyle</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>