deps: update veneer to 2.16.0 (#3855)

* deps: update veneer to 2.15.1 * deps: update veneer to 2.16.0 * fix deps, beam integration, and integration migration builds * cleanup * use variable * review feedback

Author: kolea2

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

@@ -64,6 +64,7 @@ limitations under the License.
  <artifactId>*</artifactId>
  </exclusion>
  </exclusions>
+ <scope>test</scope>
  </dependency>
 
  <dependency>

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

@@ -59,6 +59,7 @@ limitations under the License.
  <artifactId>gcs-connector</artifactId>
  <version>hadoop2-2.2.2</version>
  <classifier>shaded</classifier>
+ <scope>runtime</scope>
  </dependency>
  <dependency>
  <groupId>org.apache.beam</groupId>
@@ -514,7 +515,7 @@ limitations under the License.
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M4</version>
+ <version>3.0.0-M7</version>
  <executions>
  <execution>
  <id>beam-integration-test</id>

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

@@ -71,6 +71,11 @@ limitations under the License.
  <groupId>org.hamcrest</groupId>
  <artifactId>hamcrest</artifactId>
  </exclusion>
+ <!-- we set our own version of hadoop, excluding to avoid dependency conflicts-->
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
  </exclusions>
  </dependency>
 
@@ -326,6 +331,16 @@ limitations under the License.
  </execution>
  </executions>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredNonTestScopedDependencies>
+ <!-- required per verify-mirror-deps-->
+ <ignoredNonTestScopedDependency>com.google.code.findbugs:jsr305:*</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
+ </configuration>
+ </plugin>
  </plugins>
  </build>
 </project>

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

@@ -62,11 +62,6 @@
  </exclusion>
  </exclusions>
  </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
  <dependency>
  <groupId>com.google.code.findbugs</groupId>
  <artifactId>jsr305</artifactId>
@@ -89,6 +84,13 @@
  <version>1.2.11</version>
  <scope>runtime</scope>
  </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <!-- todo: align guava deps - we use repackaged guava in the main classes-->
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.mockito</groupId>
  <artifactId>mockito-core</artifactId>

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

@@ -202,4 +202,27 @@ limitations under the License.
  <scope>test</scope>
  </dependency>
  </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <ignoredNonTestScopedDependencies>
+ <!-- Temporarily disable dependency plugin until we figure out why it thinks compile deps like google-cloud-bigtable are unused
+ For example:
+ [WARNING] Non-test scoped test only dependencies found:
+ [WARNING] com.google.cloud:google-cloud-bigtable:jar:2.16.0:compile
+ ...
+
+ Same problem exists in bigtable-hbase-2.x
+ -->
+ <ignoredNonTestScopedDependency>*</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
 </project>

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

@@ -185,6 +185,18 @@ limitations under the License.
  </dependencies>
  <build>
  <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <ignoredNonTestScopedDependencies>
+ <!-- Temporarily disable dependency plugin until we figure out why it thinks compile deps like google-cloud-bigtable are unused
+ See bigtable-hbase-1.x pom.xml for more details-->
+ <ignoredNonTestScopedDependency>*</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
+ </configuration>
+ </plugin>
  <plugin>
  <!-- skip for bigtable-hbase to allow for upcoming refactoring-->
  <groupId>org.codehaus.mojo</groupId>

hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml

@@ -295,6 +295,13 @@ limitations under the License.
  <version>1.9.1</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit-vintage-engine.version}</version>
+ <scope>test</scope>
+ </dependency>
+
  <dependency>
  <groupId>com.google.truth</groupId>
  <artifactId>truth</artifactId>

hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml

@@ -280,6 +280,13 @@ limitations under the License.
  <scope>test</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit-vintage-engine.version}</version>
+ <scope>test</scope>
+ </dependency>
+
  <dependency>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-launcher</artifactId>

hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml

@@ -285,6 +285,13 @@ limitations under the License.
  <scope>test</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit-vintage-engine.version}</version>
+ <scope>test</scope>
+ </dependency>
+
  <dependency>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-launcher</artifactId>

pom.xml

@@ -33,7 +33,7 @@ limitations under the License.
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-shared-config</artifactId>
- <version>1.3.2</version>
+ <version>1.5.4</version>
  </parent>
 
  <licenses>
@@ -56,7 +56,7 @@ limitations under the License.
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
  <!-- core dependency versions -->
- <bigtable.version>2.14.1</bigtable.version>
+ <bigtable.version>2.16.0</bigtable.version>
  <bigtable-client-core.version>1.27.1</bigtable-client-core.version>
  <grpc-conscrypt.version>2.5.2</grpc-conscrypt.version>
  <!-- keeping at this version to align with hbase-->
@@ -76,6 +76,7 @@ limitations under the License.
  <!-- testing dependency versions -->
  <commons-lang.version>2.6</commons-lang.version>
  <junit.version>4.13.2</junit.version>
+ <junit-vintage-engine.version>5.9.1</junit-vintage-engine.version>
  <hamcrest.version>1.3</hamcrest.version>
  <mockito.version>4.9.0</mockito.version>
  <!-- TODO: check if commons-codec was transitively updated to 1.13 and okhttp was updated to 2.7.5 when upgrading-->