Skip to content

Commit 6741053

Browse files
authored
deps: update bigtable veneer to 2.5.1 and shared config to 1.2.6 (#3351)
* deps: update bigtable veneer to 2.3.0 * 2.3.1 * 2.4.0 * update enforcer * upgrade emulator * 2.5.1 * fix enforcer errors
1 parent 84bf4ca commit 6741053

File tree

4 files changed

+17
-7
lines changed
  • bigtable-client-core-parent/bigtable-hbase-integration-tests-common
  • bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded
  • bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded

4 files changed

+17
-7
lines changed

bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ limitations under the License.
6060
<groupId>com.google.errorprone</groupId>
6161
<artifactId>error_prone_annotations</artifactId>
6262
</exclusion>
63+
<exclusion>
64+
<groupId>org.checkerframework</groupId>
65+
<artifactId>checker-qual</artifactId>
66+
</exclusion>
6367
</exclusions>
6468
</dependency>
6569

bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ limitations under the License.
184184
<!-- See notes in bigtable-client-core/bigtable-hbase/pom.xml#verify-conscrypt-version -->
185185
<exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
186186
<exclude>org.apache.htrace:htrace-core4</exclude>
187+
<exclude>org.bouncycastle:*</exclude>
187188
</excludes>
188189
</artifactSet>
189190
<relocations>

bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ limitations under the License.
173173
<exclude>log4j:log4j</exclude>
174174
<!-- See notes in bigtable-client-core/bigtable-hbase/pom.xml#verify-conscrypt-version -->
175175
<exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
176+
<exclude>org.bouncycastle:*</exclude>
176177
</excludes>
177178
</artifactSet>
178179
<relocations>

pom.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ limitations under the License.
3232
<parent>
3333
<groupId>com.google.cloud</groupId>
3434
<artifactId>google-cloud-shared-config</artifactId>
35-
<version>1.2.2</version>
35+
<version>1.2.6</version>
3636
</parent>
3737

3838
<licenses>
@@ -54,7 +54,7 @@ limitations under the License.
5454
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5555

5656
<!-- core dependency versions -->
57-
<bigtable.version>2.2.0</bigtable.version>
57+
<bigtable.version>2.5.1</bigtable.version>
5858
<bigtable-client-core.version>1.23.0</bigtable-client-core.version>
5959
<grpc-conscrypt.version>2.5.1</grpc-conscrypt.version>
6060
<!-- keeping at this version to align with hbase-->
@@ -237,11 +237,6 @@ limitations under the License.
237237
<dependency>io.grpc:*</dependency>
238238
</dependencies>
239239
</requireSameVersions>
240-
<requireSameVersions>
241-
<dependencies>
242-
<dependency>io.opencensus:*</dependency>
243-
</dependencies>
244-
</requireSameVersions>
245240
<requireSameVersions>
246241
<dependencies>
247242
<dependency>com.google.cloud:google-cloud-bigtable</dependency>
@@ -306,6 +301,15 @@ limitations under the License.
306301
<dependency>com.google.http-client:*</dependency>
307302
</dependencies>
308303
</requireSameVersions>
304+
<bannedDependencies>
305+
<includes>
306+
<!-- gax-grpc transitvely brings in opencensus-proto, which the latest version is 0.2.0-->
307+
<!-- Only allow 0.2.0 for opencensus-proto and then the latest version (currently 0.28.0) for all other modules-->
308+
<!-- this will need to be updated whenever the opencensus version gets updated -->
309+
<dependency>io.opencensus:*:[0.28.0]</dependency>
310+
<dependency>io.opencensus:opencensus-proto:[0.2.0]</dependency>
311+
</includes>
312+
</bannedDependencies>
309313
</rules>
310314
</configuration>
311315
</execution>

0 commit comments

Comments
 (0)