deps: beam 2.33.0 (#3314)

* deps: upgrade beam to 2.32.0 * update storage version * test * test * beam to 2.33.0 * gcsio * gcsio * gcsio * gcsio * 2.32.0 * 2.33.0 * gcsio * fix deps * revert hamcrest * move gcs-connector * revert move * revert

Author: kolea2

bigtable-dataflow-parent/bigtable-beam-import/pom.xml

@@ -54,6 +54,12 @@ limitations under the License.
  <groupId>org.apache.beam</groupId>
  <artifactId>beam-sdks-java-core</artifactId>
  </dependency>
+ <dependency>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ <version>hadoop2-2.2.2</version>
+ <classifier>shaded</classifier>
+ </dependency>
  <dependency>
  <groupId>org.apache.beam</groupId>
  <artifactId>
@@ -78,6 +84,10 @@ limitations under the License.
  <exclusion>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
  </exclusion>
  <exclusion>
  <groupId>org.hamcrest</groupId>
@@ -181,12 +191,6 @@ limitations under the License.
  <artifactId>hbase-shaded-server</artifactId>
  <version>${hbase1.version}</version>
  </dependency>
- <dependency>
- <groupId>com.google.cloud.bigdataoss</groupId>
- <artifactId>gcs-connector</artifactId>
- <version>hadoop2-2.1.4</version>
- <classifier>shaded</classifier>
- </dependency>
 
 
  <!-- Misc Group -->

bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml

@@ -44,6 +44,12 @@ limitations under the License.
  <groupId>org.apache.beam</groupId>
  <artifactId>beam-sdks-java-core</artifactId>
  <version>${beam.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
 
  <dependency>
@@ -61,6 +67,10 @@ limitations under the License.
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-log4j12</artifactId>
  </exclusion>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ </exclusion>
  </exclusions>
  </dependency>
 

pom.xml

@@ -74,7 +74,7 @@ limitations under the License.
  <hamcrest.version>1.3</hamcrest.version>
  <mockito.version>4.0.0</mockito.version>
  <!-- TODO: check if commons-codec was transitively updated to 1.13 and okhttp was updated to 2.7.5 when upgrading-->
- <beam.version>2.30.0</beam.version>
+ <beam.version>2.33.0</beam.version>
  <!-- referred from bigtable-beam-import and bigtable-emulator -->
  <guava.version>31.0.1-jre</guava.version>
  <gcs-guava.version>29.0-jre</gcs-guava.version>