From fad36e13a96db52a1c5c4cf99be1ea934184d8e8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2019 14:23:25 -0500
Subject: [PATCH 01/17] chore: release 1.7.2-SNAPSHOT (#86)
* updated versions.txt [ci skip]
* updated google-cloud-bigtable-bom/pom.xml [ci skip]
* updated google-cloud-bigtable-emulator/pom.xml [ci skip]
* updated google-cloud-bigtable/pom.xml [ci skip]
* updated grpc-google-cloud-bigtable-admin-v2/pom.xml [ci skip]
* updated grpc-google-cloud-bigtable-v2/pom.xml [ci skip]
* updated pom.xml [ci skip]
* updated proto-google-cloud-bigtable-admin-v2/pom.xml [ci skip]
* updated proto-google-cloud-bigtable-v2/pom.xml [ci skip]
---
google-cloud-bigtable-bom/pom.xml | 14 +++++++-------
google-cloud-bigtable-emulator/pom.xml | 4 ++--
google-cloud-bigtable/pom.xml | 4 ++--
grpc-google-cloud-bigtable-admin-v2/pom.xml | 4 ++--
grpc-google-cloud-bigtable-v2/pom.xml | 4 ++--
pom.xml | 12 ++++++------
proto-google-cloud-bigtable-admin-v2/pom.xml | 4 ++--
proto-google-cloud-bigtable-v2/pom.xml | 4 ++--
versions.txt | 12 ++++++------
9 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index bea8e3c9d8..2f097c39cd 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-bigtable-bom
- 1.7.1
+ 1.7.2-SNAPSHOT
pom
com.google.cloud
@@ -72,32 +72,32 @@
com.google.cloud
google-cloud-bigtable
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.cloud
google-cloud-bigtable-emulator
- 0.116.1
+ 0.116.2-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 4d251c69e1..4fdd9d28a5 100644
--- a/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
4.0.0
google-cloud-bigtable-emulator
- 0.116.1
+ 0.116.2-SNAPSHOT
Google Cloud Java - Bigtable Emulator
https://github.com/googleapis/java-bigtable
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
scm:git:git@github.com:googleapis/java-bigtable.git
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 42bf77049c..cdc03fb2cb 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-bigtable
- 1.7.1
+ 1.7.2-SNAPSHOT
jar
Google Cloud Bigtable
https://github.com/googleapis/java-bigtable
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
google-cloud-bigtable
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index e41cb94d57..2a65c3f244 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 45e6a24bc6..e06791919f 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index a7990efe02..7da45d4ffb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 1.7.1
+ 1.7.2-SNAPSHOT
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -195,27 +195,27 @@
com.google.cloud
google-cloud-bigtable-emulator
- 0.116.1
+ 0.116.2-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index dbcceac78e..df25b6ad3a 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 2b10bd04fd..7cf5169e4d 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.1
+ 1.7.2-SNAPSHOT
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.1
+ 1.7.2-SNAPSHOT
diff --git a/versions.txt b/versions.txt
index cae9503e8c..6d62a0d08e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:1.7.1:1.7.1
-grpc-google-cloud-bigtable-admin-v2:1.7.1:1.7.1
-grpc-google-cloud-bigtable-v2:1.7.1:1.7.1
-proto-google-cloud-bigtable-admin-v2:1.7.1:1.7.1
-proto-google-cloud-bigtable-v2:1.7.1:1.7.1
-google-cloud-bigtable-emulator:0.116.1:0.116.1
+google-cloud-bigtable:1.7.1:1.7.2-SNAPSHOT
+grpc-google-cloud-bigtable-admin-v2:1.7.1:1.7.2-SNAPSHOT
+grpc-google-cloud-bigtable-v2:1.7.1:1.7.2-SNAPSHOT
+proto-google-cloud-bigtable-admin-v2:1.7.1:1.7.2-SNAPSHOT
+proto-google-cloud-bigtable-v2:1.7.1:1.7.2-SNAPSHOT
+google-cloud-bigtable-emulator:0.116.1:0.116.2-SNAPSHOT
From 83ac4c880032d7155208777734b7c1ad0b8da07c Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Thu, 14 Nov 2019 23:07:08 +0100
Subject: [PATCH 02/17] chore(deps): update dependency
com.google.cloud:google-cloud-shared-config to v0.3.0 (#88)
---
google-cloud-bigtable-bom/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 2f097c39cd..1f8f829f5c 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 0.2.1
+ 0.3.0
Google Cloud Bigtable BOM
diff --git a/pom.xml b/pom.xml
index 7da45d4ffb..52b2832f2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.2.1
+ 0.3.0
From b3da95a9b58c4660e69f982643d6a327016c1cce Mon Sep 17 00:00:00 2001
From: Igor Bernstein
Date: Fri, 15 Nov 2019 15:47:47 -0500
Subject: [PATCH 03/17] chore: fix javadoc site after repo split (#89)
* To ensure that the excludes are respected by both the aggregate site and the javadoc jars
* move the javadoc config from reporting to build configs: this is necessary because the javadoc:jar is run as part of the build phase
* move the javadoc config to the parent pom so that it can be used by both the aggregate site goal and the javadoc jars
* Exclude the grpc & protobuf stubs from the aggregate site: they are not part of the public api in the java client
* Remove unused external links
* Stop generating unused site reports, we only use the javadocs
---
google-cloud-bigtable-bom/pom.xml | 10 +++
google-cloud-bigtable/pom.xml | 70 ----------------
pom.xml | 128 ++++++++++++++++--------------
3 files changed, 80 insertions(+), 128 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 1f8f829f5c..0908ebea20 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -111,6 +111,16 @@
true
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+
+ false
+
+
\ No newline at end of file
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index cdc03fb2cb..eae5f81c19 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -369,74 +369,4 @@
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.1.1
-
- protected
- true
- none
- true
-
-
-
-
- com/google/cloud/bigtable/gaxx/**
-
-
- com/google/cloud/bigtable/admin/v2/internal/**
- com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java
- com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java
- com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
- com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
- com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
-
-
- com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
- com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java
- com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
- com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
- com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
- com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java
-
-
- com/google/cloud/bigtable/data/v2/internal/**
- com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
- com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
- com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
- com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
- com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
- com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
- com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
- com/google/cloud/bigtable/data/v2/stub/mutaterows/**
- com/google/cloud/bigtable/data/v2/stub/readrows/**
- com/google/cloud/bigtable/data/v2/stub/metrics/**
-
-
-
-
- ${project.javadoc.protobufBaseURL}
- ../../../../../google-api-grpc/proto-google-cloud-bigtable-v2/target/site/apidocs/
-
-
- ${project.javadoc.protobufBaseURL}
- ../../../../../google-api-grpc/grpc-google-cloud-bigtable-v2/target/site/apidocs/
-
-
- ${project.javadoc.protobufBaseURL}
- ../../../../../google-api-grpc/proto-google-cloud-bigtable-admin-v2/target/site/apidocs/
-
-
- ${project.javadoc.protobufBaseURL}
- ../../../../../google-api-grpc/grpc-google-cloud-bigtable-admin-v2/target/site/apidocs/
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 52b2832f2f..34e70545f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,85 +370,97 @@
-
-
-
- proto-google-cloud-bigtable-v2
- grpc-google-cloud-bigtable-v2
- proto-google-cloud-bigtable-admin-v2
- grpc-google-cloud-bigtable-admin-v2
- google-cloud-bigtable
- google-cloud-bigtable-emulator
- google-cloud-bigtable-bom
-
-
+
org.apache.maven.plugins
- maven-project-info-reports-plugin
- 3.0.0
-
-
-
- index
- dependency-info
- team
- ci-management
- issue-management
- licenses
- scm
- dependency-management
- distribution-management
- summary
- modules
-
-
-
+ maven-site-plugin
+
- true
- ${site.installationModule}
- jar
+ false
org.apache.maven.plugins
maven-javadoc-plugin
3.1.1
-
-
- html
-
- aggregate
- javadoc
-
-
-
+
+
+ aggregate
+ false
+ site
+
+ aggregate
+
+
+
+
+ **/com/google/bigtable/**
+
+
+
+
+
none
protected
true
${project.build.directory}/javadoc
-
-
- Test helpers packages
- com.google.cloud.testing
-
-
- SPI packages
- com.google.cloud.spi*
-
-
+
+
+
+
+ **/com/google/cloud/bigtable/gaxx/**
+
+
+ **/com/google/cloud/bigtable/admin/v2/internal/**
+ **/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java
+ **/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java
+ **/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
+ **/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
+ **/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
+
+
+ **/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
+ **/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java
+ **/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
+ **/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
+ **/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
+ **/com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java
+
+
+ **/com/google/cloud/bigtable/data/v2/internal/**
+ **/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
+ **/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
+ **/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
+ **/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
+ **/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
+ **/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
+ **/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
+ **/com/google/cloud/bigtable/data/v2/stub/mutaterows/**
+ **/com/google/cloud/bigtable/data/v2/stub/readrows/**
+ **/com/google/cloud/bigtable/data/v2/stub/metrics/**
+
+
+
- https://grpc.io/grpc-java/javadoc/
- https://developers.google.com/protocol-buffers/docs/reference/java/
- https://googleapis.dev/java/google-auth-library/latest/
- https://googleapis.dev/java/gax/latest/
+ https://googleapis.dev/java/gax/${gax.version}/
https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/
-
+
+
+
+ proto-google-cloud-bigtable-v2
+ grpc-google-cloud-bigtable-v2
+ proto-google-cloud-bigtable-admin-v2
+ grpc-google-cloud-bigtable-admin-v2
+ google-cloud-bigtable
+ google-cloud-bigtable-emulator
+ google-cloud-bigtable-bom
+
From 1834fc129154486a4a1f632a33bb7be12b1d6af7 Mon Sep 17 00:00:00 2001
From: Siddharth Dinesh
Date: Fri, 15 Nov 2019 13:45:10 -0800
Subject: [PATCH 04/17] chore: update Error message for bad bigtable.env
variable (#91)
At some point, the allowed settings were changed from "prod" and "emulator" to "cloud" and "emulator".
This change updates the error message associated to the illegal argument exception.
---
.../com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
index 2fa2a26156..52c269b72c 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
@@ -103,7 +103,7 @@ protected void before(Description description) throws Throwable {
default:
throw new IllegalArgumentException(
String.format(
- "Unknown env: %s. Please set the system property %s to either 'emulator' or 'prod'.",
+ "Unknown env: %s. Please set the system property %s to either 'emulator' or 'cloud'.",
env, ENV_PROPERTY));
}
testEnv.start();
From e25758b3164618ac16d57fffe6ba0e4175229960 Mon Sep 17 00:00:00 2001
From: Rahul Kesharwani <42969463+rahulKQL@users.noreply.github.com>
Date: Mon, 18 Nov 2019 18:33:25 +0530
Subject: [PATCH 05/17] feat: update filter to accept an exact timestamp for
better accessibility (#92)
This change introduces `FILTERS.timestamp().exact()`, which enable user to directly provide exact timestamp to query Bigtable.
---
.../cloud/bigtable/data/v2/models/Filters.java | 9 +++++++++
.../bigtable/data/v2/models/FiltersTest.java | 15 +++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
index 6ada09391b..bd310cd2c5 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
@@ -516,6 +516,15 @@ private TimestampFilter() {}
public TimestampRangeFilter range() {
return new TimestampRangeFilter();
}
+
+ /**
+ * Matches cells with exact given timestamp.
+ *
+ * @return a {@link TimestampRangeFilter} with start/end closed timestamp.
+ */
+ public TimestampRangeFilter exact(Long exactTimestamp) {
+ return new TimestampRangeFilter().startClosed(exactTimestamp).endClosed(exactTimestamp);
+ }
}
/** Matches only cells with microsecond timestamps within the given range. */
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
index 509c99da7a..ad79025258 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
@@ -350,6 +350,21 @@ public void timestampRange() {
assertThat(actualFilter).isEqualTo(expectedFilter);
}
+ @Test
+ public void timestampAtExactTime() {
+ RowFilter actualFilter = FILTERS.timestamp().exact(20_000L).toProto();
+
+ RowFilter expectedFilter =
+ RowFilter.newBuilder()
+ .setTimestampRangeFilter(
+ TimestampRange.newBuilder()
+ .setStartTimestampMicros(20_000L)
+ .setEndTimestampMicros(20_000L + 1))
+ .build();
+
+ assertThat(actualFilter).isEqualTo(expectedFilter);
+ }
+
@Test
public void timestampOpenClosedFakeRange() {
RowFilter actualFilter =
From d73b7fbe96685db04e5e110de26f9bf0fdd3deef Mon Sep 17 00:00:00 2001
From: Igor Bernstein
Date: Mon, 18 Nov 2019 09:35:18 -0500
Subject: [PATCH 06/17] chore: make sure that integration tests only run as
part of a profile (#94)
It seems like maven will run integration tests w/o a profile under some circumstances. So -Pbigtable-prod-it will still run the emulator integration tests. This PR will explicitly disable default integration tests and enable them in each profile.
Please note that the emulator profile is still active by default, so integration tests will still run
---
google-cloud-bigtable/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index eae5f81c19..046b31a11e 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -225,6 +225,8 @@
verify
+ false
+
emulator
${project.build.directory}/test-grpc-logs/emulator-it
@@ -256,6 +258,8 @@
verify
+ false
+
cloud
${bigtable.cfe-data-endpoint}
@@ -289,6 +293,8 @@
verify
+ false
+
cloud
${bigtable.directpath-data-endpoint}
@@ -350,6 +356,9 @@
maven-failsafe-plugin
+
+ true
+
classes
2C
true
From 736390bd4b995ac52a115357798eacae400fd6fa Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 25 Nov 2019 16:37:53 +0100
Subject: [PATCH 07/17] chore(deps): update dependency
org.apache.maven.plugins:maven-enforcer-plugin to v3.0.0-m3 (#100)
---
google-cloud-bigtable/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 046b31a11e..ac88f61ad1 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -325,7 +325,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.0.0-M2
+ 3.0.0-M3
enforce-valid-profile
From 4a72f5099c915374bb38ebea9f4aa5cd307d497e Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 26 Nov 2019 22:13:40 +0100
Subject: [PATCH 08/17] chore(deps): update protobuf packages to v3.11.0 (#101)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 34e70545f8..d4544abcd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
1.25.0
28.1-android
0.24.0
- 3.10.0
+ 3.11.0
1.4.0
From c478ba30a82a59e4ed85767db434dd5a4b996572 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 3 Dec 2019 16:27:46 +0100
Subject: [PATCH 09/17] chore(deps): update protobuf packages to v3.11.1 (#104)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d4544abcd0..c2d4ba5489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
1.25.0
28.1-android
0.24.0
- 3.11.0
+ 3.11.1
1.4.0
From 8a6f8ecf37285168d84aaeda5fc5d295d769f81a Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 3 Dec 2019 16:28:13 +0100
Subject: [PATCH 10/17] chore(deps): update dependency
com.google.errorprone:error_prone_annotations to v2.3.4 (#103)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c2d4ba5489..f41a9c84bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,7 +257,7 @@
com.google.errorprone
error_prone_annotations
- 2.3.3
+ 2.3.4
com.google.code.findbugs
From dcdd0c347f10802be57c4f7267c2b82c59ea2278 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Wed, 4 Dec 2019 22:58:21 +0100
Subject: [PATCH 11/17] deps: update gax.version to v1.51.0 (#105)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f41a9c84bf..623c490be9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
https://googleapis.dev/java/google-api-grpc/latest
1.7
- 1.50.1
+ 1.51.0
1.8.1
1.17.0
1.91.3
From aed1d10fe4351ce4f0a3d901bd6bb3602eec0a11 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 6 Dec 2019 02:49:24 +0100
Subject: [PATCH 12/17] chore(deps): update dependency
com.google.cloud:google-cloud-conformance-tests to v0.0.2 (#110)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 623c490be9..b0862cc11f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,7 @@
com.google.cloud
google-cloud-conformance-tests
- 0.0.1
+ 0.0.2
1.25.0
28.1-android
From 12169d6a91324de4f600a630a7140f10653bd9e6 Mon Sep 17 00:00:00 2001
From: Igor Bernstein
Date: Tue, 17 Dec 2019 15:03:02 -0500
Subject: [PATCH 15/17] chore: use prod endpoint for directpath tests (#119)
* chore: use prod endpoint for directpath tests
* oops
* use client default endpoints by default
* collapse empty xml nodes
---
google-cloud-bigtable/pom.xml | 12 ++++++------
.../cloud/bigtable/test_helpers/env/CloudEnv.java | 11 ++++++-----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index ac88f61ad1..c46c2cf43a 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -22,12 +22,12 @@
false
${skipTests}
- bigtable.googleapis.com:443
- bigtableadmin.googleapis.com:443
-
-
- testdirectpath-bigtable.sandbox.googleapis.com:443
- test-bigtableadmin.sandbox.googleapis.com:443
+
+
+
+
+
+
+ 1.8.0
pom
com.google.cloud
@@ -72,32 +72,32 @@
com.google.cloud
google-cloud-bigtable
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.cloud
google-cloud-bigtable-emulator
- 0.116.2-SNAPSHOT
+ 0.117.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 4fdd9d28a5..0b35714cae 100644
--- a/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
4.0.0
google-cloud-bigtable-emulator
- 0.116.2-SNAPSHOT
+ 0.117.0
Google Cloud Java - Bigtable Emulator
https://github.com/googleapis/java-bigtable
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
scm:git:git@github.com:googleapis/java-bigtable.git
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index c46c2cf43a..a5382f3e5f 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-bigtable
- 1.7.2-SNAPSHOT
+ 1.8.0
jar
Google Cloud Bigtable
https://github.com/googleapis/java-bigtable
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
google-cloud-bigtable
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 2a65c3f244..0a04bff09d 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index e06791919f..c61ef638d0 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/pom.xml b/pom.xml
index bb93b8a1ad..74f523cd48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 1.7.2-SNAPSHOT
+ 1.8.0
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -195,27 +195,27 @@
com.google.cloud
google-cloud-bigtable-emulator
- 0.116.2-SNAPSHOT
+ 0.117.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index df25b6ad3a..6432a48b52 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 7cf5169e4d..f90922a231 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.7.2-SNAPSHOT
+ 1.8.0
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 1.7.2-SNAPSHOT
+ 1.8.0
diff --git a/versions.txt b/versions.txt
index 6d62a0d08e..ea5b102db2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:1.7.1:1.7.2-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:1.7.1:1.7.2-SNAPSHOT
-grpc-google-cloud-bigtable-v2:1.7.1:1.7.2-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:1.7.1:1.7.2-SNAPSHOT
-proto-google-cloud-bigtable-v2:1.7.1:1.7.2-SNAPSHOT
-google-cloud-bigtable-emulator:0.116.1:0.116.2-SNAPSHOT
+google-cloud-bigtable:1.8.0:1.8.0
+grpc-google-cloud-bigtable-admin-v2:1.8.0:1.8.0
+grpc-google-cloud-bigtable-v2:1.8.0:1.8.0
+proto-google-cloud-bigtable-admin-v2:1.8.0:1.8.0
+proto-google-cloud-bigtable-v2:1.8.0:1.8.0
+google-cloud-bigtable-emulator:0.117.0:0.117.0