diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 2605e2c010..b995a5c3e0 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -63,8 +63,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ rsync \ snappy \ zlib1g-dev \ - wget \ - openjdk-7-jdk + wget ####### # OpenJDK 8 @@ -87,6 +86,9 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ ant \ maven +# make sure that we will use jdk-8 to run the tests +RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java + # Fixing the Apache commons / Maven dependency problem under Ubuntu: # See http://wiki.apache.org/commons/VfsProblems RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar . diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java index 59e5856bd7..92a436d443 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java @@ -29,6 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +// DUMMY LINE TO TRIGGER BUILD + /** * A BlockingQueue reports waiting time in queue and queue length to * ThriftMetrics.