From f40496c920025395fb89188d2769f0bfe926a1ed Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Mon, 29 Aug 2022 13:21:35 -0400 Subject: [PATCH] deps: upgrade bigtable.version to 2.11.1 (#3761) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update bigtable.version to 2.11.0 * deps fixes * upgrade veneer to 2.11.1 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix tests Co-authored-by: Owl Bot --- .../bigtable-beam-import/pom.xml | 6 +++ .../bigtable-hbase-beam/pom.xml | 7 ++++ .../bigtable-hbase-1.x-mapreduce/pom.xml | 4 +- .../mapreduce/BigtableEmulatorRule.java | 38 +++++++++++++++++++ .../mapreduce/hbasesnapshots/EndToEndIT.java | 4 +- .../validation/TestValidationEndToEndIT.java | 5 +-- .../bigtable-hbase-1.x-replication/pom.xml | 12 +----- .../replication/BigtableEmulatorRule.java | 38 +++++++++++++++++++ ...BigtableReplicationEndpointDryRunTest.java | 4 +- ...oCloudBigtableReplicationEndpointTest.java | 4 +- .../bigtable-hbase-2.x-replication/pom.xml | 12 +----- .../replication/BigtableEmulatorRule.java | 38 +++++++++++++++++++ ...BigtableReplicationEndpointDryRunTest.java | 4 +- ...oCloudBigtableReplicationEndpointTest.java | 4 +- pom.xml | 4 +- 15 files changed, 143 insertions(+), 41 deletions(-) create mode 100644 bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/src/test/java/com/google/cloud/bigtable/mapreduce/BigtableEmulatorRule.java create mode 100644 hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/BigtableEmulatorRule.java create mode 100644 hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/BigtableEmulatorRule.java diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index c0bf0b0d25..52bcef6097 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -161,6 +161,12 @@ limitations under the License. hbase-shaded-client + + + org.conscrypt + conscrypt-openjdk-uber + + + + org.conscrypt + conscrypt-openjdk-uber + + - - * - * - - org.mockito diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/BigtableEmulatorRule.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/BigtableEmulatorRule.java new file mode 100644 index 0000000000..9271ecd1fa --- /dev/null +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/BigtableEmulatorRule.java @@ -0,0 +1,38 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.bigtable.hbase1_x.replication; + +import com.google.cloud.bigtable.emulator.core.EmulatorController; +import org.junit.rules.ExternalResource; + +public class BigtableEmulatorRule extends ExternalResource { + private EmulatorController emulatorController; + + @Override + protected void before() throws Throwable { + emulatorController = EmulatorController.createBundled(); + emulatorController.start(); + } + + @Override + protected void after() { + emulatorController.stop(); + } + + public int getPort() { + return emulatorController.getPort(); + } +} diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java index 442ef374c4..656df39bbb 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertFalse; -import com.google.cloud.bigtable.emulator.v2.BigtableEmulatorRule; import com.google.cloud.bigtable.hbase.BigtableConfiguration; import com.google.cloud.bigtable.hbase.replication.configuration.HBaseToCloudBigtableReplicationConfiguration; import com.google.cloud.bigtable.hbase.replication.utils.TestUtils; @@ -57,8 +56,7 @@ public class HbaseToCloudBigtableReplicationEndpointDryRunTest { private static HBaseTestingUtility hbaseTestingUtil = new HBaseTestingUtility(); private static ReplicationAdmin replicationAdmin; - @ClassRule - public static final BigtableEmulatorRule bigtableEmulator = BigtableEmulatorRule.create(); + @ClassRule public static final BigtableEmulatorRule bigtableEmulator = new BigtableEmulatorRule(); private static Connection cbtConnection; private static Connection hbaseConnection; diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java index 29022d65cb..b47efdf6a4 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/src/test/java/com/google/cloud/bigtable/hbase1_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java @@ -21,7 +21,6 @@ import static com.google.cloud.bigtable.hbase.replication.utils.TestUtils.ROW_KEY; import static com.google.cloud.bigtable.hbase.replication.utils.TestUtils.assertEquals; -import com.google.cloud.bigtable.emulator.v2.BigtableEmulatorRule; import com.google.cloud.bigtable.hbase.BigtableConfiguration; import com.google.cloud.bigtable.hbase.replication.utils.TestUtils; import java.io.IOException; @@ -111,8 +110,7 @@ public Entry filter(Entry entry) { private static HBaseTestingUtility hbaseTestingUtil = new HBaseTestingUtility(); private static ReplicationAdmin replicationAdmin; - @ClassRule - public static final BigtableEmulatorRule bigtableEmulator = BigtableEmulatorRule.create(); + @ClassRule public static final BigtableEmulatorRule bigtableEmulator = new BigtableEmulatorRule(); private static Connection cbtConnection; private static Connection hbaseConnection; diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index 6eddb903f6..c9f2a99656 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -207,17 +207,9 @@ limitations under the License. com.google.cloud - google-cloud-bigtable-emulator - 0.144.0 + google-cloud-bigtable-emulator-core + 0.148.0 test - - - - * - * - - diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/BigtableEmulatorRule.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/BigtableEmulatorRule.java new file mode 100644 index 0000000000..dc465bc622 --- /dev/null +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/BigtableEmulatorRule.java @@ -0,0 +1,38 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.bigtable.hbase2_x.replication; + +import com.google.cloud.bigtable.emulator.core.EmulatorController; +import org.junit.rules.ExternalResource; + +public class BigtableEmulatorRule extends ExternalResource { + private EmulatorController emulatorController; + + @Override + protected void before() throws Throwable { + emulatorController = EmulatorController.createBundled(); + emulatorController.start(); + } + + @Override + protected void after() { + emulatorController.stop(); + } + + public int getPort() { + return emulatorController.getPort(); + } +} diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java index 4c8d4bc660..9ff273e6bd 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointDryRunTest.java @@ -19,7 +19,6 @@ import static com.google.cloud.bigtable.hbase.replication.configuration.HBaseToCloudBigtableReplicationConfiguration.ENABLE_DRY_RUN_MODE_KEY; import static org.junit.Assert.assertFalse; -import com.google.cloud.bigtable.emulator.v2.BigtableEmulatorRule; import com.google.cloud.bigtable.hbase.BigtableConfiguration; import com.google.cloud.bigtable.hbase.replication.utils.TestUtils; import java.io.IOException; @@ -57,8 +56,7 @@ public class HbaseToCloudBigtableReplicationEndpointDryRunTest { private static HBaseTestingUtility hbaseTestingUtil = new HBaseTestingUtility(); private static ReplicationAdmin replicationAdmin; - @ClassRule - public static final BigtableEmulatorRule bigtableEmulator = BigtableEmulatorRule.create(); + @ClassRule public static final BigtableEmulatorRule bigtableEmulator = new BigtableEmulatorRule(); private static Connection cbtConnection; private static Connection hbaseConnection; diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java index bb860f5beb..cea2e7bc72 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/src/test/java/com/google/cloud/bigtable/hbase2_x/replication/HbaseToCloudBigtableReplicationEndpointTest.java @@ -21,7 +21,6 @@ import static com.google.cloud.bigtable.hbase.replication.utils.TestUtils.FILTERED_ROW_KEY; import static com.google.cloud.bigtable.hbase.replication.utils.TestUtils.ROW_KEY; -import com.google.cloud.bigtable.emulator.v2.BigtableEmulatorRule; import com.google.cloud.bigtable.hbase.BigtableConfiguration; import com.google.cloud.bigtable.hbase.replication.utils.TestUtils; import java.io.IOException; @@ -111,8 +110,7 @@ public Entry filter(Entry entry) { private static HBaseTestingUtility hbaseTestingUtil = new HBaseTestingUtility(); private static ReplicationAdmin replicationAdmin; - @ClassRule - public static final BigtableEmulatorRule bigtableEmulator = BigtableEmulatorRule.create(); + @ClassRule public static final BigtableEmulatorRule bigtableEmulator = new BigtableEmulatorRule(); private static Connection cbtConnection; private static Connection hbaseConnection; diff --git a/pom.xml b/pom.xml index 6067c7c6b1..60deaa9151 100644 --- a/pom.xml +++ b/pom.xml @@ -56,9 +56,9 @@ limitations under the License. UTF-8 - 2.9.0 + 2.11.1 1.27.1 - 2.5.1 + 2.5.2 1.7.25 1.2