Skip to content

Commit

Permalink
deps: update bigtable veneer to 2.5.1 and shared config to 1.2.6 (#3351)
Browse files Browse the repository at this point in the history
* deps: update bigtable veneer to 2.3.0

* 2.3.1

* 2.4.0

* update enforcer

* upgrade emulator

* 2.5.1

* fix enforcer errors
  • Loading branch information
kolea2 authored Jan 28, 2022
1 parent 84bf4ca commit 6741053
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ limitations under the License.
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ limitations under the License.
<!-- See notes in bigtable-client-core/bigtable-hbase/pom.xml#verify-conscrypt-version -->
<exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
<exclude>org.apache.htrace:htrace-core4</exclude>
<exclude>org.bouncycastle:*</exclude>
</excludes>
</artifactSet>
<relocations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ limitations under the License.
<exclude>log4j:log4j</exclude>
<!-- See notes in bigtable-client-core/bigtable-hbase/pom.xml#verify-conscrypt-version -->
<exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
<exclude>org.bouncycastle:*</exclude>
</excludes>
</artifactSet>
<relocations>
Expand Down
18 changes: 11 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.2</version>
<version>1.2.6</version>
</parent>

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

<!-- core dependency versions -->
<bigtable.version>2.2.0</bigtable.version>
<bigtable.version>2.5.1</bigtable.version>
<bigtable-client-core.version>1.23.0</bigtable-client-core.version>
<grpc-conscrypt.version>2.5.1</grpc-conscrypt.version>
<!-- keeping at this version to align with hbase-->
Expand Down Expand Up @@ -237,11 +237,6 @@ limitations under the License.
<dependency>io.grpc:*</dependency>
</dependencies>
</requireSameVersions>
<requireSameVersions>
<dependencies>
<dependency>io.opencensus:*</dependency>
</dependencies>
</requireSameVersions>
<requireSameVersions>
<dependencies>
<dependency>com.google.cloud:google-cloud-bigtable</dependency>
Expand Down Expand Up @@ -306,6 +301,15 @@ limitations under the License.
<dependency>com.google.http-client:*</dependency>
</dependencies>
</requireSameVersions>
<bannedDependencies>
<includes>
<!-- gax-grpc transitvely brings in opencensus-proto, which the latest version is 0.2.0-->
<!-- Only allow 0.2.0 for opencensus-proto and then the latest version (currently 0.28.0) for all other modules-->
<!-- this will need to be updated whenever the opencensus version gets updated -->
<dependency>io.opencensus:*:[0.28.0]</dependency>
<dependency>io.opencensus:opencensus-proto:[0.2.0]</dependency>
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
Expand Down

0 comments on commit 6741053

Please sign in to comment.