diff --git a/bigtable-grpc-interface/download_and_install_driver.sh b/bigtable-grpc-interface/download_and_install_driver.sh new file mode 100755 index 0000000000..4bc06d6c25 --- /dev/null +++ b/bigtable-grpc-interface/download_and_install_driver.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# download_and_install_driver.sh +# Download a version of driver_with_deps.jar and install it in maven + +REMOTE_DIRECTORY=$1 +FILE=$2 +TMP_DIR=$3 +GROUP=$4 +ARTIFACT_ID=$5 +VERSION=$6 +REPO_PATH=$7 + +mkdir -p ${TMP_DIR} +echo "mkdir -p ${TMP_DIR}" + +echo "gsutil cp ${REMOTE_DIRECTORY}/${FILE} ${TMP_DIR}" +gsutil cp ${REMOTE_DIRECTORY}/${FILE} ${TMP_DIR} + +echo "mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file \ + -Dfile=${TMP_DIR}/${FILE} \ + -DgroupId=${GROUP} \ + -DartifactId=${ARTIFACT_ID} \ + -Dversion=${VERSION} \ + -Dpackaging=jar \ + -DlocalRepositoryPath=${REPO_PATH}" + +mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file \ + -Dfile=${TMP_DIR}/${FILE} \ + -DgroupId=${GROUP} \ + -DartifactId=${ARTIFACT_ID} \ + -Dversion=${VERSION} \ + -Dpackaging=jar \ + -DlocalRepositoryPath=${REPO_PATH} + diff --git a/bigtable-grpc-interface/pom.xml b/bigtable-grpc-interface/pom.xml new file mode 100644 index 0000000000..0172a4dd20 --- /dev/null +++ b/bigtable-grpc-interface/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + + bigtable-client + bigtable-client + 0.1.2-SNAPSHOT + + + bigtable-grpc-interface + jar + + + + gs://anviltop-builds/data + driver_deploy.jar + ${project.basedir}/../${bigtable.grpc.repo.dir} + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + exec-maven-plugin + org.codehaus.mojo + 1.3.2 + + + install-grpc-client + validate + + exec + + + ${project.basedir}/download_and_install_driver.sh + + ${stubby.driver.remote.directory} + ${stubby.driver.file} + ${project.basedir}/tmp + ${stubby.driver.group} + ${stubby.driver.artifact} + ${stubby.driver.version} + ${bigtable.grpc.repo.fullpath} + + + + + + + + diff --git a/bigtable-hbase/pom.xml b/bigtable-hbase/pom.xml index efc4e8b38c..5a6a07e65e 100644 --- a/bigtable-hbase/pom.xml +++ b/bigtable-hbase/pom.xml @@ -119,6 +119,11 @@ + + bigtable-client + bigtable-grpc-interface + ${project.version} + org.apache.hadoop hadoop-common @@ -327,10 +332,6 @@ ${stubby.driver.group}:* - com.google.api-client:* - com.google.http-client:* - com.google.oauth-client:* - com.fasterxml.jackson.core:* @@ -354,10 +355,6 @@ io.netty com.google.bigtable.repackaged.io.netty - - com.google.api - com.google.bigtable.repackaged.com.google.api - diff --git a/pom.xml b/pom.xml index 444b01ad13..a6edf1b655 100644 --- a/pom.xml +++ b/pom.xml @@ -8,15 +8,17 @@ pom + bigtable-grpc-interface bigtable-hbase - /google/data/ro/teams/cloud-bigtable/driver_mpm/test/driver_deploy.jar com.google.bigtable.hbase bigtable-grpc-interface 0.4-SNAPSHOT + bigtable-grpc-repo + 1.0.0 2.4.1 hbase-hadoop2-compat @@ -31,8 +33,6 @@ test-table-admin-bigtable.googleapis.com test-bigtable.googleapis.com target/call_reports - bigtable-grpc-repo - ${project.basedir}/${bigtable.grpc.repo.dir} UTF-8 @@ -286,33 +286,5 @@ - - - exec-maven-plugin - org.codehaus.mojo - 1.3.2 - - - install-grpc-client - validate - - exec - - - mvn - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file - -Dfile=${stubby.driver.path} - -DgroupId=${stubby.driver.group} - -DartifactId=${stubby.driver.artifact} - -Dversion=${stubby.driver.version} - -Dpackaging=jar - -DlocalRepositoryPath=${bigtable.grpc.repo.fullpath} - - - - - -