chore: clean up stale dep refs (#4256)

* chore: clean up stale dep refs Change-Id: Ie3bbb33df4b14e7a4326b147c324dc6a0fddd2d5 * format Change-Id: I15af77d9dd2e093d53ee8173ac53a339fd389c0c * a couple more missing bits Change-Id: I896864e031fa3b582094caac34c34f4163bba1d3
googleapis · Nov 29, 2023 · 0d9ec40 · 0d9ec40
1 parent 26173b3
commit 0d9ec40
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 68 deletions.
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml
@@ -130,7 +130,6 @@ limitations under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>add-source</id>

diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...able-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/...able-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml
@@ -33,10 +33,6 @@ limitations under the License.
     Bigtable/HBase Mirroring Client conforming to HBase API 1.x. Uses hbase-client and shades all dependencies.
   </description>
 
-  <properties>
-    <!-- define a property that can be ignored by renovate -->
-    <hbase1-hadoop-slf4j.version>1.6.1</hbase1-hadoop-slf4j.version>
-  </properties>
 
   <dependencies>
     <!-- Environment deps first -->

diff --git a/...able-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/...able-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml
@@ -33,11 +33,6 @@ limitations under the License.
     Bigtable/HBase Mirroring Client conforming to HBase API 2.x. Uses hbase-client and shades all dependencies.
   </description>
 
-  <properties>
-    <!-- define a property that can be ignored by renovate -->
-    <hbase2-hadoop-slf4j.version>1.7.30</hbase2-hadoop-slf4j.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.hbase</groupId>

diff --git a/.../bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/.../bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml
@@ -83,20 +83,15 @@ limitations under the License.
       <groupId>com.google.api</groupId>
       <artifactId>api-common</artifactId>
       <version>1.10.6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>${guava.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>checker-compat-qual</artifactId>
-      <version>2.5.5</version>
-      <scope>provided</scope>
-    </dependency>
-
+    <!-- deps to be shaded -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>

diff --git a/...ng-client-core/src/main/java/com/google/cloud/bigtable/mirroring/core/MirroringTable.java b/...ng-client-core/src/main/java/com/google/cloud/bigtable/mirroring/core/MirroringTable.java
@@ -80,7 +80,6 @@
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.Service;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * Table which mirrors every two mutations to two underlying tables.
@@ -96,7 +95,7 @@ public class MirroringTable implements Table {
   private static final Predicate<Object> resultIsFaultyPredicate =
       new Predicate<Object>() {
         @Override
-        public boolean apply(@NullableDecl Object o) {
+        public boolean apply(Object o) {
           return o == null || o instanceof Throwable;
         }
       };

diff --git a/.../src/main/java/com/google/cloud/bigtable/mirroring/core/WriteOperationFutureCallback.java b/.../src/main/java/com/google/cloud/bigtable/mirroring/core/WriteOperationFutureCallback.java
@@ -16,7 +16,6 @@
 package com.google.cloud.bigtable.mirroring.core;
 
 import com.google.common.util.concurrent.FutureCallback;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * Write operations do not perform verification, only report failed writes. For this reason callback
@@ -26,7 +25,7 @@
 public abstract class WriteOperationFutureCallback<T> implements FutureCallback<T> {
 
   @Override
-  public final void onSuccess(@NullableDecl T t) {}
+  public final void onSuccess(T t) {}
 
   public abstract void onFailure(Throwable throwable);
 }
diff --git a/...gle/cloud/bigtable/mirroring/core/bufferedmutator/ConcurrentMirroringBufferedMutator.java b/...gle/cloud/bigtable/mirroring/core/bufferedmutator/ConcurrentMirroringBufferedMutator.java
@@ -45,7 +45,6 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
 import org.apache.hadoop.hbase.client.Row;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * {@link MirroringBufferedMutator} implementation that performs writes to primary and secondary
@@ -204,7 +203,7 @@ public void run() {
         this.mirroringTracer.spanFactory.wrapWithCurrentSpan(
             new FutureCallback<Void>() {
               @Override
-              public void onSuccess(@NullableDecl Void aVoid) {
+              public void onSuccess(Void aVoid) {
                 flushFinished.run();
               }
 
@@ -225,7 +224,7 @@ public void onFailure(Throwable throwable) {
         this.mirroringTracer.spanFactory.wrapWithCurrentSpan(
             new FutureCallback<Void>() {
               @Override
-              public void onSuccess(@NullableDecl Void aVoid) {
+              public void onSuccess(Void aVoid) {
                 flushFinished.run();
               }
 

diff --git a/...gle/cloud/bigtable/mirroring/core/bufferedmutator/SequentialMirroringBufferedMutator.java b/...gle/cloud/bigtable/mirroring/core/bufferedmutator/SequentialMirroringBufferedMutator.java
@@ -49,7 +49,6 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
 import org.apache.hadoop.hbase.client.Row;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * {@link MirroringBufferedMutator} implementation that performs mutations on secondary database
@@ -249,7 +248,7 @@ protected FlushFutures scheduleFlushScoped(
         this.mirroringTracer.spanFactory.wrapWithCurrentSpan(
             new FutureCallback<Void>() {
               @Override
-              public void onSuccess(@NullableDecl Void aVoid) {
+              public void onSuccess(Void aVoid) {
                 primaryFlushErrorsReported.set(null);
                 performSecondaryFlush(
                     dataToFlush,

diff --git a/...lient-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/BatchHelpers.java b/...lient-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/BatchHelpers.java
@@ -42,7 +42,6 @@
 import org.apache.hadoop.hbase.client.Row;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 public class BatchHelpers {
   public static FutureCallback<Void> createBatchVerificationCallback(
@@ -55,7 +54,7 @@ public static FutureCallback<Void> createBatchVerificationCallback(
       final MirroringTracer mirroringTracer) {
     return new FutureCallback<Void>() {
       @Override
-      public void onSuccess(@NullableDecl Void t) {
+      public void onSuccess(Void t) {
         // Batch is successful - all results are correct.
         List<? extends Row> secondaryOperations =
             failedAndSuccessfulPrimaryOperations.successfulOperations;

diff --git a/...ing-client-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/Batcher.java b/...ing-client-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/Batcher.java
@@ -50,7 +50,6 @@
 import org.apache.hadoop.hbase.client.Row;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * Helper class that handles logic related to mirroring {@link Table#batch(List, Object[])}
@@ -310,7 +309,7 @@ private ListenableFuture<BatchData> scheduleSecondaryWriteBatchOperations(
     FutureCallback<Void> verificationCallback =
         new FutureCallback<Void>() {
           @Override
-          public void onSuccess(@NullableDecl Void aVoid) {
+          public void onSuccess(Void aVoid) {
             verificationFuture.onSuccess(aVoid);
           }
 
@@ -426,7 +425,7 @@ public ListenableFuture<Void> get() {
     FutureCallback<Void> verification =
         new FutureCallback<Void>() {
           @Override
-          public void onSuccess(@NullableDecl Void result) {}
+          public void onSuccess(Void result) {}
 
           @Override
           public void onFailure(Throwable throwable) {
@@ -438,9 +437,8 @@ public void onFailure(Throwable throwable) {
     // handler.
     Function<Throwable, Void> flowControlReservationErrorConsumer =
         new Function<Throwable, Void>() {
-          @NullableDecl
           @Override
-          public Void apply(@NullableDecl Throwable throwable) {
+          public Void apply(Throwable throwable) {
             flowControllerException[0] = throwable;
             return null;
           }

diff --git a/...-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/RequestScheduling.java b/...-core/src/main/java/com/google/cloud/bigtable/mirroring/core/utils/RequestScheduling.java
@@ -29,7 +29,6 @@
 import com.google.common.util.concurrent.SettableFuture;
 import io.opencensus.common.Scope;
 import java.util.concurrent.ExecutionException;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * Static helper methods used for scheduling secondary database requests and results verification.
@@ -101,7 +100,7 @@ FutureCallback<? super T> wrapCallbackWithReleasingReservationAndCompletingFutur
     return mirroringTracer.spanFactory.wrapWithCurrentSpan(
         new FutureCallback<T>() {
           @Override
-          public void onSuccess(@NullableDecl T t) {
+          public void onSuccess(T t) {
             try {
               Log.trace("starting verification %s", t);
               callback.onSuccess(t);

diff --git a/...com/google/cloud/bigtable/mirroring/core/utils/mirroringmetrics/MirroringSpanFactory.java b/...com/google/cloud/bigtable/mirroring/core/utils/mirroringmetrics/MirroringSpanFactory.java
@@ -40,7 +40,6 @@
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 /**
  * Used to create named spans for tracing (using {@link #tracer}) and recording metrics related to
@@ -74,7 +73,7 @@ public <T> FutureCallback<? super T> wrapWithCurrentSpan(final FutureCallback<T>
     final Span span = getCurrentSpan();
     return new FutureCallback<T>() {
       @Override
-      public void onSuccess(@NullableDecl T t) {
+      public void onSuccess(T t) {
         try (Scope scope = spanAsScope(span)) {
           callback.onSuccess(t);
         }
@@ -152,7 +151,7 @@ public <T> T wrapSecondaryOperation(
   public <T> FutureCallback<T> wrapReadVerificationCallback(final FutureCallback<T> callback) {
     return new FutureCallback<T>() {
       @Override
-      public void onSuccess(@NullableDecl T t) {
+      public void onSuccess(T t) {
         try (Scope scope = MirroringSpanFactory.this.verificationScope()) {
           callback.onSuccess(t);
         }
@@ -175,7 +174,7 @@ public <T> FutureCallback<T> wrapWriteOperationCallback(
     // it.
     return new FutureCallback<T>() {
       @Override
-      public void onSuccess(@NullableDecl T t) {
+      public void onSuccess(T t) {
         mirroringTracer.metricsRecorder.recordSecondaryWriteErrors(operation, 0);
       }
 

diff --git a/...om/google/cloud/bigtable/mirroring/core/verification/VerificationContinuationFactory.java b/...om/google/cloud/bigtable/mirroring/core/verification/VerificationContinuationFactory.java
@@ -25,7 +25,6 @@
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 @InternalApi("For internal usage only")
 public class VerificationContinuationFactory {
@@ -43,7 +42,7 @@ public MismatchDetector getMismatchDetector() {
   public FutureCallback<Boolean> exists(final Get request, final boolean expectation) {
     return new FutureCallback<Boolean>() {
       @Override
-      public void onSuccess(@NullableDecl Boolean secondary) {
+      public void onSuccess(Boolean secondary) {
         Log.trace("verification onSuccess exists(Get)");
         VerificationContinuationFactory.this.mismatchDetector.exists(
             request, expectation, secondary);
@@ -60,7 +59,7 @@ public void onFailure(Throwable throwable) {
   public FutureCallback<boolean[]> existsAll(final List<Get> request, final boolean[] expectation) {
     return new FutureCallback<boolean[]>() {
       @Override
-      public void onSuccess(@NullableDecl boolean[] secondary) {
+      public void onSuccess(boolean[] secondary) {
         Log.trace("verification onSuccess existsAll(List<Get>)");
         VerificationContinuationFactory.this.mismatchDetector.existsAll(
             request, expectation, secondary);
@@ -77,7 +76,7 @@ public void onFailure(Throwable throwable) {
   public FutureCallback<Result> get(final Get request, final Result expectation) {
     return new FutureCallback<Result>() {
       @Override
-      public void onSuccess(@NullableDecl Result secondary) {
+      public void onSuccess(Result secondary) {
         Log.trace("verification onSuccess get(Get)");
         VerificationContinuationFactory.this.mismatchDetector.get(request, expectation, secondary);
       }
@@ -93,7 +92,7 @@ public void onFailure(Throwable throwable) {
   public FutureCallback<Result[]> get(final List<Get> request, final Result[] expectation) {
     return new FutureCallback<Result[]>() {
       @Override
-      public void onSuccess(@NullableDecl Result[] secondary) {
+      public void onSuccess(Result[] secondary) {
         Log.trace("verification onSuccess get(List<Get>)");
         VerificationContinuationFactory.this.mismatchDetector.get(request, expectation, secondary);
       }
@@ -122,7 +121,7 @@ public FutureCallback<Void> scannerNext(
       final MismatchDetector.ScannerResultVerifier unmatched) {
     return new FutureCallback<Void>() {
       @Override
-      public void onSuccess(@NullableDecl Void ignored) {
+      public void onSuccess(Void ignored) {
         synchronized (verificationLock) {
           AsyncScannerVerificationPayload results = resultQueue.remove();
           Log.trace("verification onSuccess scannerNext(Scan, int)");

diff --git a/...re/src/test/java/com/google/cloud/bigtable/mirroring/core/TestMirroringResultScanner.java b/...re/src/test/java/com/google/cloud/bigtable/mirroring/core/TestMirroringResultScanner.java
@@ -56,7 +56,6 @@
 import java.util.concurrent.TimeoutException;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.function.ThrowingRunnable;
@@ -279,8 +278,7 @@ private FutureCallback<AsyncScannerVerificationPayload> addContextToListCallback
       final List<ScannerRequestContext> list) {
     return new FutureCallback<AsyncScannerVerificationPayload>() {
       @Override
-      public void onSuccess(
-          @NullableDecl AsyncScannerVerificationPayload asyncScannerVerificationPayload) {
+      public void onSuccess(AsyncScannerVerificationPayload asyncScannerVerificationPayload) {
         list.add(asyncScannerVerificationPayload.context);
       }
 

diff --git a/renovate.json5 b/renovate.json5
@@ -55,7 +55,11 @@
         "^junit:junit",
         "^com.google.truth:truth",
         "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis"
+        "^org.objenesis:objenesis",
+        "^truth.version",
+        "^junit.version",
+        "^hamcrest.version",
+        "^mockito.version"
       ],
       "semanticCommitType": "test",
       "semanticCommitScope": "deps"
@@ -72,24 +76,6 @@
       ],
       "groupName": "jackson dependencies"
     },
-    {
-      // pin to beam deps
-      "packagePatterns": ["^beam-slf4j.version"],
-      "enabled": false
-    },
-    {
-      // pin to hbase deps
-      "packagePatterns": [
-        "^hbase.-hadoop-slf4j.version",
-        "^hbase.-mapreduce-slfj.version"
-      ],
-      "enabled": false
-    },
-    {
-      // pin to bigtable version
-      "packagePatterns": ["^grpc-conscrypt.version"],
-      "enabled": false
-    },
     {
       // pinned to avoid internal deps conflict between beam-sdks-java-core & beam-model-pipeline
       "packagePatterns": ["^error_prone_annotations"],
@@ -107,6 +93,7 @@
         "^com.google.cloud:google-cloud-bigtable",
         "^com.google.cloud:google-cloud-bigtable-emulator-core",
         "^com.google.cloud:google-cloud-bigtable-emulator",
+        "^com.google.cloud:google-cloud-shared-config",
       ],
       "groupName": "google-cloud-bigtable dependencies"
     }