Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 19 additions & 52 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>io.cdap.plugin</groupId>
<artifactId>google-cloud</artifactId>
<version>0.24.7</version>
<version>0.24.8-SNAPSHOT</version>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please split this into separate PR to decouple for rollback.

<name>Google Cloud Plugins</name>
<packaging>jar</packaging>
<description>Plugins for Google Big Query</description>
Expand Down Expand Up @@ -66,7 +66,7 @@
<dropwizard.metrics-core.version>3.2.6</dropwizard.metrics-core.version>
<flogger.system.backend.version>0.7.1</flogger.system.backend.version>
<gcs.connector.version>hadoop3-2.2.21</gcs.connector.version>
<google.cloud.bigtable.version>1.17.1</google.cloud.bigtable.version>
<google.cloud.bigtable.version>2.18.3</google.cloud.bigtable.version>
Comment thread
sahusanket marked this conversation as resolved.
Resolved
<google.cloud.bigquery.version>1.137.1</google.cloud.bigquery.version>
<google.cloud.kms.version>2.0.2</google.cloud.kms.version>
<google.cloud.pubsub.version>1.108.1</google.cloud.pubsub.version>
Expand All @@ -78,8 +78,7 @@
<google.tink.version>1.3.0-rc3</google.tink.version>
<guava.version>27.0.1-jre</guava.version>
<hadoop.version>3.3.6</hadoop.version>
<hbase-shaded-client.version>1.4.13</hbase-shaded-client.version>
<hbase-shaded-server.version>1.4.13</hbase-shaded-server.version>
<hbase-shaded-mapreduce.version>2.6.6-hadoop3</hbase-shaded-mapreduce.version>
<httpclient.version>4.5.13</httpclient.version>
<jackson.core.version>2.13.4.2</jackson.core.version>
<junit.version>4.13.1</junit.version>
Expand Down Expand Up @@ -351,27 +350,12 @@
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-mapreduce</artifactId>
<artifactId>bigtable-hbase-2.x-hadoop</artifactId>
<version>${google.cloud.bigtable.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-annotations</artifactId>
</exclusion>
<!-- bigtable-hbase-1.x-mapreduce version 1.17.1 has a dependency on hbase-common:1.4.12
which masks the shaded dependencies below . Exclude this dependency.
All the classes should be present in the shaded jars-->
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -461,38 +445,18 @@
</dependency>
<dependency>
<!--
Required by bigtable-hbase-1.x-mapreduce instead of excluded non-shaded version.
Shaded library is used to avoid dependency conflicts with Datastore module on profobuf-java dependency.
Bigtable requires version 2.x and Datastore module requires 3.x protocol.
Required by bigtable-hbase-2.x-hadoop instead of excluded non-shaded version.
Shaded library is used to avoid dependency conflicts with Datastore module on protobuf-java dependency,
while excluding bundled Hadoop classes so the platform Hadoop 3.3.6 is used.
-->
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
<version>${hbase-shaded-client.version}</version>
<artifactId>hbase-shaded-mapreduce</artifactId>
<version>${hbase-shaded-mapreduce.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!--
Required by bigtable-hbase-1.x-mapreduce instead of excluded non-shaded version.
Shaded library is used to avoid dependency conflicts with Datastore module on profobuf-java dependency.
Bigtable requires version 2.x and Datastore module requires 3.x protocol.
-->
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-server</artifactId>
<version>${hbase-shaded-server.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand All @@ -505,10 +469,6 @@
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -901,6 +861,13 @@
<artifactId>proto-google-common-protos</artifactId>
<version>2.8.3</version>
</dependency>
<!-- Required at runtime by io.grpc:grpc-core, which declares perfmark-api at runtime scope
while maven-bundle-plugin only embeds compile-scope dependencies into lib/. -->
<dependency>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
<version>0.23.0</version>
</dependency>
</dependencies>

<build>
Expand Down
Loading