From 1f3c66b1a6e8a3adac1bb1eaca96251ac8b1c96d Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Tue, 8 Aug 2017 16:29:06 -0400 Subject: [PATCH] [skip ci] Update bigtable docs to reflect latest client This is to address the issues uncovered in this issue: https://github.com/JanusGraph/janusgraph/issues/450#issuecomment-321024231 Please note, that there will be one more change before bigtable-hbase 1.0 is released that will remove the need for the netty-tcnative-boringssl-static dependency Signed-off-by: Igor Bernstein --- docs/bigtable.txt | 12 ++++++------ docs/versions.txt | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/bigtable.txt b/docs/bigtable.txt index 864322b5cd..80ea09b4b9 100644 --- a/docs/bigtable.txt +++ b/docs/bigtable.txt @@ -23,10 +23,10 @@ some specific configuration options to connect. Bigtable connectivity relies on the `cloud-bigtable-client` library. This library is open-source and is https://github.com/GoogleCloudPlatform/cloud-bigtable-client[hosted on GitHub]. JanusGraph uses the HBase 1.0 API, so we require the lastest version of the -http://mvnrepository.com/artifact/com.google.cloud.bigtable/bigtable-hbase-1.0/0.9.5.1[bigtable-hbase-1.0 artifact.] +https://mvnrepository.com/artifact/com.google.cloud.bigtable/bigtable-hbase-1.x-hadoop/1.0.0-pre2[bigtable-hbase-1.x-hadoop artifact.] This library also uses the -https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static[netty-tcnative-boringssl-static] library +https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/1.1.33.Fork26[netty-tcnative-boringssl-static] library to make secure connections to Bigtable. Use the version recommended by the cloud-bigtable-client library. These two dependencies must be on the classpath of the Java binary that connects to Bigtable. Maven dependencies could @@ -36,14 +36,14 @@ be defined as: .... com.google.cloud.bigtable - bigtable-hbase-1.0 - 0.9.5.1 + bigtable-hbase-1.x-hadoop + 1.0.0-pre2 io.netty netty-tcnative-boringssl-static - 1.1.33.Fork19 + 1.1.33.Fork26 .... @@ -61,7 +61,7 @@ Example: [source,changelog] .... storage.backend=hbase -storage.hbase.ext.hbase.client.connection.impl=com.google.cloud.bigtable.hbase1_0.BigtableConnection +storage.hbase.ext.hbase.client.connection.impl=com.google.cloud.bigtable.hbase1_x.BigtableConnection storage.hbase.ext.google.bigtable.project.id= storage.hbase.ext.google.bigtable.instance.id= .... diff --git a/docs/versions.txt b/docs/versions.txt index 3b6c7800d1..8e2d528a6b 100644 --- a/docs/versions.txt +++ b/docs/versions.txt @@ -13,9 +13,9 @@ JanusGraph. [options="header"] |========================== | JanusGraph | Cassandra | HBase | Bigtable | Elasticsearch | Solr | TinkerPop | Spark | Scala -| 0.1.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z | 1.5.z | 5.2.z | 3.2.z | 1.6.z | 2.10.z -| 0.1.1 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z | 1.5.z | 5.2.z | 3.2.z | 1.6.z | 2.10.z -| 0.2.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z | 1.z*,2.z,5.z | 5.3-5.5.z, 6.2-6.6.z | 3.2.z | 1.6.z | 2.10.z +| 0.1.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z, 1.0.0-preZ | 1.5.z | 5.2.z | 3.2.z | 1.6.z | 2.10.z +| 0.1.1 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z, 1.0.0-preZ | 1.5.z | 5.2.z | 3.2.z | 1.6.z | 2.10.z +| 0.2.0 | 1.2.z, 2.0.z, 2.1.z | 0.98.z, 1.0.z, 1.1.z, 1.2.z | 0.9.z, 1.0.0-preZ | 1.z*,2.z,5.z | 5.3-5.5.z, 6.2-6.6.z | 3.2.z | 1.6.z | 2.10.z |========================== *Elasticsearch 1.z compatibility is deprecated and no longer tested by default