From c9d70ba01b1fb1a413711a3bab8ae1a382a8310f Mon Sep 17 00:00:00 2001
From: Sean Busbey <sean.busbey@gmail.com>
Date: Fri, 30 Sep 2016 09:00:54 -0500
Subject: [PATCH] [build, core, accumulo, couchbase2, hbase10, orientdb,
 asynchbase] fixes for jdk9 (#712)

* in couchbase2 work around ReactiveX/RxJava#3824
* accumulo test hangs, so skip tests
* hbase10 and asynchbase test crashes with unknown class version, so skip tests
* orientdb tests fail, so skip
* core jar-with-deps fails, so keep them broken out

fixes #704, fixes #705
---
 .travis.yml                                   |  2 +-
 accumulo/pom.xml                              |  2 ++
 asynchbase/pom.xml                            | 19 ++++++++++++++++-
 binding-parent/pom.xml                        | 17 +++++++++++++++
 core/pom.xml                                  | 21 -------------------
 .../ycsb/db/couchbase2/Couchbase2Client.java  |  2 +-
 hbase10/pom.xml                               | 16 ++++++++++++++
 orientdb/pom.xml                              |  4 ++++
 8 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a34a295a70..769d7f6af7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,4 +35,4 @@ services:
 
 
 # Use the Container based infrastructure.
-sudo: false
\ No newline at end of file
+sudo: false
diff --git a/accumulo/pom.xml b/accumulo/pom.xml
index eb098f88c1..a8023447d1 100644
--- a/accumulo/pom.xml
+++ b/accumulo/pom.xml
@@ -30,6 +30,8 @@ LICENSE file.
   <properties>
     <!-- This should match up to the one from your Accumulo version -->
     <hadoop.version>2.2.0</hadoop.version>
+    <!-- Tests do not run on jdk9 -->
+    <skipJDK9Tests>true</skipJDK9Tests>
   </properties>
   <dependencies>
     <dependency>
diff --git a/asynchbase/pom.xml b/asynchbase/pom.xml
index 2092a88bc2..ee9efbbaa8 100644
--- a/asynchbase/pom.xml
+++ b/asynchbase/pom.xml
@@ -25,6 +25,11 @@ LICENSE file.
   <artifactId>asynchbase-binding</artifactId>
   <name>AsyncHBase Client Binding for Apache HBase</name>
 
+  <properties>
+    <!-- Tests do not run on jdk9 -->
+    <skipJDK9Tests>true</skipJDK9Tests>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hbase</groupId>
@@ -79,6 +84,12 @@ LICENSE file.
       <artifactId>hbase-testing-util</artifactId>
       <version>${hbase10.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
     <dependency>
@@ -86,6 +97,12 @@ LICENSE file.
       <artifactId>hbase-client</artifactId>
       <version>${hbase10.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
     <dependency>
@@ -102,4 +119,4 @@ LICENSE file.
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml
index a05a0ae363..7e5eb85290 100644
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -37,6 +37,11 @@ LICENSE file.
     <module>datastore-specific-descriptor</module>
   </modules>
 
+  <properties>
+    <!-- See the test-on-jdk9 profile below. Default to 'jdk9 works' -->
+    <skipJDK9Tests>false</skipJDK9Tests>
+  </properties>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -127,6 +132,18 @@ LICENSE file.
         </plugins>
       </build>
     </profile>
+    <!-- If the binding doesn't work with jdk9, it should redefine the
+         skipJDK9 property
+      -->
+    <profile>
+      <id>tests-on-jdk9</id>
+      <activation>
+        <jdk>9</jdk>
+      </activation>
+      <properties>
+        <skipTests>${skipJDK9Tests}</skipTests>
+      </properties>
+    </profile>
   </profiles>
 </project>
 
diff --git a/core/pom.xml b/core/pom.xml
index 858daa3452..e713073a1b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -68,26 +68,5 @@ LICENSE file.
         <filtering>true</filtering>
       </resource>
     </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven.assembly.version}</version>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>
diff --git a/couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java b/couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java
index 7acd9bbbca..6697a0c357 100644
--- a/couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java
+++ b/couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java
@@ -715,7 +715,7 @@ private Status scanSpecificFields(final String table, final String startkey, fin
    */
   private void waitForMutationResponse(final Observable<? extends Document<?>> input) {
     if (!syncMutResponse) {
-      input.subscribe(new Subscriber<Document<?>>() {
+      ((Observable<Document<?>>)input).subscribe(new Subscriber<Document<?>>() {
         @Override
         public void onCompleted() {
         }
diff --git a/hbase10/pom.xml b/hbase10/pom.xml
index 01db0ceb1b..8d8f05e7f8 100644
--- a/hbase10/pom.xml
+++ b/hbase10/pom.xml
@@ -28,11 +28,21 @@ LICENSE file.
   <artifactId>hbase10-binding</artifactId>
   <name>HBase 1.0 DB Binding</name>
 
+  <properties>
+    <!-- Tests do not run on jdk9 -->
+    <skipJDK9Tests>true</skipJDK9Tests>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>
       <version>${hbase10.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>
@@ -51,6 +61,12 @@ LICENSE file.
       <artifactId>hbase-testing-util</artifactId>
       <version>${hbase10.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>
diff --git a/orientdb/pom.xml b/orientdb/pom.xml
index d7a91aa7ad..07f43c6077 100644
--- a/orientdb/pom.xml
+++ b/orientdb/pom.xml
@@ -35,6 +35,10 @@ LICENSE file.
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </repository>
   </repositories>
+  <properties>
+    <!-- Tests do not run on jdk9 -->
+    <skipJDK9Tests>true</skipJDK9Tests>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>