Label classes to delete after migration - Batch 1 (#1460)

* Label classes to delete after migration - Batch 1

* Format Fix

build.gradle

@@ -20,6 +20,9 @@ buildscript {
     // Lock buildscript dependencies.
     configurations.classpath {
       resolutionStrategy.activateDependencyLocking()
+
+      // See java_common.gradle for explanation.
+      exclude group: 'org.apache.logging.log4j'
     }
   }
 

core/src/main/java/google/registry/backup/BackupUtils.java

@@ -21,6 +21,7 @@ import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableList;
 import com.google.storage.onestore.v3.OnestoreEntity.EntityProto;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,6 +29,7 @@ import java.io.OutputStream;
 import java.util.Iterator;
 
 /** Utilities for working with backups. */
+@DeleteAfterMigration
 public class BackupUtils {
 
   /** Keys for user metadata fields on commit log files in GCS. */

core/src/main/java/google/registry/backup/CommitLogCheckpointAction.java

@@ -22,6 +22,7 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.flogger.FluentLogger;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogCheckpointRoot;
 import google.registry.request.Action;
@@ -48,6 +49,7 @@ import org.joda.time.DateTime;
     method = Action.Method.GET,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public final class CommitLogCheckpointAction implements Runnable {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();

core/src/main/java/google/registry/backup/CommitLogCheckpointStrategy.java

@@ -23,6 +23,7 @@ import static google.registry.util.DateTimeUtils.earliestOf;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.googlecode.objectify.Key;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogManifest;
@@ -36,14 +37,14 @@ import org.joda.time.DateTime;
 /**
  * Implementation of the procedure for determining point-in-time consistent commit log checkpoint.
  *
- * <p>This algorithm examines the recently written commit log data and uses a dual-read approach
- * to determine a point-in-time consistent set of checkpoint times for the commit log buckets.  By
+ * <p>This algorithm examines the recently written commit log data and uses a dual-read approach to
+ * determine a point-in-time consistent set of checkpoint times for the commit log buckets. By
  * "consistent" we mean, generally speaking, that if the Datastore were restored by replaying all
  * the commit logs up to the checkpoint times of the buckets, the result would be transactionally
  * correct; there must be no "holes" where restored state depends on non-restored state.
  *
  * <p>The consistency guarantee really has two parts, only one of which is provided by this
- * algorithm.  The procedure below guarantees only that if the resulting checkpoint includes any
+ * algorithm. The procedure below guarantees only that if the resulting checkpoint includes any
  * given commit log, it will also include all the commit logs that were both 1) actually written
  * before that commit log "in real life", and 2) have an earlier timestamp than that commit log.
  * (These criteria do not necessarily imply each other, due to the lack of a global shared clock.)
@@ -51,8 +52,8 @@ import org.joda.time.DateTime;
  * that depends on state from a previous transaction does indeed have a later timestamp.
  *
  * <h2>Procedure description</h2>
- * <pre>
- * {@code
+ *
+ * <pre>{@code
  * ComputeCheckpoint() -> returns a set consisting of a timestamp c(b_i) for every bucket b_i
  *
  * 1) read off the latest commit timestamp t(b_i) for every bucket b_i
@@ -63,35 +64,29 @@ import org.joda.time.DateTime;
  *   a) if S is empty, let T* = +∞ (or the "end of time")
  *   b) else, let T* = T - Δ, for T = min(S) and some small Δ > 0
  * 4) return the set given by: min(t(b_i), T*) for all b_i
- * }
- * </pre>
+ * }</pre>
  *
  * <h2>Correctness proof of algorithm</h2>
  *
- * <p>{@literal
- * As described above, the algorithm is correct as long as it can ensure the following: given a
- * commit log X written at time t(X) to bucket b_x, and another commit log Y that was written "in
- * real life" before X and for which t(Y) < t(X), then if X is included in the checkpoint, so is Y;
- * that is, t(X) <= c(b_x) implies t(Y) <= c(b_y).
- * }
+ * <p>{@literal As described above, the algorithm is correct as long as it can ensure the following:
+ * given a commit log X written at time t(X) to bucket b_x, and another commit log Y that was
+ * written "in real life" before X and for which t(Y) < t(X), then if X is included in the
+ * checkpoint, so is Y; that is, t(X) <= c(b_x) implies t(Y) <= c(b_y). }
  *
- * <p>{@literal
- * To prove this, first note that we always have c(b_i) <= t(b_i) for every b_i, i.e. every commit
- * log included in the checkpoint must have been seen in the first pass.  Hence if X was included,
- * then X must have been written by the time we started the second pass.  But since Y was written
- * "in real life" prior to X, we must have seen Y by the second pass too.
- * }
+ * <p>{@literal To prove this, first note that we always have c(b_i) <= t(b_i) for every b_i, i.e.
+ * every commit log included in the checkpoint must have been seen in the first pass. Hence if X was
+ * included, then X must have been written by the time we started the second pass. But since Y was
+ * written "in real life" prior to X, we must have seen Y by the second pass too. }
  *
- * <p>{@literal
- * Now assume towards a contradiction that X is indeed included but Y is not, i.e. that we have
- * t(X) <= c(b_x) but t(Y) > c(b_y).  If Y was seen in the first pass, i.e. t(Y) <= t(b_y), then by
- * our assumption c(b_y) < t(Y) <= t(b_y), and therefore c(b_y) != t(b_y).  By the definition of
- * c(b_y) it must then equal T*, so we have T* < t(Y).  However, this is a contradiction since
- * t(Y) < t(X) and t(X) <= c(b_x) <= T*.  If instead Y was seen in the second pass but not the
- * first, t'(b_y) exists and we must have t'(b_y) <= t(Y), but then since T* < T <= t'(b_y) by
- * definition, we again reach the contradiction T* < t(Y).
- * }
+ * <p>{@literal Now assume towards a contradiction that X is indeed included but Y is not, i.e. that
+ * we have t(X) <= c(b_x) but t(Y) > c(b_y). If Y was seen in the first pass, i.e. t(Y) <= t(b_y),
+ * then by our assumption c(b_y) < t(Y) <= t(b_y), and therefore c(b_y) != t(b_y). By the definition
+ * of c(b_y) it must then equal T*, so we have T* < t(Y). However, this is a contradiction since
+ * t(Y) < t(X) and t(X) <= c(b_x) <= T*. If instead Y was seen in the second pass but not the first,
+ * t'(b_y) exists and we must have t'(b_y) <= t(Y), but then since T* < T <= t'(b_y) by definition,
+ * we again reach the contradiction T* < t(Y). }
  */
+@DeleteAfterMigration
 class CommitLogCheckpointStrategy {
 
   @Inject Ofy ofy;

core/src/main/java/google/registry/backup/CommitLogImports.java

@@ -20,6 +20,7 @@ import static google.registry.backup.BackupUtils.createDeserializingIterator;
 
 import com.google.common.collect.ImmutableList;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
@@ -38,6 +39,7 @@ import java.util.Iterator;
  * <p>This class is adapted from {@link RestoreCommitLogsAction}, and will be used in the initial
  * population of the Cloud SQL database.
  */
+@DeleteAfterMigration
 public final class CommitLogImports {
 
   private CommitLogImports() {}

core/src/main/java/google/registry/backup/DeleteOldCommitLogsAction.java

@@ -35,6 +35,7 @@ import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.CommitLogManifestInput;
 import google.registry.mapreduce.inputs.EppResourceInputs;
 import google.registry.model.EppResource;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
 import google.registry.model.translators.CommitLogRevisionsTranslatorFactory;
@@ -68,6 +69,7 @@ import org.joda.time.Duration;
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
 // No longer needed in SQL. Subject to future removal.
 @Deprecated
+@DeleteAfterMigration
 public final class DeleteOldCommitLogsAction implements Runnable {
 
   private static final int NUM_MAP_SHARDS = 20;

core/src/main/java/google/registry/backup/EntityImports.java

@@ -20,10 +20,12 @@ import com.google.storage.onestore.v3.OnestoreEntity.EntityProto;
 import com.google.storage.onestore.v3.OnestoreEntity.Path;
 import com.google.storage.onestore.v3.OnestoreEntity.Property.Meaning;
 import com.google.storage.onestore.v3.OnestoreEntity.PropertyValue.ReferenceValue;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 /** Utilities for handling imported Datastore entities. */
+@DeleteAfterMigration
 public class EntityImports {
 
   /**

core/src/main/java/google/registry/backup/ExportCommitLogDiffAction.java

@@ -40,6 +40,7 @@ import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.gcs.GcsUtils;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogManifest;
@@ -63,6 +64,7 @@ import org.joda.time.DateTime;
     method = Action.Method.POST,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public final class ExportCommitLogDiffAction implements Runnable {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();

core/src/main/java/google/registry/backup/GcsDiffFileLister.java

@@ -33,6 +33,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import google.registry.backup.BackupModule.Backups;
 import google.registry.gcs.GcsUtils;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Map;
@@ -44,6 +45,7 @@ import javax.inject.Provider;
 import org.joda.time.DateTime;
 
 /** Utility class to list commit logs diff files stored on GCS. */
+@DeleteAfterMigration
 class GcsDiffFileLister {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@@ -91,7 +93,7 @@ class GcsDiffFileLister {
 
         // If we hit a gap, quit.
         if (blobInfo == null) {
-          logger.atInfo().log(
+          logger.atWarning().log(
               "Gap discovered in sequence terminating at %s, missing file: %s",
               sequence.lastKey(), filename);
           logger.atInfo().log("Found sequence from %s to %s.", checkpointTime, lastTime);
@@ -167,6 +169,10 @@ class GcsDiffFileLister {
             break;
           }
           if (!sequence.containsKey(key)) {
+            // Recalculate the sequence for purely informational purposes.
+            logger.atWarning().log(
+                "Fork found in commit log history.  The following sequence "
+                    + "is disconnected from the sequence of the final commit:");
             constructDiffSequence(gcsBucket, upperBoundTimesToBlobInfo, fromTime, key, sequence);
             checkForMoreExtraDiffs = true;
             inconsistentFileSet = true;

core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java

@@ -34,6 +34,7 @@ import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.gcs.GcsUtils;
 import google.registry.model.UpdateAutoTimestamp;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.common.DatabaseMigrationStateSchedule;
 import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState;
 import google.registry.model.common.DatabaseMigrationStateSchedule.ReplayDirection;
@@ -68,6 +69,7 @@ import org.joda.time.Seconds;
     method = Method.POST,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class ReplayCommitLogsToSqlAction implements Runnable {
 
   static final String PATH = "/_dr/task/replayCommitLogsToSql";

core/src/main/java/google/registry/backup/RestoreCommitLogsAction.java

@@ -37,6 +37,7 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryEnvironment;
 import google.registry.gcs.GcsUtils;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogCheckpointRoot;
@@ -64,6 +65,7 @@ import org.joda.time.DateTime;
     method = Action.Method.POST,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class RestoreCommitLogsAction implements Runnable {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();

core/src/main/java/google/registry/backup/VersionedEntity.java

@@ -19,6 +19,7 @@ import com.google.appengine.api.datastore.EntityTranslator;
 import com.google.appengine.api.datastore.Key;
 import com.google.auto.value.AutoValue;
 import com.google.auto.value.extension.memoized.Memoized;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
 import java.io.Serializable;
@@ -76,6 +77,7 @@ import javax.annotation.Nullable;
  * property type in this class.
  */
 @AutoValue
+@DeleteAfterMigration
 public abstract class VersionedEntity implements Serializable {
 
   private static final long serialVersionUID = 1L;

core/src/main/java/google/registry/batch/DeleteContactsAndHostsAction.java

@@ -73,6 +73,7 @@ import google.registry.mapreduce.inputs.EppResourceInputs;
 import google.registry.mapreduce.inputs.NullInput;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
@@ -114,6 +115,7 @@ import org.joda.time.Duration;
     service = Action.Service.BACKEND,
     path = "/_dr/task/deleteContactsAndHosts",
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class DeleteContactsAndHostsAction implements Runnable {
 
   static final String KIND_CONTACT = getKind(ContactResource.class);

core/src/main/java/google/registry/batch/ResaveAllEppResourcesAction.java

@@ -24,6 +24,7 @@ import com.googlecode.objectify.Key;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.EppResourceInputs;
 import google.registry.model.EppResource;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
@@ -56,6 +57,7 @@ import javax.inject.Inject;
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
 // No longer needed in SQL. Subject to future removal.
 @Deprecated
+@DeleteAfterMigration
 public class ResaveAllEppResourcesAction implements Runnable {
 
   @Inject MapreduceRunner mrRunner;

core/src/main/java/google/registry/batch/WipeoutDatastoreAction.java

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryEnvironment;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
@@ -45,6 +46,7 @@ import javax.inject.Inject;
     service = Action.Service.BACKEND,
     path = "/_dr/task/wipeOutDatastore",
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class WipeoutDatastoreAction implements Runnable {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 

core/src/main/java/google/registry/beam/comparedb/DatastoreSnapshots.java

@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.backup.VersionedEntity;
 import google.registry.beam.initsql.Transforms;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.common.Cursor;
 import google.registry.model.contact.ContactHistory;
@@ -51,6 +52,7 @@ import org.apache.beam.sdk.values.TupleTagList;
 import org.joda.time.DateTime;
 
 /** Utilities for loading Datastore snapshots. */
+@DeleteAfterMigration
 public final class DatastoreSnapshots {
 
   private DatastoreSnapshots() {}

core/src/main/java/google/registry/beam/comparedb/LatestDatastoreSnapshotFinder.java

@@ -24,6 +24,7 @@ import google.registry.config.RegistryConfig;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.gcs.GcsUtils;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.util.Clock;
 import google.registry.util.UtilsModule;
 import java.io.IOException;
@@ -37,6 +38,7 @@ import org.joda.time.Instant;
 import org.joda.time.Interval;
 
 /** Finds the necessary information for loading the most recent Datastore snapshot. */
+@DeleteAfterMigration
 public class LatestDatastoreSnapshotFinder {
   private final String projectId;
   private final GcsUtils gcsUtils;

core/src/main/java/google/registry/beam/comparedb/SqlSnapshots.java

@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Streams;
 import google.registry.beam.common.RegistryJpaIO;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.bulkquery.BulkQueryEntities;
 import google.registry.model.bulkquery.DomainBaseLite;
@@ -76,6 +77,7 @@ import org.apache.beam.sdk.values.TypeDescriptors;
  * contains optimizations specifically for the production database at the current size, e.g.,
  * parallel queries for select tables.
  */
+@DeleteAfterMigration
 public final class SqlSnapshots {
 
   private SqlSnapshots() {}

core/src/main/java/google/registry/beam/comparedb/ValidateSqlPipeline.java

@@ -19,17 +19,22 @@ import static org.apache.beam.sdk.values.TypeDescriptors.strings;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Stopwatch;
+import com.google.common.flogger.FluentLogger;
 import google.registry.beam.common.DatabaseSnapshot;
 import google.registry.beam.common.RegistryPipelineWorkerInitializer;
 import google.registry.beam.comparedb.LatestDatastoreSnapshotFinder.DatastoreSnapshotInfo;
 import google.registry.beam.comparedb.ValidateSqlUtils.CompareSqlEntity;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.replay.SqlEntity;
 import google.registry.model.replay.SqlReplayCheckpoint;
+import google.registry.model.server.Lock;
 import google.registry.persistence.PersistenceModule.JpaTransactionManagerType;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.TransactionManagerFactory;
+import google.registry.util.RequestStatusChecker;
 import java.io.Serializable;
 import java.util.Optional;
 import org.apache.beam.sdk.Pipeline;
@@ -44,15 +49,31 @@ import org.apache.beam.sdk.values.PCollectionList;
 import org.apache.beam.sdk.values.PCollectionTuple;
 import org.apache.beam.sdk.values.TupleTag;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;
 
 /**
  * Validates the asynchronous data replication process from Datastore (primary storage) to Cloud SQL
  * (secondary storage).
  */
+@DeleteAfterMigration
 public class ValidateSqlPipeline {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   /** Specifies the extra CommitLogs to load before the start of a Database export. */
-  private static final int COMMIT_LOG_MARGIN_MINUTES = 10;
+  private static final Duration COMMITLOG_START_TIME_MARGIN = Duration.standardMinutes(10);
+
+  /**
+   * Name of the lock used by the commitlog replay process.
+   *
+   * <p>See {@link google.registry.backup.ReplayCommitLogsToSqlAction} for more information.
+   */
+  private static final String COMMITLOG_REPLAY_LOCK_NAME = "ReplayCommitLogsToSqlAction";
+
+  private static final Duration REPLAY_LOCK_LEASE_LENGTH = Duration.standardHours(1);
+  private static final java.time.Duration REPLAY_LOCK_ACQUIRE_TIMEOUT =
+      java.time.Duration.ofMinutes(6);
+  private static final java.time.Duration REPLAY_LOCK_ACQUIRE_DELAY =
+      java.time.Duration.ofSeconds(30);
 
   private final ValidateSqlPipelineOptions options;
   private final DatastoreSnapshotInfo mostRecentExport;
@@ -69,18 +90,33 @@ public class ValidateSqlPipeline {
 
   @VisibleForTesting
   void run(Pipeline pipeline) {
-    // TODO(weiminyu): Acquire the commit log replay lock when the lock release bug is fixed.
-    DateTime latestCommitLogTime =
-        TransactionManagerFactory.jpaTm().transact(() -> SqlReplayCheckpoint.get());
-    Preconditions.checkState(
-        latestCommitLogTime.isAfter(mostRecentExport.exportInterval().getEnd()),
-        "Cannot recreate Datastore snapshot since target time is in the middle of an export.");
-    try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {
-      setupPipeline(pipeline, Optional.of(databaseSnapshot.getSnapshotId()), latestCommitLogTime);
-      State state = pipeline.run().waitUntilFinish();
-      if (!State.DONE.equals(state)) {
-        throw new IllegalStateException("Unexpected pipeline state: " + state);
+    // TODO(weiminyu): ensure migration stage is DATASTORE_PRIMARY or DATASTORE_PRIMARY_READ_ONLY
+    Optional<Lock> lock = acquireCommitLogReplayLock();
+    if (lock.isPresent()) {
+      logger.atInfo().log("Acquired CommitLog Replay lock.");
+    } else {
+      throw new RuntimeException("Failed to acquire CommitLog Replay lock.");
+    }
+
+    try {
+      DateTime latestCommitLogTime =
+          TransactionManagerFactory.jpaTm().transact(() -> SqlReplayCheckpoint.get());
+      Preconditions.checkState(
+          latestCommitLogTime.isAfter(mostRecentExport.exportInterval().getEnd()),
+          "Cannot recreate Datastore snapshot since target time is in the middle of an export.");
+      try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {
+        // Eagerly release the commitlog replay lock so that replay can resume.
+        lock.ifPresent(Lock::releaseSql);
+        lock = Optional.empty();
+
+        setupPipeline(pipeline, Optional.of(databaseSnapshot.getSnapshotId()), latestCommitLogTime);
+        State state = pipeline.run().waitUntilFinish();
+        if (!State.DONE.equals(state)) {
+          throw new IllegalStateException("Unexpected pipeline state: " + state);
+        }
       }
+    } finally {
+      lock.ifPresent(Lock::releaseSql);
     }
   }
 
@@ -95,7 +131,7 @@ public class ValidateSqlPipeline {
             pipeline,
             mostRecentExport.exportDir(),
             mostRecentExport.commitLogDir(),
-            mostRecentExport.exportInterval().getStart().minusMinutes(COMMIT_LOG_MARGIN_MINUTES),
+            mostRecentExport.exportInterval().getStart().minus(COMMITLOG_START_TIME_MARGIN),
             // Increase by 1ms since we want to include commitLogs latestCommitLogTime but
             // this parameter is exclusive.
             latestCommitLogTime.plusMillis(1),
@@ -138,6 +174,51 @@ public class ValidateSqlPipeline {
     return sqlEntity.getPrimaryKeyString();
   }
 
+  private static Optional<Lock> acquireCommitLogReplayLock() {
+    Stopwatch stopwatch = Stopwatch.createStarted();
+    while (stopwatch.elapsed().minus(REPLAY_LOCK_ACQUIRE_TIMEOUT).isNegative()) {
+      Optional<Lock> lock = tryAcquireCommitLogReplayLock();
+      if (lock.isPresent()) {
+        return lock;
+      }
+      logger.atInfo().log("Failed to acquired CommitLog Replay lock. Will retry...");
+      try {
+        Thread.sleep(REPLAY_LOCK_ACQUIRE_DELAY.toMillis());
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        throw new RuntimeException("Interrupted.");
+      }
+    }
+    return Optional.empty();
+  }
+
+  private static Optional<Lock> tryAcquireCommitLogReplayLock() {
+    return Lock.acquireSql(
+        COMMITLOG_REPLAY_LOCK_NAME,
+        null,
+        REPLAY_LOCK_LEASE_LENGTH,
+        getLockingRequestStatusChecker(),
+        false);
+  }
+
+  /**
+   * Returns a fake implementation of {@link RequestStatusChecker} that is required for lock
+   * acquisition. The default implementation is AppEngine-specific and is unusable on GCE.
+   */
+  private static RequestStatusChecker getLockingRequestStatusChecker() {
+    return new RequestStatusChecker() {
+      @Override
+      public String getLogId() {
+        return "ValidateSqlPipeline";
+      }
+
+      @Override
+      public boolean isRunning(String requestLogId) {
+        return true;
+      }
+    };
+  }
+
   public static void main(String[] args) {
     ValidateSqlPipelineOptions options =
         PipelineOptionsFactory.fromArgs(args).withValidation().as(ValidateSqlPipelineOptions.class);

core/src/main/java/google/registry/beam/comparedb/ValidateSqlPipelineOptions.java

@@ -15,6 +15,8 @@
 package google.registry.beam.comparedb;
 
 import google.registry.beam.common.RegistryPipelineOptions;
+import google.registry.model.annotations.DeleteAfterMigration;
 
 /** BEAM pipeline options for {@link ValidateSqlPipeline}. */
+@DeleteAfterMigration
 public interface ValidateSqlPipelineOptions extends RegistryPipelineOptions {}

core/src/main/java/google/registry/beam/comparedb/ValidateSqlUtils.java

@@ -19,9 +19,15 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
+import google.registry.beam.initsql.Transforms;
+import google.registry.config.RegistryEnvironment;
+import google.registry.model.BackupGroupRoot;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
+import google.registry.model.billing.BillingEvent;
 import google.registry.model.contact.ContactBase;
 import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainContent;
@@ -29,6 +35,7 @@ import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.host.HostHistory;
 import google.registry.model.poll.PollMessage;
+import google.registry.model.registrar.Registrar;
 import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import java.lang.reflect.Field;
@@ -46,11 +53,16 @@ import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.TupleTag;
 
 /** Helpers for use by {@link ValidateSqlPipeline}. */
+@DeleteAfterMigration
 final class ValidateSqlUtils {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   private ValidateSqlUtils() {}
 
+  private static final ImmutableSet<String> PROBER_CELLS = ImmutableSet.of("IQ", "LG", "TL");
+  private static final ImmutableSet<String> PROBER_TYPES =
+      ImmutableSet.of("ANYT", "ANYTES", "CANARY");
+
   /**
    * Query template for finding the median value of the {@code history_revision_id} column in one of
    * the History tables.
@@ -153,6 +165,9 @@ final class ValidateSqlUtils {
       totalCounters.get(counterKey).inc();
 
       if (entities.size() == 1) {
+        if (isSpecialCaseProberEntity(entities.get(0))) {
+          return;
+        }
         missingCounters.get(counterKey).inc();
         // Temporary debugging help. See logDiff() above.
         if (!logPrinted) {
@@ -203,6 +218,15 @@ final class ValidateSqlUtils {
    */
   static SqlEntity normalizeEppResource(SqlEntity eppResource) {
     try {
+      if (isSpecialCaseProberEntity(eppResource)) {
+        // Clearing some timestamps. See isSpecialCaseProberEntity() for reasons.
+        Field lastUpdateTime = BackupGroupRoot.class.getDeclaredField("updateTimestamp");
+        lastUpdateTime.setAccessible(true);
+        lastUpdateTime.set(eppResource, null);
+        Field deletionTime = EppResource.class.getDeclaredField("deletionTime");
+        deletionTime.setAccessible(true);
+        deletionTime.set(eppResource, null);
+      }
       Field authField =
           eppResource instanceof DomainContent
               ? DomainContent.class.getDeclaredField("authInfo")
@@ -246,6 +270,7 @@ final class ValidateSqlUtils {
         Field domainContent = DomainHistory.class.getDeclaredField("domainContent");
         domainContent.setAccessible(true);
         domainContent.set(historyEntry, null);
+        // Convert empty domainTransactionRecords to null for comparison.
         Field domainTransactionRecords =
             HistoryEntry.class.getDeclaredField("domainTransactionRecords");
         domainTransactionRecords.setAccessible(true);
@@ -253,6 +278,16 @@ final class ValidateSqlUtils {
         if (domainTransactionRecordsValue != null && domainTransactionRecordsValue.isEmpty()) {
           domainTransactionRecords.set(historyEntry, null);
         }
+        // DomainHistory in Datastore does not have the following properties either:
+        Field nsHosts = DomainHistory.class.getDeclaredField("nsHosts");
+        nsHosts.setAccessible(true);
+        nsHosts.set(historyEntry, null);
+        Field dsDataHistories = DomainHistory.class.getDeclaredField("dsDataHistories");
+        dsDataHistories.setAccessible(true);
+        dsDataHistories.set(historyEntry, null);
+        Field gracePeriodHistories = DomainHistory.class.getDeclaredField("gracePeriodHistories");
+        gracePeriodHistories.setAccessible(true);
+        gracePeriodHistories.set(historyEntry, null);
       } else if (historyEntry instanceof ContactHistory) {
         Field contactBase = ContactHistory.class.getDeclaredField("contactBase");
         contactBase.setAccessible(true);
@@ -267,4 +302,86 @@ final class ValidateSqlUtils {
       throw new RuntimeException(e);
     }
   }
+
+  /**
+   * Returns {@code true} if {@code entity} is created by the prober and needs special treatment.
+   *
+   * <p>{@link EppResource} entities created by the prober are deleted by a cron job that bypasses
+   * the CommitLog mechanism. As a result, their deletions are not propagated to SQL, creating two
+   * types of mismatches: an entity exists in both databases but differs in lastUpdateTime and
+   * deletionTime; an entity only exists in the SQL database.
+   *
+   * <p>In production, there are few placeholder {@link Registrar registrars} that do not exist in
+   * Datastore. They were manually created to in SQL to solve a one-time problem (see b/187946868
+   * for details). They can be ignored in the database comparison.
+   */
+  static boolean isSpecialCaseProberEntity(Object entity) {
+    if (entity instanceof EppResource) {
+      EppResource host = (EppResource) entity;
+      if (host.getPersistedCurrentSponsorRegistrarId().startsWith("prober-")) {
+        return true;
+      }
+    }
+    if (entity instanceof HistoryEntry) {
+      HistoryEntry historyEntry = (HistoryEntry) entity;
+      if (historyEntry.getRegistrarId().startsWith("prober-")) {
+        // Not all prober entities have "prober-" as registrar prefix.
+        return true;
+      }
+      if (Objects.equals(historyEntry.getReason(), "Deletion of prober data")) {
+        // Soft-delete event in Datastore that is not propagated to SQL.
+        return true;
+      }
+    }
+    if (entity instanceof DomainHistory) {
+      DomainHistory domainHistory = (DomainHistory) entity;
+      if (domainHistory.getDomainContent().isPresent()
+          && domainHistory.getDomainContent().get().getDomainName().startsWith("prober-")) {
+        // Asynchronously replicated event in SQL.
+        return true;
+      }
+      if (domainHistory.getDomainRepoId() != null) {
+        // Some synthetic events only have domainRepoId.
+        String repoId = domainHistory.getDomainRepoId();
+        if (Transforms.IGNORED_DOMAINS.contains(repoId)) {
+          return true;
+        }
+        String suffix = repoId.substring(repoId.indexOf('-') + 1);
+        String cell = suffix.substring(0, 2);
+        suffix = suffix.substring(2);
+        if (PROBER_CELLS.contains(cell) && PROBER_TYPES.contains(suffix)) {
+          return true;
+        }
+      }
+    }
+    if (entity instanceof ContactHistory) {
+      if (Transforms.IGNORED_CONTACTS.contains(((ContactHistory) entity).getContactRepoId())) {
+        return true;
+      }
+    }
+    if (entity instanceof HostHistory) {
+      if (Transforms.IGNORED_HOSTS.contains(((HostHistory) entity).getHostRepoId())) {
+        return true;
+      }
+    }
+    if (entity instanceof BillingEvent) {
+      BillingEvent event = (BillingEvent) entity;
+      if (event.getRegistrarId().startsWith("prober-")) {
+        return true;
+      }
+    }
+    if (entity instanceof PollMessage) {
+      if (((PollMessage) entity).getRegistrarId().startsWith("prober-")) {
+        return true;
+      }
+    }
+    if (RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION)
+        && entity instanceof Registrar) {
+      Registrar registrar = (Registrar) entity;
+      if (registrar.getRegistrarId().startsWith("prober-wj-")) {
+        return true;
+      }
+    }
+    return false;
+  }
 }

core/src/main/java/google/registry/beam/datastore/BulkDeleteDatastorePipeline.java

@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.flogger.FluentLogger;
 import com.google.datastore.v1.Entity;
 import google.registry.config.RegistryEnvironment;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.util.Iterator;
 import java.util.Map;
 import org.apache.beam.sdk.Pipeline;
@@ -79,6 +80,7 @@ import org.apache.beam.sdk.values.TupleTagList;
  * types in the Datastore using the {@code --numOfKindsHint} argument. If the default value for this
  * parameter is too low, performance will suffer.
  */
+@DeleteAfterMigration
 public class BulkDeleteDatastorePipeline {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 

core/src/main/java/google/registry/beam/datastore/DatastoreV1.java

@@ -53,6 +53,7 @@ import com.google.datastore.v1.client.DatastoreOptions;
 import com.google.datastore.v1.client.QuerySplitter;
 import com.google.protobuf.Int32Value;
 import com.google.rpc.Code;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.io.Serializable;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -80,6 +81,7 @@ import org.joda.time.Duration;
  * Contains an adaptation of {@link org.apache.beam.sdk.io.gcp.datastore.DatastoreV1.Read}. See
  * {@link MultiRead} for details.
  */
+@DeleteAfterMigration
 public class DatastoreV1 {
 
   // A package-private constructor to prevent direct instantiation from outside of this package

core/src/main/java/google/registry/beam/initsql/BackupPaths.java

@@ -21,12 +21,14 @@ import static com.google.common.base.Strings.isNullOrEmpty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
+import google.registry.model.annotations.DeleteAfterMigration;
 import org.joda.time.DateTime;
 
 /**
  * Helpers for determining the fully qualified paths to Nomulus backup files. A backup consists of a
  * Datastore export and Nomulus CommitLogs that overlap with the export.
  */
+@DeleteAfterMigration
 public final class BackupPaths {
 
   private BackupPaths() {}

core/src/main/java/google/registry/beam/initsql/DomainBaseUtil.java

@@ -18,9 +18,11 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.appengine.api.datastore.Entity;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.util.Objects;
 
 /** Helper for manipulating {@code DomainBase} when migrating from Datastore to SQL database */
+@DeleteAfterMigration
 final class DomainBaseUtil {
 
   private DomainBaseUtil() {}

core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java

@@ -23,6 +23,7 @@ import com.googlecode.objectify.Key;
 import google.registry.backup.VersionedEntity;
 import google.registry.beam.common.RegistryJpaIO;
 import google.registry.beam.initsql.Transforms.RemoveDomainBaseForeignKeys;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.common.Cursor;
 import google.registry.model.contact.ContactResource;
@@ -94,6 +95,7 @@ import org.joda.time.DateTime;
  * may start writing {@code DomainBase} entities before all {@code Registry}, {@code Registrar} and
  * {@code ContactResource} entities have been persisted.
  */
+@DeleteAfterMigration
 public class InitSqlPipeline implements Serializable {
 
   /**

core/src/main/java/google/registry/beam/initsql/InitSqlPipelineOptions.java

@@ -15,10 +15,12 @@
 package google.registry.beam.initsql;
 
 import google.registry.beam.common.RegistryPipelineOptions;
+import google.registry.model.annotations.DeleteAfterMigration;
 import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.Validation;
 
 /** Pipeline options for {@link InitSqlPipeline} */
+@DeleteAfterMigration
 public interface InitSqlPipelineOptions extends RegistryPipelineOptions {
 
   @Description("The root directory of the export to load.")

core/src/main/java/google/registry/beam/initsql/Transforms.java

@@ -37,6 +37,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import google.registry.backup.CommitLogImports;
 import google.registry.backup.VersionedEntity;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent.Flag;
 import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainBase;
@@ -80,6 +81,7 @@ import org.joda.time.DateTime;
  * {@link PTransform Pipeline transforms} used in pipelines that load from both Datastore export
  * files and Nomulus CommitLog files.
  */
+@DeleteAfterMigration
 public final class Transforms {
 
   private Transforms() {}
@@ -261,16 +263,19 @@ public final class Transforms {
                     .iterator()));
   }
 
-  // Production data repair configs go below. See b/185954992.
+  // Production data repair configs go below. See b/185954992. Note that the CommitLog replay
+  // process does not filter out the ignored entities listed below, a mistake that we do not fix
+  // for operational convenience. Instead, the Database comparison tool will filter them out. See
+  // ValidateSqlUtils.java for more information.
 
   // Prober domains in bad state, without associated contacts, hosts, billings, and non-synthesized
   // history. They can be safely ignored.
-  private static final ImmutableSet<String> IGNORED_DOMAINS =
+  public static final ImmutableSet<String> IGNORED_DOMAINS =
       ImmutableSet.of("6AF6D2-IQCANT", "2-IQANYT");
 
   // Prober hosts referencing phantom registrars. They and their associated history entries can be
   // safely ignored.
-  private static final ImmutableSet<String> IGNORED_HOSTS =
+  public static final ImmutableSet<String> IGNORED_HOSTS =
       ImmutableSet.of(
           "4E21_WJ0TEST-GOOGLE",
           "4E21_WJ1TEST-GOOGLE",
@@ -279,7 +284,7 @@ public final class Transforms {
 
   // Prober contacts referencing phantom registrars. They and their associated history entries can
   // be safely ignored.
-  private static final ImmutableSet<String> IGNORED_CONTACTS =
+  public static final ImmutableSet<String> IGNORED_CONTACTS =
       ImmutableSet.of(
           "1_WJ0TEST-GOOGLE", "1_WJ1TEST-GOOGLE", "1_WJ2TEST-GOOGLE", "1_WJ3TEST-GOOGLE");
 
@@ -300,6 +305,13 @@ public final class Transforms {
       return !IGNORED_HOSTS.contains(roid);
     }
     if (entity.getKind().equals("HistoryEntry")) {
+      // DOMAIN_APPLICATION_CREATE is deprecated type and should not be migrated.
+      // The Enum name DOMAIN_APPLICATION_CREATE no longer exists in Java and cannot
+      // be deserialized.
+      if (Objects.equals(entity.getProperty("type"), "DOMAIN_APPLICATION_CREATE")) {
+        return false;
+      }
+
       // Remove production bad data: Histories of ignored EPP resources:
       com.google.appengine.api.datastore.Key parentKey = entity.getKey().getParent();
       if (parentKey.getKind().equals("ContactResource")) {
@@ -315,14 +327,6 @@ public final class Transforms {
         return !IGNORED_DOMAINS.contains(domainRoid);
       }
     }
-    // End of production-specific checks.
-
-    if (entity.getKind().equals("HistoryEntry")) {
-      // DOMAIN_APPLICATION_CREATE is deprecated type and should not be migrated.
-      // The Enum name DOMAIN_APPLICATION_CREATE no longer exists in Java and cannot
-      // be deserialized.
-      return !Objects.equals(entity.getProperty("type"), "DOMAIN_APPLICATION_CREATE");
-    }
     return true;
   }
 

core/src/main/java/google/registry/export/AnnotatedEntities.java

@@ -21,12 +21,14 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
 import com.googlecode.objectify.Key;
 import google.registry.model.EntityClasses;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.annotations.InCrossTld;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.annotations.VirtualEntity;
 
 /** Constants related to export code. */
+@DeleteAfterMigration
 public final class AnnotatedEntities {
 
   /** Returns the names of kinds to include in Datastore backups. */

core/src/main/java/google/registry/export/BackupDatastoreAction.java

@@ -21,6 +21,7 @@ import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig;
 import google.registry.export.datastore.DatastoreAdmin;
 import google.registry.export.datastore.Operation;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.HttpException.InternalServerErrorException;
 import google.registry.request.Response;
@@ -46,6 +47,7 @@ import javax.inject.Inject;
     method = POST,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class BackupDatastoreAction implements Runnable {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();

core/src/main/java/google/registry/export/CheckBackupAction.java

@@ -33,6 +33,7 @@ import com.google.common.collect.Sets;
 import com.google.common.flogger.FluentLogger;
 import google.registry.export.datastore.DatastoreAdmin;
 import google.registry.export.datastore.Operation;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.HttpException;
 import google.registry.request.HttpException.BadRequestException;
@@ -60,6 +61,7 @@ import org.joda.time.format.PeriodFormat;
     method = {POST, GET},
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class CheckBackupAction implements Runnable {
 
   /** Parameter names for passing parameters into this action. */

core/src/main/java/google/registry/export/UpdateSnapshotViewAction.java

@@ -26,6 +26,7 @@ import com.google.appengine.api.taskqueue.TaskOptions.Method;
 import com.google.common.flogger.FluentLogger;
 import google.registry.bigquery.CheckedBigquery;
 import google.registry.config.RegistryConfig.Config;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.HttpException.InternalServerErrorException;
 import google.registry.request.Parameter;
@@ -40,6 +41,7 @@ import javax.inject.Inject;
     path = UpdateSnapshotViewAction.PATH,
     method = POST,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class UpdateSnapshotViewAction implements Runnable {
 
   /** Headers for passing parameters into the servlet. */

core/src/main/java/google/registry/export/UploadDatastoreBackupAction.java

@@ -39,6 +39,7 @@ import google.registry.bigquery.BigqueryUtils.WriteDisposition;
 import google.registry.bigquery.CheckedBigquery;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.request.Action;
 import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.InternalServerErrorException;
@@ -53,6 +54,7 @@ import javax.inject.Inject;
     path = UploadDatastoreBackupAction.PATH,
     method = POST,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
 public class UploadDatastoreBackupAction implements Runnable {
 
   /** Parameter names for passing parameters into the servlet. */

core/src/main/java/google/registry/export/datastore/DatastoreAdmin.java

@@ -26,6 +26,7 @@ import com.google.api.client.json.JsonFactory;
 import com.google.api.client.util.Key;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.util.Collection;
 import java.util.Optional;
 
@@ -33,6 +34,7 @@ import java.util.Optional;
  * Java client to <a href="https://cloud.google.com/datastore/docs/reference/admin/rest/">Cloud
  * Datastore Admin REST API</a>.
  */
+@DeleteAfterMigration
 public class DatastoreAdmin extends AbstractGoogleJsonClient {
 
   private static final String ROOT_URL = "https://datastore.googleapis.com/v1/";

core/src/main/java/google/registry/export/datastore/DatastoreAdminModule.java

@@ -18,11 +18,13 @@ import dagger.Module;
 import dagger.Provides;
 import google.registry.config.CredentialModule;
 import google.registry.config.RegistryConfig;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.util.GoogleCredentialsBundle;
 import javax.inject.Singleton;
 
 /** Dagger module that configures provision of {@link DatastoreAdmin}. */
 @Module
+@DeleteAfterMigration
 public abstract class DatastoreAdminModule {
 
   @Singleton

core/src/main/java/google/registry/export/datastore/EntityFilter.java

@@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.util.Key;
 import com.google.common.collect.ImmutableList;
+import google.registry.model.annotations.DeleteAfterMigration;
 import java.util.Collection;
 import java.util.List;
 
@@ -29,6 +30,7 @@ import java.util.List;
  * <p>Please note that properties not used by Domain Registry are not included, e.g., {@code
  * namespaceIds}.
  */
+@DeleteAfterMigration
 public class EntityFilter extends GenericJson {
 
   @Key private List<String> kinds = ImmutableList.of();

core/src/main/java/google/registry/export/datastore/Operation.java

@@ -22,6 +22,7 @@ import com.google.api.client.util.Key;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import google.registry.export.datastore.DatastoreAdmin.Get;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.util.Clock;
 import java.util.List;
 import java.util.Optional;
@@ -34,6 +35,7 @@ import org.joda.time.Duration;
  *
  * <p>{@link Operation} instances are parsed from the JSON payload in Datastore response messages.
  */
+@DeleteAfterMigration
 public class Operation extends GenericJson {
 
   private static final String STATE_SUCCESS = "SUCCESSFUL";

core/src/main/java/google/registry/mapreduce/inputs/ChildEntityInput.java

@@ -22,12 +22,14 @@ import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.index.EppResourceIndexBucket;
 
 /**
  * A MapReduce {@link Input} that loads all child objects of a given set of types, that are children
  * of given {@link EppResource} types.
  */
+@DeleteAfterMigration
 class ChildEntityInput<R extends EppResource, I extends ImmutableObject>
     extends EppResourceBaseInput<I> {
 

core/src/main/java/google/registry/mapreduce/inputs/ChildEntityReader.java

@@ -27,6 +27,7 @@ import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.EppResourceIndexBucket;
 import java.io.IOException;
@@ -34,9 +35,10 @@ import java.util.NoSuchElementException;
 import javax.annotation.Nullable;
 
 /**
- * Reader that maps over {@link EppResourceIndex} and returns resources that are children of
- * {@link EppResource} objects.
+ * Reader that maps over {@link EppResourceIndex} and returns resources that are children of {@link
+ * EppResource} objects.
  */
+@DeleteAfterMigration
 class ChildEntityReader<R extends EppResource, I extends ImmutableObject> extends InputReader<I> {
 
   private static final long serialVersionUID = 7481761146349663848L;

core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestInput.java

@@ -18,6 +18,7 @@ import com.google.appengine.tools.mapreduce.Input;
 import com.google.appengine.tools.mapreduce.InputReader;
 import com.google.common.collect.ImmutableList;
 import com.googlecode.objectify.Key;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogManifest;
 import java.util.List;
@@ -25,6 +26,7 @@ import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
 /** Base class for {@link Input} classes that map over {@link CommitLogManifest}. */
+@DeleteAfterMigration
 public class CommitLogManifestInput extends Input<Key<CommitLogManifest>> {
 
   private static final long serialVersionUID = 6744322799131602384L;

core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java

@@ -21,6 +21,7 @@ import com.google.appengine.api.datastore.QueryResultIterator;
 import com.google.appengine.tools.mapreduce.InputReader;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.cmd.Query;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogManifest;
 import java.util.NoSuchElementException;
@@ -28,6 +29,7 @@ import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
 /** {@link InputReader} that maps over {@link CommitLogManifest}. */
+@DeleteAfterMigration
 class CommitLogManifestReader
     extends RetryingInputReader<Key<CommitLogManifest>, Key<CommitLogManifest>> {
 

core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java

@@ -21,6 +21,7 @@ import com.google.appengine.tools.mapreduce.InputReader;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.model.EppResource;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.index.EppResourceIndexBucket;
 
 /**
@@ -28,6 +29,7 @@ import google.registry.model.index.EppResourceIndexBucket;
  *
  * <p>When mapping over keys we can't distinguish between Objectify polymorphic types.
  */
+@DeleteAfterMigration
 class EppResourceKeyInput<R extends EppResource> extends EppResourceBaseInput<Key<R>> {
 
   private static final long serialVersionUID = -5426821384707653743L;

core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java

@@ -18,6 +18,7 @@ import com.google.appengine.tools.mapreduce.InputReader;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.model.EppResource;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.EppResourceIndexBucket;
 import java.util.NoSuchElementException;
@@ -27,6 +28,7 @@ import java.util.NoSuchElementException;
  *
  * <p>When mapping over keys we can't distinguish between Objectify polymorphic types.
  */
+@DeleteAfterMigration
 class EppResourceKeyReader<R extends EppResource> extends EppResourceBaseReader<Key<R>> {
 
   private static final long serialVersionUID = -428232054739189774L;

core/src/main/java/google/registry/mapreduce/inputs/RetryingInputReader.java

@@ -23,6 +23,7 @@ import com.google.appengine.api.datastore.QueryResultIterator;
 import com.google.appengine.tools.mapreduce.InputReader;
 import com.google.common.flogger.FluentLogger;
 import com.googlecode.objectify.cmd.Query;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.util.Retrier;
 import google.registry.util.SystemSleeper;
 import java.util.NoSuchElementException;
@@ -40,6 +41,7 @@ import javax.annotation.Nullable;
  *
  * <p>I is the internal Objectify read type, while T is the InputReader return type.
  */
+@DeleteAfterMigration
 abstract class RetryingInputReader<I, T> extends InputReader<T> {
 
   private static final long serialVersionUID = -4897677478541818899L;

core/src/main/java/google/registry/model/AppEngineEnvironment.java

@@ -17,6 +17,7 @@ package google.registry.model;
 import com.google.apphosting.api.ApiProxy;
 import com.google.apphosting.api.ApiProxy.Environment;
 import com.google.common.collect.ImmutableMap;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.ofy.ObjectifyService;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -39,6 +40,7 @@ import java.lang.reflect.Proxy;
  * <p>Note that conversion from Objectify objects to Datastore {@code Entities} still requires the
  * Datastore service.
  */
+@DeleteAfterMigration
 public class AppEngineEnvironment {
 
   private Environment environment;

core/src/main/java/google/registry/model/ImmutableObject.java

@@ -156,10 +156,6 @@ public abstract class ImmutableObject implements Cloneable {
    *   }
    * }
    * </pre>
-   *
-   * <p>This method makes use of {@link #toStringHelper}, which embeds {@link
-   * System#identityHashCode} in the output string. Subclasses that require deterministic string
-   * representations <em>across</em> JVM instances should override this method.
    */
   @Override
   public String toString() {
@@ -185,11 +181,9 @@ public abstract class ImmutableObject implements Cloneable {
 
   public String toStringHelper(SortedMap<String, Object> fields) {
     return String.format(
-        "%s (@%s): {\n%s",
-        getClass().getSimpleName(),
-        System.identityHashCode(this),
-        Joiner.on('\n').join(fields.entrySet()))
-            .replaceAll("\n", "\n    ") + "\n}";
+                "%s: {\n%s", getClass().getSimpleName(), Joiner.on('\n').join(fields.entrySet()))
+            .replaceAll("\n", "\n    ")
+        + "\n}";
   }
 
   /** Helper function to recursively hydrate an ImmutableObject. */

core/src/main/java/google/registry/model/annotations/DeleteAfterMigration.java

@@ -0,0 +1,20 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// 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 google.registry.model.annotations;
+
+/**
+ * Annotation to indicate a class that should be deleted after the database migration is complete.
+ */
+public @interface DeleteAfterMigration {}

core/src/main/java/google/registry/model/annotations/InCrossTld.java

@@ -28,6 +28,7 @@ import java.lang.annotation.Target;
  * <p>This means that the entity's <code>@Parent</code> field has to have the value of {@link
  * EntityGroupRoot#getCrossTldKey}.
  */
+@DeleteAfterMigration
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Inherited

core/src/main/java/google/registry/model/annotations/NotBackedUp.java

@@ -24,6 +24,7 @@ import java.lang.annotation.Target;
  * Annotation for an Objectify {@link Entity} to indicate that it should not be backed up by the
  * default Datastore backup configuration (it may be backed up by something else).
  */
+@DeleteAfterMigration
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface NotBackedUp {

core/src/main/java/google/registry/model/annotations/ReportedOn.java

@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
 /**
  * Annotation for an Objectify {@link Entity} to indicate that it should be exported to BigQuery.
  */
+@DeleteAfterMigration
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 public @interface ReportedOn {}

core/src/main/java/google/registry/model/annotations/VirtualEntity.java

@@ -23,9 +23,10 @@ import java.lang.annotation.Target;
 /**
  * Annotation for an Objectify {@link Entity} to indicate that it is a "virtual entity".
  *
- * <p>A virtual entity type exists only to define part of the parentage key hierarchy for its
- * child entities, and is never actually persisted and thus has no fields besides its ID field.
+ * <p>A virtual entity type exists only to define part of the parentage key hierarchy for its child
+ * entities, and is never actually persisted and thus has no fields besides its ID field.
  */
+@DeleteAfterMigration
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface VirtualEntity {}

core/src/main/java/google/registry/model/bulkquery/DomainHistoryHost.java

@@ -14,6 +14,7 @@
 
 package google.registry.model.bulkquery;
 
+import com.google.common.base.Objects;
 import google.registry.model.domain.DomainHistory.DomainHistoryId;
 import google.registry.model.host.HostResource;
 import google.registry.model.replay.SqlOnlyEntity;
@@ -47,4 +48,23 @@ public class DomainHistoryHost implements Serializable, SqlOnlyEntity {
   public VKey<HostResource> getHostVKey() {
     return VKey.create(HostResource.class, hostRepoId);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof DomainHistoryHost)) {
+      return false;
+    }
+    DomainHistoryHost that = (DomainHistoryHost) o;
+    return Objects.equal(domainHistoryHistoryRevisionId, that.domainHistoryHistoryRevisionId)
+        && Objects.equal(domainHistoryDomainRepoId, that.domainHistoryDomainRepoId)
+        && Objects.equal(hostRepoId, that.hostRepoId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(domainHistoryHistoryRevisionId, domainHistoryDomainRepoId, hostRepoId);
+  }
 }

core/src/main/java/google/registry/model/bulkquery/DomainHost.java

@@ -14,6 +14,7 @@
 
 package google.registry.model.bulkquery;
 
+import com.google.common.base.Objects;
 import google.registry.model.host.HostResource;
 import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.persistence.VKey;
@@ -43,4 +44,22 @@ public class DomainHost implements Serializable, SqlOnlyEntity {
   public VKey<HostResource> getHostVKey() {
     return VKey.create(HostResource.class, hostRepoId);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof DomainHost)) {
+      return false;
+    }
+    DomainHost that = (DomainHost) o;
+    return Objects.equal(domainRepoId, that.domainRepoId)
+        && Objects.equal(hostRepoId, that.hostRepoId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(domainRepoId, hostRepoId);
+  }
 }

core/src/main/java/google/registry/model/common/Cursor.java

@@ -19,9 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSortedMap;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
@@ -296,22 +294,5 @@ public class Cursor extends ImmutableObject implements DatastoreAndSqlEntity, Un
       this.type = type;
       this.scope = scope;
     }
-
-    /**
-     * A deterministic string representation of a {@link CursorId}. See {@link
-     * ImmutableObject#toString} for more information.
-     */
-    @Override
-    public String toString() {
-      return String.format(
-                  "%s: {\n%s",
-                  getClass().getSimpleName(),
-                  Joiner.on('\n')
-                      .join(
-                          ImmutableSortedMap.<String, Object>of("scope", scope, "type", type)
-                              .entrySet()))
-              .replaceAll("\n", "\n    ")
-          + "\n}";
-    }
   }
 }

core/src/main/java/google/registry/model/contact/ContactHistory.java

@@ -16,8 +16,6 @@ package google.registry.model.contact;
 
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSortedMap;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
@@ -202,24 +200,6 @@ public class ContactHistory extends HistoryEntry implements SqlEntity, UnsafeSer
     private void setId(long id) {
       this.id = id;
     }
-
-    /**
-     * A deterministic string representation of a {@link ContactHistoryId}. See {@link
-     * ImmutableObject#toString} for more information.
-     */
-    @Override
-    public String toString() {
-      return String.format(
-                  "%s: {\n%s",
-                  getClass().getSimpleName(),
-                  Joiner.on('\n')
-                      .join(
-                          ImmutableSortedMap.<String, Object>of(
-                                  "contactRepoId", getContactRepoId(), "id", getId())
-                              .entrySet()))
-              .replaceAll("\n", "\n    ")
-          + "\n}";
-    }
   }
 
   @Override

core/src/main/java/google/registry/model/domain/DomainHistory.java

@@ -18,9 +18,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
@@ -386,24 +384,6 @@ public class DomainHistory extends HistoryEntry implements SqlEntity {
     private void setId(long id) {
       this.id = id;
     }
-
-    /**
-     * A deterministic string representation of a {@link DomainHistoryId}. See {@link
-     * ImmutableObject#toString} for more information.
-     */
-    @Override
-    public String toString() {
-      return String.format(
-                  "%s: {\n%s",
-                  getClass().getSimpleName(),
-                  Joiner.on('\n')
-                      .join(
-                          ImmutableSortedMap.<String, Object>of(
-                                  "domainRepoId", getDomainRepoId(), "id", getId())
-                              .entrySet()))
-              .replaceAll("\n", "\n    ")
-          + "\n}";
-    }
   }
 
   @Override

core/src/main/java/google/registry/model/host/HostHistory.java

@@ -16,8 +16,6 @@ package google.registry.model.host;
 
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSortedMap;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
@@ -205,24 +203,6 @@ public class HostHistory extends HistoryEntry implements SqlEntity, UnsafeSerial
     private void setId(long id) {
       this.id = id;
     }
-
-    /**
-     * A deterministic string representation of a {@link HostHistoryId}. See {@link
-     * ImmutableObject#toString} for more information.
-     */
-    @Override
-    public String toString() {
-      return String.format(
-                  "%s: {\n%s",
-                  getClass().getSimpleName(),
-                  Joiner.on('\n')
-                      .join(
-                          ImmutableSortedMap.<String, Object>of(
-                                  "hostRepoId", getHostRepoId(), "id", getId())
-                              .entrySet()))
-              .replaceAll("\n", "\n    ")
-          + "\n}";
-    }
   }
 
   @Override

core/src/main/java/google/registry/model/poll/PollMessage.java

@@ -395,9 +395,11 @@ public abstract class PollMessage extends ImmutableObject
       super.onLoad();
       // Take the Objectify-specific fields and map them to the SQL-specific fields, if applicable
       if (!isNullOrEmpty(contactPendingActionNotificationResponses)) {
+        contactId = contactPendingActionNotificationResponses.get(0).getId().value;
         pendingActionNotificationResponse = contactPendingActionNotificationResponses.get(0);
       }
       if (!isNullOrEmpty(hostPendingActionNotificationResponses)) {
+        hostId = hostPendingActionNotificationResponses.get(0).nameOrId.value;
         pendingActionNotificationResponse = hostPendingActionNotificationResponses.get(0);
       }
       if (!isNullOrEmpty(contactTransferResponses)) {

core/src/main/java/google/registry/model/registrar/RegistrarContact.java

@@ -32,9 +32,7 @@ import static java.util.stream.Collectors.joining;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Enums;
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
@@ -415,24 +413,6 @@ public class RegistrarContact extends ImmutableObject
       this.emailAddress = emailAddress;
       this.registrarId = registrarId;
     }
-
-    /**
-     * A deterministic string representation of a {@link RegistrarPocId}. See {@link
-     * ImmutableObject#toString} for more information.
-     */
-    @Override
-    public String toString() {
-      return String.format(
-                  "%s: {\n%s",
-                  getClass().getSimpleName(),
-                  Joiner.on('\n')
-                      .join(
-                          ImmutableSortedMap.<String, Object>of(
-                                  "emailAddress", emailAddress, "registrarId", registrarId)
-                              .entrySet()))
-              .replaceAll("\n", "\n    ")
-          + "\n}";
-    }
   }
 
   /** A builder for constructing a {@link RegistrarContact}, since it is immutable. */

core/src/test/java/google/registry/model/ImmutableObjectTest.java

@@ -68,11 +68,8 @@ public class ImmutableObjectTest {
   @Test
   void testToString_simpleClass() {
     SimpleObject object = new SimpleObject("foo", null);
-    assertThat(object.toString()).isEqualTo(""
-        + "SimpleObject (@" + System.identityHashCode(object) + "): {\n"
-        + "    a=foo\n"
-        + "    b=null\n"
-        + "}");
+    assertThat(object.toString())
+        .isEqualTo("" + "SimpleObject: {\n" + "    a=foo\n" + "    b=null\n" + "}");
   }
 
   @Test
@@ -332,8 +329,8 @@ public class ImmutableObjectTest {
 
     // The hash code test test is implicit in "equals", it is added here just for clarity.
     assertThat(instance1.hashCode()).isEqualTo(instance2.hashCode());
-    assertThat(instance1.toString()).matches(
-        "(?s)HasInsignificantFields (.*): \\{\\s*significant=significant\\s*\\}\\s*");
+    assertThat(instance1.toString())
+        .matches("(?s)HasInsignificantFields: \\{\\s*significant=significant\\s*\\}\\s*");
   }
 
   static class HasInsignificantFields extends ImmutableObject {

docs/build.gradle

@@ -25,8 +25,16 @@ dependencies {
 
   testCompile deps['com.google.truth:truth']
   testCompile deps['com.thoughtworks.qdox:qdox']
+  testCompile deps['junit:junit']
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
+  testCompile deps['org.junit.platform:junit-platform-runner']
+  testCompile deps['org.junit.platform:junit-platform-suite-api']
+  testCompile deps['org.testcontainers:junit-jupiter']
+}
+
+test {
+  useJUnitPlatform()
 }
 
 sourceCompatibility = '11'

docs/gradle/dependency-locks/testCompile.lockfile

@@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final
 org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
 org.opentest4j:opentest4j:1.2.0
@@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.15.2
 org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
 org.testcontainers:postgresql:1.15.2
 org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1

docs/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -250,11 +250,14 @@ org.jboss:jandex:2.1.3.Final
 org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
 org.opentest4j:opentest4j:1.2.0
@@ -271,6 +274,7 @@ org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.testcontainers:database-commons:1.15.2
 org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
 org.testcontainers:postgresql:1.15.2
 org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1

docs/gradle/dependency-locks/testRuntime.lockfile

@@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final
 org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
 org.opentest4j:opentest4j:1.2.0
@@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.15.2
 org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
 org.testcontainers:postgresql:1.15.2
 org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1

docs/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final
 org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
 org.opentest4j:opentest4j:1.2.0
@@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.15.2
 org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
 org.testcontainers:postgresql:1.15.2
 org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1

gradle/dependency-locks/buildscript-classpath.lockfile

@@ -40,8 +40,6 @@ org.apache.ant:ant-launcher:1.9.7
 org.apache.ant:ant:1.9.7
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.8.1
-org.apache.logging.log4j:log4j-api:2.11.0
-org.apache.logging.log4j:log4j-core:2.11.0
 org.apache.maven:maven-artifact:3.6.2
 org.apache.maven:maven-builder-support:3.6.2
 org.apache.maven:maven-model-builder:3.6.2

java_common.gradle

@@ -64,6 +64,8 @@ configurations {
     it.exclude group: 'org.mockito', module: 'mockito-core'
   }
   all.each {
+    // log4j has high-profile security vulnerabilities. It's a transitive dependency used by some
+    // Apache Beam packages. Excluding it does not impact our troubleshooting needs.
     it.exclude group: 'org.apache.logging.log4j'
   }
 }

networking/build.gradle

@@ -34,17 +34,25 @@ dependencies {
   runtime deps['io.netty:netty-tcnative-boringssl-static']
 
   testCompile deps['com.google.truth:truth']
+  testCompile deps['junit:junit']
+  testCompile deps['org.bouncycastle:bcpkix-jdk15on']
+  testCompile deps['org.bouncycastle:bcprov-jdk15on']
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.jupiter:junit-jupiter-params']
-  testCompile deps['org.bouncycastle:bcpkix-jdk15on']
-  testCompile deps['org.bouncycastle:bcprov-jdk15on']
+  testCompile deps['org.junit.platform:junit-platform-runner']
+  testCompile deps['org.junit.platform:junit-platform-suite-api']
+  testCompile deps['org.testcontainers:junit-jupiter']
   testCompile project(path: ':common', configuration: 'testing')
 
   annotationProcessor deps['com.google.dagger:dagger-compiler']
   testAnnotationProcessor deps['com.google.dagger:dagger-compiler']
 }
 
+test {
+  useJUnitPlatform()
+}
+
 // Make testing artifacts available to be depended up on by other projects.
 task testJar(type: Jar) {
   classifier = 'test'

networking/gradle/dependency-locks/testCompile.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -65,6 +69,8 @@ javax.mail:mail:1.4
 javax.xml.bind:jaxb-api:2.3.0
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -75,13 +81,21 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

networking/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -62,6 +66,8 @@ javax.mail:mail:1.4
 javax.xml.bind:jaxb-api:2.3.0
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -71,13 +77,21 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.9.1
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

networking/gradle/dependency-locks/testRuntime.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -67,6 +71,8 @@ javax.mail:mail:1.4
 javax.xml.bind:jaxb-api:2.3.0
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -77,13 +83,21 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

networking/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -67,6 +71,8 @@ javax.mail:mail:1.4
 javax.xml.bind:jaxb-api:2.3.0
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -77,13 +83,21 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

prober/build.gradle

@@ -17,48 +17,56 @@ apply plugin: 'java'
 createUberJar('deployJar', 'prober', 'google.registry.monitoring.blackbox.Prober')
 
 dependencies {
-    def deps = rootProject.dependencyMap
+  def deps = rootProject.dependencyMap
 
-    compile deps['com.google.auto.value:auto-value-annotations']
-    compile deps['com.google.code.findbugs:jsr305']
-    compile deps['com.google.code.gson:gson']
-    compile deps['com.google.dagger:dagger']
-    compile deps['com.google.flogger:flogger']
-    compile deps['com.google.guava:guava']
-    compile deps['com.google.monitoring-client:metrics']
-    compile deps['io.netty:netty-buffer']
-    compile deps['io.netty:netty-codec']
-    compile deps['io.netty:netty-codec-http']
-    compile deps['io.netty:netty-common']
-    compile deps['io.netty:netty-handler']
-    compile deps['io.netty:netty-transport']
-    compile deps['javax.inject:javax.inject']
-    compile deps['joda-time:joda-time']
-    compile deps['org.bouncycastle:bcpkix-jdk15on']
-    compile deps['org.bouncycastle:bcprov-jdk15on']
-    compile deps['xerces:xmlParserAPIs']
-    compile deps['xpp3:xpp3']
-    compile project(':common')
-    compile project(':util')
-    compile project(':networking')
+  compile deps['com.google.auto.value:auto-value-annotations']
+  compile deps['com.google.code.findbugs:jsr305']
+  compile deps['com.google.code.gson:gson']
+  compile deps['com.google.dagger:dagger']
+  compile deps['com.google.flogger:flogger']
+  compile deps['com.google.guava:guava']
+  compile deps['com.google.monitoring-client:metrics']
+  compile deps['io.netty:netty-buffer']
+  compile deps['io.netty:netty-codec']
+  compile deps['io.netty:netty-codec-http']
+  compile deps['io.netty:netty-common']
+  compile deps['io.netty:netty-handler']
+  compile deps['io.netty:netty-transport']
+  compile deps['javax.inject:javax.inject']
+  compile deps['joda-time:joda-time']
+  compile deps['org.bouncycastle:bcpkix-jdk15on']
+  compile deps['org.bouncycastle:bcprov-jdk15on']
+  compile deps['xerces:xmlParserAPIs']
+  compile deps['xpp3:xpp3']
+  compile project(':common')
+  compile project(':util')
+  compile project(':networking')
 
-    runtime deps['com.google.flogger:flogger-system-backend']
-    runtime deps['com.google.auto.value:auto-value']
-    runtime deps['io.netty:netty-tcnative-boringssl-static']
+  runtime deps['com.google.flogger:flogger-system-backend']
+  runtime deps['com.google.auto.value:auto-value']
+  runtime deps['io.netty:netty-tcnative-boringssl-static']
 
-    testCompile deps['com.google.monitoring-client:contrib']
-    testCompile deps['com.google.truth:truth']
-    testCompile deps['org.junit.jupiter:junit-jupiter-api']
-    testCompile deps['org.junit.jupiter:junit-jupiter-engine']
-    testCompile deps['org.junit.jupiter:junit-jupiter-params']
-    testCompile deps['org.mockito:mockito-core']
-    testCompile project(path: ':common', configuration: 'testing')
-    testCompile project(path: ':networking', configuration: 'testRuntime')
+  testCompile deps['com.google.monitoring-client:contrib']
+  testCompile deps['com.google.truth:truth']
+  testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
+  testCompile deps['org.junit.jupiter:junit-jupiter-engine']
+  testCompile deps['org.junit.jupiter:junit-jupiter-params']
+  testCompile deps['org.junit.platform:junit-platform-runner']
+  testCompile deps['org.junit.platform:junit-platform-suite-api']
+  testCompile deps['org.mockito:mockito-core']
+  testCompile deps['org.testcontainers:junit-jupiter']
+  testCompile project(path: ':common', configuration: 'testing')
+  testCompile project(path: ':networking', configuration: 'testRuntime')
 
-    // Include auto-value in compile until nebula-lint understands
-    // annotationProcessor
-    annotationProcessor deps['com.google.auto.value:auto-value']
-    testAnnotationProcessor deps['com.google.auto.value:auto-value']
-    annotationProcessor deps['com.google.dagger:dagger-compiler']
-    testAnnotationProcessor deps['com.google.dagger:dagger-compiler']
+  // Include auto-value in compile until nebula-lint understands
+  // annotationProcessor
+  annotationProcessor deps['com.google.auto.value:auto-value']
+  testAnnotationProcessor deps['com.google.auto.value:auto-value']
+  annotationProcessor deps['com.google.dagger:dagger-compiler']
+  testAnnotationProcessor deps['com.google.dagger:dagger-compiler']
+}
+
+test {
+  useJUnitPlatform()
 }

prober/gradle/dependency-locks/testCompile.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
 xerces:xmlParserAPIs:2.6.2

prober/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -68,6 +72,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -77,16 +83,24 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.9.1
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
 xerces:xmlParserAPIs:2.6.2

prober/gradle/dependency-locks/testRuntime.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
 xerces:xmlParserAPIs:2.6.2

prober/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -1,6 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
 xerces:xmlParserAPIs:2.6.2

prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java

@@ -14,6 +14,7 @@
 
 package google.registry.monitoring.blackbox.message;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import google.registry.monitoring.blackbox.exception.EppClientException;
 import google.registry.monitoring.blackbox.exception.UndeterminedStateException;
@@ -147,4 +148,16 @@ public class EppRequestMessage extends EppMessage implements OutboundMessageType
   public String responseName() {
     return expectedResponse.name();
   }
+
+  /**
+   * Returns a String representation using the {@link #name()}, {@link #responseName()}, and {@link
+   * #message} (if non-null).
+   *
+   * <p>This is primarily for parameterized test case usage, which requires a sensible <code>
+   * toString</code> for the purposes of test method naming.
+   */
+  @Override
+  public String toString() {
+    return Joiner.on('_').skipNulls().join(name(), responseName(), super.toString());
+  }
 }

proxy/build.gradle

@@ -76,11 +76,15 @@ dependencies {
 
   testCompile deps['com.google.monitoring-client:contrib']
   testCompile deps['com.google.truth:truth']
-  testCompile deps['org.yaml:snakeyaml']
+  testCompile deps['junit:junit']
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.jupiter:junit-jupiter-params']
+  testCompile deps['org.junit.platform:junit-platform-runner']
+  testCompile deps['org.junit.platform:junit-platform-suite-api']
   testCompile deps['org.mockito:mockito-core']
+  testCompile deps['org.testcontainers:junit-jupiter']
+  testCompile deps['org.yaml:snakeyaml']
   testCompile project(path: ':common', configuration: 'testing')
   testCompile project(path: ':networking', configuration: 'testRuntime')
 
@@ -91,3 +95,7 @@ dependencies {
   annotationProcessor deps['com.google.dagger:dagger-compiler']
   testAnnotationProcessor deps['com.google.dagger:dagger-compiler']
 }
+
+test {
+  useJUnitPlatform()
+}

proxy/gradle/dependency-locks/testCompile.lockfile

@@ -2,8 +2,12 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.beust:jcommander:1.60
+com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

proxy/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -2,8 +2,12 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.beust:jcommander:1.60
+com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -82,6 +86,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -91,15 +97,23 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.9.1
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

proxy/gradle/dependency-locks/testRuntime.lockfile

@@ -2,8 +2,12 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.beust:jcommander:1.60
+com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17

proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -2,8 +2,12 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.beust:jcommander:1.60
+com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.docker-java:docker-java-api:3.2.7
+com.github.docker-java:docker-java-transport-zerodep:3.2.7
+com.github.docker-java:docker-java-transport:3.2.7
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
+net.java.dev.jna:jna:5.5.0
+org.apache.commons:commons-compress:1.20
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.14
 org.apiguardian:apiguardian-api:1.1.0
@@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.2
-org.junit.jupiter:junit-jupiter-engine:5.6.2
-org.junit.jupiter:junit-jupiter-params:5.6.2
-org.junit.platform:junit-platform-commons:1.6.2
-org.junit.platform:junit-platform-engine:1.6.2
-org.junit:junit-bom:5.6.2
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.jupiter:junit-jupiter-engine:5.7.0
+org.junit.jupiter:junit-jupiter-params:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
+org.junit.platform:junit-platform-engine:1.7.0
+org.junit.platform:junit-platform-launcher:1.7.0
+org.junit.platform:junit-platform-runner:1.7.0
+org.junit.platform:junit-platform-suite-api:1.7.0
+org.junit:junit-bom:5.7.0
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm:9.0
+org.rnorth.duct-tape:duct-tape:1.0.8
+org.rnorth.visible-assertions:visible-assertions:2.1.2
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17