Add batching to ExpandRecurringBillingEventsAction (#1636 )

* Add batching to ExpandRecurringBillingEventsAction It's OOMing on trying to load every single BillingRecurrence that needs to be expanded simultaneously (which is to be expected). So this processes them in transactional batches of 50.
Make Caffeine cache loading work in non-GAE thread (#1634 )
2026-05-20 06:41:51 +00:00 · 2022-05-19 09:13:37 -04:00 · 2022-05-18 22:01:44 -04:00 · 2022-05-18 17:15:45 -04:00 · 2022-05-17 10:33:42 -04:00 · 2022-05-16 16:10:09 -04:00
718 changed files with 34844 additions and 25780 deletions
--- a/1
+++ b/1
@@ -36,3 +36,4 @@ Shicong Huang <shicong@google.com>
 Gustav Brodman <gbrodman@google.com>
 Sarah Botwinick <sarahbot@google.com>
 Legina Chen <legina@google.com>
+Rachel Guan <rachelguan@google.com>
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,10 @@ buildscript {
    // Lock buildscript dependencies.
    configurations.classpath {
      resolutionStrategy.activateDependencyLocking()
+
+      // log4j has high-profile security vulnerabilities. It's a transitive
+      // dependency used by Gradle itself during build, and not strictly needed.
+      exclude group: 'org.apache.logging.log4j'
    }
  }

@@ -51,7 +55,7 @@ plugins {

 node {
  download = true
-  version = "14.15.5"
+  version = "16.14.0"
  npmVersion = "6.14.11"
 }

@@ -182,6 +186,12 @@ allprojects {
      println "Java dependencies: Using Maven Central..."
      mavenCentral()
      google()
+      maven {
+        url "https://packages.confluent.io/maven/"
+        content {
+          includeGroup "io.confluent"
+        }
+      }
    }
  }

@@ -282,7 +292,8 @@ subprojects {

  afterEvaluate {
    if (rootProject.enableDependencyLocking.toBoolean()
-        && project.name != 'integration') {
+        && project.name != 'integration'
+        && project.name != 'java8compatibility') {
      // The ':integration' project runs server/schema integration tests using
      // dynamically specified jars with no transitive dependency. Therefore
      // dependency-locking does not make sense. Furthermore, during
@@ -290,6 +301,9 @@ subprojects {
      // immutable. Locking activation would trigger an invalid operation
      // exception.
      //
+      // The ':java8compatibility' project is test-only. Its source does not go
+      // into production.
+      //
      // For all other projects, due to problem with the gradle-license-report
      // plugin, the dependencyLicenseReport configuration must opt out of
      // dependency-locking. See dependency_lic.gradle for the reason why.
@@ -321,6 +335,13 @@ subprojects {

  apply from: "${rootDir.path}/java_common.gradle"

+  if (project.name != 'docs') {
+    compileJava {
+      // TODO: Remove this once we migrate off AppEngine.
+      options.release = 8
+    }
+  }
+
  if (project.name == 'third_party') return

  project.tasks.test.dependsOn runPresubmits
--- a/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
+++ b/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.google.auto.value:auto-value:1.7.4
+com.google.auto.value:auto-value:1.9
 com.google.auto:auto-common:0.10
 com.google.code.findbugs:jFormatString:3.0.0
 com.google.code.findbugs:jsr305:3.0.2
--- a/buildSrc/gradle/dependency-locks/compile.lockfile
+++ b/buildSrc/gradle/dependency-locks/compile.lockfile
@@ -3,61 +3,60 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.json:json:20160212
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm:7.0
-org.threeten:threetenbp:1.5.0
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
@@ -3,61 +3,60 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.json:json:20160212
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm:7.0
-org.threeten:threetenbp:1.5.0
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile
+++ b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile
@@ -3,61 +3,60 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.json:json:20160212
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm:7.0
-org.threeten:threetenbp:1.5.0
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/runtime.lockfile
+++ b/buildSrc/gradle/dependency-locks/runtime.lockfile
@@ -3,61 +3,60 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.json:json:20160212
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm:7.0
-org.threeten:threetenbp:1.5.0
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -3,61 +3,60 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.json:json:20160212
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm:7.0
-org.threeten:threetenbp:1.5.0
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/testCompile.lockfile
+++ b/buildSrc/gradle/dependency-locks/testCompile.lockfile
@@ -3,76 +3,74 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-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.mockito:mockito-core:3.7.7
-org.objenesis:objenesis:3.1
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
+org.mockito:mockito-core:4.5.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:9.0
-org.threeten:threetenbp:1.5.0
+org.ow2.asm:asm:9.1
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -3,76 +3,74 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.apache.httpcomponents:httpcore:4.4.15
+org.apiguardian:apiguardian-api:1.1.2
+org.checkerframework:checker-qual:3.21.4
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-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.mockito:mockito-core:3.7.7
-org.objenesis:objenesis:3.1
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
+org.mockito:mockito-core:4.5.1
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:9.0
-org.threeten:threetenbp:1.5.0
+org.ow2.asm:asm:9.1
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/testRuntime.lockfile
+++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile
@@ -3,76 +3,74 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-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.mockito:mockito-core:3.7.7
-org.objenesis:objenesis:3.1
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
+org.mockito:mockito-core:4.5.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:9.0
-org.threeten:threetenbp:1.5.0
+org.ow2.asm:asm:9.1
+org.threeten:threetenbp:1.6.0
--- a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -3,76 +3,74 @@
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
-com.google.api-client:google-api-client:1.31.2
-com.google.api.grpc:proto-google-common-protos:2.1.0
-com.google.api.grpc:proto-google-iam-v1:1.0.10
-com.google.api:api-common:1.10.1
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.62.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
-com.google.auth:google-auth-library-credentials:0.24.1
-com.google.auth:google-auth-library-oauth2-http:0.24.1
-com.google.auto.value:auto-value-annotations:1.7.4
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-storage:1.113.12
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.value:auto-value-annotations:1.9
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-storage:2.6.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.escapevelocity:escapevelocity:0.9.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.0
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client:1.39.0
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.15.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.36.0
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-context:1.45.1
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.apache.httpcomponents:httpcore:4.4.15
+org.checkerframework:checker-qual:3.21.4
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-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.mockito:mockito-core:3.7.7
-org.objenesis:objenesis:3.1
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
+org.mockito:mockito-core:4.5.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:9.0
-org.threeten:threetenbp:1.5.0
+org.ow2.asm:asm:9.1
+org.threeten:threetenbp:1.6.0
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -51,6 +51,7 @@ artifacts {
 dependencies {
  def deps = rootProject.dependencyMap

+  compile deps['com.github.ben-manes.caffeine:caffeine']
  compile deps['com.google.code.findbugs:jsr305']
  compile deps['com.google.guava:guava']
  compile deps['javax.inject:javax.inject']
--- a/common/gradle/dependency-locks/compile.lockfile
+++ b/common/gradle/dependency-locks/compile.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/compileClasspath.lockfile
+++ b/common/gradle/dependency-locks/compileClasspath.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/default.lockfile
+++ b/common/gradle/dependency-locks/default.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/deploy_jar.lockfile
+++ b/common/gradle/dependency-locks/deploy_jar.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/runtime.lockfile
+++ b/common/gradle/dependency-locks/runtime.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,12 +1,13 @@
 # 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.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+joda-time:joda-time:2.10.14
+org.checkerframework:checker-qual:3.19.0
--- a/common/gradle/dependency-locks/testCompile.lockfile
+++ b/common/gradle/dependency-locks/testCompile.lockfile
@@ -1,27 +1,27 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
-org.apiguardian:apiguardian-api:1.1.0
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 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.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.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -1,27 +1,28 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
-org.apiguardian:apiguardian-api:1.1.0
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
+org.apiguardian:apiguardian-api:1.1.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 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.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.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testRuntime.lockfile
+++ b/common/gradle/dependency-locks/testRuntime.lockfile
@@ -1,28 +1,28 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
-org.apiguardian:apiguardian-api:1.1.0
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 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.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.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -1,28 +1,28 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
-org.apiguardian:apiguardian-api:1.1.0
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 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.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.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit:junit-bom:5.8.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testingCompile.lockfile
+++ b/common/gradle/dependency-locks/testingCompile.lockfile
@@ -1,20 +1,21 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testingCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingCompileClasspath.lockfile
@@ -1,20 +1,21 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testingRuntime.lockfile
+++ b/common/gradle/dependency-locks/testingRuntime.lockfile
@@ -1,21 +1,22 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
@@ -1,21 +1,22 @@
 # 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.google.auto.value:auto-value-annotations:1.7.4
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.google.auto.value:auto-value-annotations:1.8.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.1.2
+com.google.truth:truth:1.1.3
 io.github.java-diff-utils:java-diff-utils:4.9
 javax.inject:javax.inject:1
-joda-time:joda-time:2.9.2
-junit:junit:4.13.1
+joda-time:joda-time:2.10.14
+junit:junit:4.13.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
-org.ow2.asm:asm:9.0
+org.ow2.asm:asm:9.1
--- a/common/src/main/java/google/registry/util/Sleeper.java
+++ b/common/src/main/java/google/registry/util/Sleeper.java
@@ -41,4 +41,20 @@ public interface Sleeper {
   * @see com.google.common.util.concurrent.Uninterruptibles#sleepUninterruptibly
   */
  void sleepUninterruptibly(ReadableDuration duration);
+
+  /**
+   * Puts the current thread to interruptible sleep.
+   *
+   * <p>This is a convenience method for {@link #sleep} that properly converts an {@link
+   * InterruptedException} to a {@link RuntimeException}.
+   */
+  default void sleepInterruptibly(ReadableDuration duration) {
+    try {
+      sleep(duration);
+    } catch (InterruptedException e) {
+      // Restore current thread's interrupted state.
+      Thread.currentThread().interrupt();
+      throw new RuntimeException("Interrupted.", e);
+    }
+  }
 }
--- a/common/src/testing/java/google/registry/testing/SystemInfo.java
+++ b/common/src/testing/java/google/registry/testing/SystemInfo.java
@@ -14,9 +14,9 @@

 package google.registry.testing;

-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.flogger.FluentLogger;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -29,7 +29,7 @@ public final class SystemInfo {
  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

  private static final LoadingCache<String, Boolean> hasCommandCache =
-      CacheBuilder.newBuilder()
+      Caffeine.newBuilder()
          .build(
              new CacheLoader<String, Boolean>() {
                @Override
--- a/config/dependency-license/allowed_licenses.json
+++ b/config/dependency-license/allowed_licenses.json
@@ -24,6 +24,9 @@
    {
      "moduleLicense": "Apache License v2.0"
    },
+    {
+      "moduleLicense": "Apache License V2.0"
+    },
    {
      "moduleLicense": "Apache License, Version 2.0"
    },
@@ -66,6 +69,12 @@
    {
      "moduleLicense": "BSD 3-clause New License"
    },
+    {
+      "moduleLicense": "BSD-3-Clause"
+    },
+    {
+      "moduleLicense": "BSD-3-Clause;link=\"https://raw.githubusercontent.com/dnsjava/dnsjava/master/LICENSE\""
+    },
    {
      "moduleLicense": "3-Clause BSD License"
    },
@@ -108,6 +117,9 @@
    {
      "moduleLicense": "The PostgreSQL License"
    },
+    {
+      "moduleLicense": "CC0"
+    },
    {
      "moduleLicense": "CC0 1.0 Universal License"
    },
@@ -262,6 +274,13 @@
      "moduleLicense": null,
      "moduleName": "com.fasterxml.jackson:jackson-bom"
    },
+    {
+      // "Apache License, Version 2.0". The plugin is able to parse up to
+      // 2.0.33.Final but not this verson.
+      "moduleLicense": null,
+      "moduleVersion": "2.0.46.Final",
+      "moduleName": "io.netty:netty-tcnative-classes"
+    },
    {
      // Actually Eclipse Public License v2.0
      "moduleLicense": null,
--- a/config/nom_build.py
+++ b/config/nom_build.py
@@ -57,6 +57,7 @@ PROPERTIES_HEADER = """\
 #
 # DO NOT EDIT THIS FILE BY HAND
 org.gradle.jvmargs=-Xmx1024m
+org.gradle.caching=true
 """

 # Help text to be displayed (in addition to the synopsis and flag help, which
--- a/config/presubmits.py
+++ b/config/presubmits.py
@@ -88,8 +88,8 @@ PRESUBMITS = {
        r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
        ("java", "js", "soy", "sql", "py", "sh", "gradle"), {
            ".git", "/build/", "/generated/", "/generated_tests/",
-            "node_modules/", "LocalStorageHelper.java", "FakeStorageRpc.java",
-            "registrar_bin.", "registrar_dbg.", "google-java-format-diff.py",
+            "node_modules/", "LoggerConfig.java", "registrar_bin.",
+            "registrar_dbg.", "google-java-format-diff.py",
            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js"
        }, REQUIRED):
        "File did not include the license header.",
--- a/config/show_upgrade_diffs.py
+++ b/config/show_upgrade_diffs.py
@@ -138,8 +138,8 @@ def main():
    if args.directory and os.path.exists(dir):
        pr(f'Reusing directory {dir}\n')
        os.chdir(dir)
-        run('git', 'fetch', 'git@github.com:google/nomulus', 'master:master')
-        run('git', 'checkout', 'master')
+        run('git', 'fetch', 'git@github.com:google/nomulus', 'master')
+        run('git', 'checkout', 'origin/master')
    else:
        run('git', 'clone', 'git@github.com:google/nomulus', dir)
        os.chdir(dir)
@@ -175,7 +175,7 @@ def main():
        # Print the list of packages that were removed.
        for package in old_packages:
            if package not in new_packages:
-                pr('removed ', b':'.join(package))
+                pr('removed ', b':'.join(package), '\n')
    else:
        pr('Package versions not updated!\n')

--- a/core/build.gradle
+++ b/core/build.gradle
@@ -172,6 +172,7 @@ dependencies {
  testRuntime files(sourceSets.test.resources.srcDirs)

  compile deps['com.beust:jcommander']
+  compile deps['com.github.ben-manes.caffeine:caffeine']
  compile deps['com.google.api:gax']
  compile deps['com.google.api.grpc:proto-google-cloud-datastore-v1']
  compile deps['com.google.api.grpc:proto-google-common-protos']
@@ -257,13 +258,12 @@ dependencies {
  compile deps['org.apache.beam:beam-sdks-java-core']
  compile deps['org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core']
  compile deps['org.apache.beam:beam-sdks-java-io-google-cloud-platform']
-  testCompile deps['org.apache.commons:commons-lang3']
+  compile deps['org.apache.commons:commons-lang3']
  testCompile deps['org.apache.commons:commons-text']
  testCompile deps['org.apache.ftpserver:ftplet-api']
  testCompile deps['org.apache.ftpserver:ftpserver-core']
  compile deps['org.apache.httpcomponents:httpclient']
  compile deps['org.apache.httpcomponents:httpcore']
-  runtime deps['org.apache.logging.log4j:log4j-core']
  testCompile deps['org.apache.sshd:sshd-core']
  testCompile deps['org.apache.sshd:sshd-scp']
  testCompile deps['org.apache.sshd:sshd-sftp']
@@ -320,6 +320,7 @@ dependencies {
  testCompile deps['com.google.appengine:appengine-testing']
  testCompile deps['com.google.guava:guava-testlib']
  testCompile deps['com.google.monitoring-client:contrib']
+  testCompile deps['com.google.protobuf:protobuf-java-util']
  testCompile deps['com.google.truth:truth']
  testCompile deps['com.google.truth.extensions:truth-java8-extension']
  testCompile deps['org.checkerframework:checker-qual']
@@ -677,9 +678,9 @@ Optional<List<String>> getToolArgsList() {

 // To run the nomulus tools with these command line tokens:
 // "--foo", "bar baz", "--qux=quz"
-//   gradle registryTool --args="--foo 'bar baz' --qux=quz"
+//   gradle core:registryTool --args="--foo 'bar baz' --qux=quz"
 // or:
-//   gradle registryTool --PtoolArgs="--foo|bar baz|--qux=quz"
+//   gradle core:registryTool -PtoolArgs="--foo|bar baz|--qux=quz"
 // Note that the delimiting pipe can be backslash escaped if it is part of a
 // parameter.
 ext.createToolTask = {
@@ -707,7 +708,7 @@ createToolTask(
    'initSqlPipeline', 'google.registry.beam.initsql.InitSqlPipeline')

 createToolTask(
-    'validateSqlPipeline', 'google.registry.beam.comparedb.ValidateSqlPipeline')
+    'validateDatabasePipeline', 'google.registry.beam.comparedb.ValidateDatabasePipeline')


 createToolTask(
@@ -794,6 +795,16 @@ if (environment == 'alpha') {
              mainClass: 'google.registry.beam.rde.RdePipeline',
              metaData : 'google/registry/beam/rde_pipeline_metadata.json'
          ],
+      validateDatabase  :
+          [
+              mainClass: 'google.registry.beam.comparedb.ValidateDatabasePipeline',
+              metaData: 'google/registry/beam/validate_database_pipeline_metadata.json'
+          ],
+      resaveAllEppResources:
+          [
+              mainClass: 'google.registry.beam.resave.ResaveAllEppResourcesPipeline',
+              metaData: 'google/registry/beam/resave_all_epp_resources_pipeline_metadata.json'
+          ],
  ]
  project.tasks.create("stageBeamPipelines") {
    doLast {
--- a/core/gradle/dependency-locks/annotationProcessor.lockfile
+++ b/core/gradle/dependency-locks/annotationProcessor.lockfile
@@ -3,41 +3,43 @@
 # This file is expected to be part of source control.
 com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.service:auto-service:1.0-rc7
-com.google.auto.value:auto-value:1.7.4
-com.google.auto:auto-common:0.10
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.service:auto-service:1.0.1
+com.google.auto.value:auto-value:1.9
+com.google.auto:auto-common:1.2
 com.google.code.findbugs:jFormatString:3.0.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-compiler:2.33
-com.google.dagger:dagger-producers:2.33
-com.google.dagger:dagger-spi:2.33
-com.google.dagger:dagger:2.33
+com.google.dagger:dagger-compiler:2.41
+com.google.dagger:dagger-producers:2.41
+com.google.dagger:dagger-spi:2.41
+com.google.dagger:dagger:2.41
+com.google.devtools.ksp:symbol-processing-api:1.5.30-1.0.0
 com.google.errorprone:error_prone_annotation:2.3.4
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.7.1
 com.google.errorprone:error_prone_check_api:2.3.4
 com.google.errorprone:error_prone_core:2.3.4
 com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.squareup:javapoet:1.13.0
-javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.persistence:javax.persistence-api:2.2
 net.ltgt.gradle.incap:incap:0.2
-org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.12.0
 org.checkerframework:dataflow:3.0.0
 org.checkerframework:javacutil:3.0.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20
-org.jetbrains.kotlin:kotlin-stdlib:1.4.20
-org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib:1.5.32
+org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0
 org.jetbrains:annotations:13.0
 org.pcollections:pcollections:2.1.2
 org.plumelib:plume-util:1.0.6
--- a/core/gradle/dependency-locks/compile.lockfile
+++ b/core/gradle/dependency-locks/compile.lockfile
@@ -5,146 +5,154 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 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.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -152,34 +160,43 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -187,87 +204,89 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 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:database-commons:1.15.2
-org.testcontainers:jdbc:1.15.2
-org.testcontainers:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/compileClasspath.lockfile
+++ b/core/gradle/dependency-locks/compileClasspath.lockfile
@@ -5,144 +5,153 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 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.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -150,117 +159,123 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.44.0
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.44.0
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.44.1
+io.grpc:grpc-grpclb:1.44.0
+io.grpc:grpc-netty-shaded:1.44.0
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+joda-time:joda-time:2.10.10
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 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:database-commons:1.15.2
-org.testcontainers:jdbc:1.15.2
-org.testcontainers:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/default.lockfile
+++ b/core/gradle/dependency-locks/default.lockfile
@@ -5,151 +5,155 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud.sql:postgres-socket-factory:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud.sql:postgres-socket-factory:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -157,37 +161,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -195,94 +212,95 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
-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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:2.0.0-alpha7
+org.slf4j:slf4j-jdk14:2.0.0-alpha7
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/deploy_jar.lockfile
+++ b/core/gradle/dependency-locks/deploy_jar.lockfile
@@ -5,151 +5,155 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud.sql:postgres-socket-factory:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud.sql:postgres-socket-factory:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -157,37 +161,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -195,93 +212,93 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
-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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:2.0.0-alpha7
+org.slf4j:slf4j-jdk14:2.0.0-alpha7
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/jaxb.lockfile
+++ b/core/gradle/dependency-locks/jaxb.lockfile
@@ -4,7 +4,9 @@
 com.sun.activation:jakarta.activation:1.2.2
 com.sun.activation:javax.activation:1.2.0
 com.sun.xml.bind:jaxb-impl:2.3.3
-com.sun.xml.bind:jaxb-osgi:2.3.3
+com.sun.xml.bind:jaxb-osgi:4.0.0-M4
 com.sun.xml.bind:jaxb-xjc:2.3.3
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
-javax.xml.bind:jaxb-api:2.3.0
+jakarta.activation:jakarta.activation-api:2.1.0
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.0
+javax.activation:javax.activation-api:1.2.0
+javax.xml.bind:jaxb-api:2.4.0-b180830.0359
--- a/core/gradle/dependency-locks/nonprodCompile.lockfile
+++ b/core/gradle/dependency-locks/nonprodCompile.lockfile
@@ -5,146 +5,154 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 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.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -152,34 +160,43 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -187,87 +204,89 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 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:database-commons:1.15.2
-org.testcontainers:jdbc:1.15.2
-org.testcontainers:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile
+++ b/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile
@@ -5,144 +5,153 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 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.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.15.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -150,118 +159,125 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.44.0
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.44.0
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.44.1
+io.grpc:grpc-grpclb:1.44.0
+io.grpc:grpc-netty-shaded:1.44.0
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 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:database-commons:1.15.2
-org.testcontainers:jdbc:1.15.2
-org.testcontainers:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/nonprodRuntime.lockfile
+++ b/core/gradle/dependency-locks/nonprodRuntime.lockfile
@@ -5,150 +5,154 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -156,37 +160,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -194,93 +211,94 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile
+++ b/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile
@@ -5,150 +5,154 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -156,37 +160,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -194,93 +211,94 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/runtime.lockfile
+++ b/core/gradle/dependency-locks/runtime.lockfile
@@ -5,150 +5,154 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -156,37 +160,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -194,93 +211,94 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
-junit:junit:4.13.1
+joda-time:joda-time:2.10.10
+junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
+org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.35
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -5,151 +5,155 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.1
-com.fasterxml.jackson.core:jackson-core:2.12.1
-com.fasterxml.jackson.core:jackson-databind:2.12.1
-com.fasterxml.jackson:jackson-bom:2.12.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.31.3
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.79.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud.sql:postgres-socket-factory:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.94.1
-com.google.cloud:google-cloud-core:1.94.3
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.113.12
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud.sql:postgres-socket-factory:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.0
-com.google.http-client:google-http-client-appengine:1.39.0
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.0
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.4
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -157,37 +161,50 @@ com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.65
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -195,93 +212,93 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy:1.10.17
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.5
+org.apache.commons:commons-lang3:3.12.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.httpcomponents:httpcore:4.4.15
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
-org.hamcrest:hamcrest-core:2.1
 org.hamcrest:hamcrest:2.1
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
+org.jsoup:jsoup:1.14.3
 org.jvnet.staxex:stax-ex:1.8
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
-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:postgresql:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:2.0.0-alpha7
+org.slf4j:slf4j-jdk14:2.0.0-alpha7
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/soy.lockfile
+++ b/core/gradle/dependency-locks/soy.lockfile
@@ -12,10 +12,10 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.inject.extensions:guice-multibindings:4.1.0
-com.google.inject:guice:5.0.1
+com.google.inject:guice:5.1.0
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jsinterop:jsinterop-annotations:1.0.1
-com.google.protobuf:protobuf-java:3.13.0
+com.google.protobuf:protobuf-java:4.0.0-rc-2
 com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 javax.annotation:jsr250-api:1.0
--- a/core/gradle/dependency-locks/testAnnotationProcessor.lockfile
+++ b/core/gradle/dependency-locks/testAnnotationProcessor.lockfile
@@ -3,39 +3,41 @@
 # This file is expected to be part of source control.
 com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.google.auto.value:auto-value:1.7.4
+com.google.auto.value:auto-value:1.9
 com.google.auto:auto-common:0.10
 com.google.code.findbugs:jFormatString:3.0.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-compiler:2.33
-com.google.dagger:dagger-producers:2.33
-com.google.dagger:dagger-spi:2.33
-com.google.dagger:dagger:2.33
+com.google.dagger:dagger-compiler:2.41
+com.google.dagger:dagger-producers:2.41
+com.google.dagger:dagger-spi:2.41
+com.google.dagger:dagger:2.41
+com.google.devtools.ksp:symbol-processing-api:1.5.30-1.0.0
 com.google.errorprone:error_prone_annotation:2.3.4
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.7.1
 com.google.errorprone:error_prone_check_api:2.3.4
 com.google.errorprone:error_prone_core:2.3.4
 com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.squareup:javapoet:1.13.0
-javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.persistence:javax.persistence-api:2.2
 net.ltgt.gradle.incap:incap:0.2
-org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.12.0
 org.checkerframework:dataflow:3.0.0
 org.checkerframework:javacutil:3.0.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20
-org.jetbrains.kotlin:kotlin-stdlib:1.4.20
-org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32
+org.jetbrains.kotlin:kotlin-stdlib:1.5.32
+org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0
 org.jetbrains:annotations:13.0
 org.pcollections:pcollections:2.1.2
 org.plumelib:plume-util:1.0.6
--- a/core/gradle/dependency-locks/testCompile.lockfile
+++ b/core/gradle/dependency-locks/testCompile.lockfile
@@ -5,131 +5,139 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.12.3
-com.fasterxml.jackson.core:jackson-core:2.12.3
-com.fasterxml.jackson.core:jackson-databind:2.12.3
-com.fasterxml.jackson:jackson-bom:2.12.3
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.32.1
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.83.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-api-stubs:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-api-stubs:2.0.4
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.95.4
-com.google.cloud:google-cloud-core:1.95.4
-com.google.cloud:google-cloud-nio:0.123.4
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.118.0
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-nio:0.123.28
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava-testlib:30.1.1-jre
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava-testlib:31.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.2
-com.google.http-client:google-http-client-appengine:1.39.2
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.2
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -137,20 +145,20 @@ com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.5
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -161,34 +169,43 @@ com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.102
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -196,106 +213,106 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 junit:junit:4.13.2
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-direct-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-direct-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
-org.apache.ftpserver:ftplet-api:1.0.6
-org.apache.ftpserver:ftpserver-core:1.0.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
+org.apache.ftpserver:ftplet-api:1.2.0
+org.apache.ftpserver:ftpserver-core:1.2.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.apache.mina:mina-core:2.0.4
+org.apache.httpcomponents:httpcore:4.4.15
+org.apache.mina:mina-core:2.1.6
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
 org.apache.sshd:sshd-sftp:2.0.0
-org.apache.tomcat:tomcat-annotations-api:8.0.5
-org.apiguardian:apiguardian-api:1.1.0
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.tomcat:tomcat-annotations-api:10.1.0-M14
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:2.2
 org.hamcrest:hamcrest-library:2.2
 org.hamcrest:hamcrest:2.2
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
-org.junit-pioneer:junit-pioneer:0.7.0
-org.junit.jupiter:junit-jupiter-api:5.7.0
-org.junit.jupiter:junit-jupiter-engine:5.7.0
-org.junit.jupiter:junit-jupiter-migrationsupport: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.jsoup:jsoup:1.14.3
+org.junit-pioneer:junit-pioneer:1.7.0
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2
+org.junit.jupiter:junit-jupiter-params:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit.platform:junit-platform-launcher:1.8.2
+org.junit.platform:junit-platform-runner:1.8.2
+org.junit.platform:junit-platform-suite-api:1.8.2
+org.junit.platform:junit-platform-suite-commons:1.8.2
+org.junit:junit-bom:5.8.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:3.7.7
-org.mockito:mockito-junit-jupiter:3.7.7
+org.mockito:mockito-core:4.5.1
+org.mockito:mockito-junit-jupiter:4.5.1
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
-org.objenesis:objenesis:3.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.seleniumhq.selenium:selenium-api:3.141.59
 org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
 org.seleniumhq.selenium:selenium-edge-driver:3.141.59
@@ -306,18 +323,20 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-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:selenium:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.36
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:junit-jupiter:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:selenium:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,129 +5,138 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.12.3
-com.fasterxml.jackson.core:jackson-core:2.12.3
-com.fasterxml.jackson.core:jackson-databind:2.12.3
-com.fasterxml.jackson:jackson-bom:2.12.3
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.32.1
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.83.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-api-stubs:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-api-stubs:2.0.4
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.95.4
-com.google.cloud:google-cloud-core:1.95.4
-com.google.cloud:google-cloud-nio:0.123.4
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.118.0
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-nio:0.123.28
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava-testlib:30.1.1-jre
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava-testlib:31.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.2
-com.google.http-client:google-http-client-appengine:1.39.2
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.2
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -135,20 +144,20 @@ com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.5
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -159,137 +168,142 @@ com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.102
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+dnsjava:dnsjava:3.5.0
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
+io.grpc:grpc-alts:1.44.0
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.44.0
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.44.1
+io.grpc:grpc-grpclb:1.44.0
+io.grpc:grpc-netty-shaded:1.44.0
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 junit:junit:4.13.2
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-direct-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-direct-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
-org.apache.ftpserver:ftplet-api:1.0.6
-org.apache.ftpserver:ftpserver-core:1.0.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
+org.apache.ftpserver:ftplet-api:1.2.0
+org.apache.ftpserver:ftpserver-core:1.2.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.6.2
-org.apache.mina:mina-core:2.0.4
+org.apache.httpcomponents:httpcore:4.4.15
+org.apache.mina:mina-core:2.1.6
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
 org.apache.sshd:sshd-sftp:2.0.0
-org.apache.tomcat:tomcat-annotations-api:8.0.5
-org.apiguardian:apiguardian-api:1.1.0
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.tomcat:tomcat-annotations-api:10.1.0-M14
+org.apiguardian:apiguardian-api:1.1.2
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:2.2
 org.hamcrest:hamcrest-library:2.2
 org.hamcrest:hamcrest:2.2
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
-org.junit-pioneer:junit-pioneer:0.7.0
-org.junit.jupiter:junit-jupiter-api:5.7.0
-org.junit.jupiter:junit-jupiter-engine:5.7.0
-org.junit.jupiter:junit-jupiter-migrationsupport: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.jsoup:jsoup:1.14.3
+org.junit-pioneer:junit-pioneer:1.7.0
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2
+org.junit.jupiter:junit-jupiter-params:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit.platform:junit-platform-launcher:1.8.2
+org.junit.platform:junit-platform-runner:1.8.2
+org.junit.platform:junit-platform-suite-api:1.8.2
+org.junit:junit-bom:5.8.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:3.7.7
-org.mockito:mockito-junit-jupiter:3.7.7
+org.mockito:mockito-core:4.5.1
+org.mockito:mockito-junit-jupiter:4.5.1
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
-org.objenesis:objenesis:3.1
+org.objenesis:objenesis:1.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.seleniumhq.selenium:selenium-api:3.141.59
 org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
 org.seleniumhq.selenium:selenium-edge-driver:3.141.59
@@ -300,18 +314,20 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-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:selenium:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.36
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:junit-jupiter:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:selenium:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/testRuntime.lockfile
+++ b/core/gradle/dependency-locks/testRuntime.lockfile
@@ -5,136 +5,140 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.3
-com.fasterxml.jackson.core:jackson-core:2.12.3
-com.fasterxml.jackson.core:jackson-databind:2.12.3
-com.fasterxml.jackson:jackson-bom:2.12.3
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.32.1
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.83.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-api-stubs:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-api-stubs:2.0.4
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud.sql:postgres-socket-factory:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.95.4
-com.google.cloud:google-cloud-core:1.95.4
-com.google.cloud:google-cloud-nio:0.123.4
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.118.0
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud.sql:postgres-socket-factory:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-nio:0.123.28
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava-testlib:30.1.1-jre
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava-testlib:31.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.2
-com.google.http-client:google-http-client-appengine:1.39.2
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.2
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -142,20 +146,20 @@ com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.5
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -166,38 +170,51 @@ com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.102
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
 io.github.java-diff-utils:java-diff-utils:4.9
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -205,108 +222,107 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-direct-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-direct-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
-org.apache.ftpserver:ftplet-api:1.0.6
-org.apache.ftpserver:ftpserver-core:1.0.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
+org.apache.ftpserver:ftplet-api:1.2.0
+org.apache.ftpserver:ftpserver-core:1.2.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.apache.mina:mina-core:2.0.4
+org.apache.httpcomponents:httpcore:4.4.15
+org.apache.mina:mina-core:2.1.6
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
 org.apache.sshd:sshd-sftp:2.0.0
-org.apache.tomcat:tomcat-annotations-api:8.0.5
-org.apiguardian:apiguardian-api:1.1.0
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.tomcat:tomcat-annotations-api:10.1.0-M14
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:2.2
 org.hamcrest:hamcrest-library:2.2
 org.hamcrest:hamcrest:2.2
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
-org.junit-pioneer:junit-pioneer:0.7.0
-org.junit.jupiter:junit-jupiter-api:5.7.0
-org.junit.jupiter:junit-jupiter-engine:5.7.0
-org.junit.jupiter:junit-jupiter-migrationsupport: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.jsoup:jsoup:1.14.3
+org.junit-pioneer:junit-pioneer:1.7.0
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2
+org.junit.jupiter:junit-jupiter-params:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit.platform:junit-platform-launcher:1.8.2
+org.junit.platform:junit-platform-runner:1.8.2
+org.junit.platform:junit-platform-suite-api:1.8.2
+org.junit.platform:junit-platform-suite-commons:1.8.2
+org.junit:junit-bom:5.8.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:3.7.7
-org.mockito:mockito-junit-jupiter:3.7.7
+org.mockito:mockito-core:4.5.1
+org.mockito:mockito-junit-jupiter:4.5.1
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
-org.objenesis:objenesis:3.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.seleniumhq.selenium:selenium-api:3.141.59
 org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
 org.seleniumhq.selenium:selenium-edge-driver:3.141.59
@@ -319,19 +335,21 @@ org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
 org.slf4j:jcl-over-slf4j:1.7.30
 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:selenium:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:1.7.36
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:junit-jupiter:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:selenium:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,136 +5,140 @@ antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
+com.101tec:zkclient:0.10
 com.beust:jcommander:1.60
-com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
-com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
-com.fasterxml.jackson.core:jackson-annotations:2.12.3
-com.fasterxml.jackson.core:jackson-core:2.12.3
-com.fasterxml.jackson.core:jackson-databind:2.12.3
-com.fasterxml.jackson:jackson-bom:2.12.3
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
+com.fasterxml.jackson:jackson-bom:2.13.2
 com.fasterxml:classmate:1.5.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.github.jnr:jffi:1.3.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
+com.github.docker-java:docker-java-api:3.2.13
+com.github.docker-java:docker-java-transport-zerodep:3.2.13
+com.github.docker-java:docker-java-transport:3.2.13
+com.github.jnr:jffi:1.3.9
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.10.1
-com.github.jnr:jnr-enxio:0.32.3
-com.github.jnr:jnr-ffi:2.2.1
-com.github.jnr:jnr-posix:3.1.4
-com.github.jnr:jnr-unixsocket:0.38.5
+com.github.jnr:jnr-constants:0.10.3
+com.github.jnr:jnr-enxio:0.32.13
+com.github.jnr:jnr-ffi:2.2.11
+com.github.jnr:jnr-posix:3.1.15
+com.github.jnr:jnr-unixsocket:0.38.17
 com.github.jnr:jnr-x86asm:1.0.2
-com.github.rholder:guava-retrying:2.0.0
 com.google.android:annotations:4.1.1.4
-com.google.api-client:google-api-client-appengine:1.31.3
-com.google.api-client:google-api-client-jackson2:1.30.10
-com.google.api-client:google-api-client-java6:1.31.3
-com.google.api-client:google-api-client-servlet:1.31.3
-com.google.api-client:google-api-client:1.32.1
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.14.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.90.3
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:grpc-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:grpc-google-common-protos:1.18.1
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:1.5.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.105.5
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:1.16.1
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.88.9
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:0.7.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:1.4.0
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.4.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-spanner-v1:2.0.2
-com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.89.2
-com.google.api.grpc:proto-google-common-protos:2.3.2
-com.google.api.grpc:proto-google-iam-v1:1.0.14
-com.google.api:api-common:1.10.4
-com.google.api:gax-grpc:1.66.0
-com.google.api:gax-httpjson:0.83.0
-com.google.api:gax:1.66.0
+com.google.api-client:google-api-client-appengine:1.34.0
+com.google.api-client:google-api-client-jackson2:1.32.2
+com.google.api-client:google-api-client-java6:1.34.0
+com.google.api-client:google-api-client-servlet:1.34.0
+com.google.api-client:google-api-client:1.34.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.97.5
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:grpc-google-common-protos:2.7.2
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.10.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.134.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.134.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.5.3
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.93.4
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.0.14
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.5.0
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.1.7
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.1.7
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.20.0
+com.google.api.grpc:proto-google-cloud-storage-v2:2.0.1-alpha
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.1.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.91.11
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.91.11
+com.google.api.grpc:proto-google-common-protos:2.8.3
+com.google.api.grpc:proto-google-iam-v1:1.3.1
+com.google.api:api-common:2.1.5
+com.google.api:gax-grpc:2.16.0
+com.google.api:gax-httpjson:0.101.0
+com.google.api:gax:2.16.0
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0
-com.google.apis:google-api-services-appengine:v1-rev130-1.25.0
-com.google.apis:google-api-services-bigquery:v2-rev20200916-1.30.10
-com.google.apis:google-api-services-clouddebugger:v2-rev20200501-1.30.10
-com.google.apis:google-api-services-cloudkms:v1-rev108-1.25.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200720-1.30.10
-com.google.apis:google-api-services-dataflow:v1b3-rev20200713-1.30.10
+com.google.apis:google-api-services-appengine:v1-rev20220326-1.32.1
+com.google.apis:google-api-services-bigquery:v2-rev20211129-1.32.1
+com.google.apis:google-api-services-clouddebugger:v2-rev20210813-1.32.1
+com.google.apis:google-api-services-cloudkms:v1-rev20220415-1.32.1
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-1.32.1
+com.google.apis:google-api-services-dataflow:v1b3-rev20210818-1.32.1
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0
-com.google.apis:google-api-services-groupssettings:v1-rev82-1.25.0
-com.google.apis:google-api-services-healthcare:v1beta1-rev20200713-1.30.10
-com.google.apis:google-api-services-iamcredentials:v1-rev20201022-1.30.10
-com.google.apis:google-api-services-monitoring:v3-rev540-1.25.0
-com.google.apis:google-api-services-pubsub:v1-rev20200713-1.30.10
-com.google.apis:google-api-services-sheets:v4-rev612-1.25.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20210119-1.31.0
-com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1
+com.google.apis:google-api-services-groupssettings:v1-rev20210624-1.32.1
+com.google.apis:google-api-services-healthcare:v1-rev20211016-1.32.1
+com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1
+com.google.apis:google-api-services-monitoring:v3-rev20220322-1.32.1
+com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1
+com.google.apis:google-api-services-sheets:v4-rev20220411-1.32.1
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20220310-1.32.1
+com.google.apis:google-api-services-storage:v1-rev20220401-1.32.1
 com.google.appengine.tools:appengine-gcs-client:0.8.1
 com.google.appengine.tools:appengine-mapreduce:0.9
 com.google.appengine.tools:appengine-pipeline:0.2.13
 com.google.appengine:appengine-api-1.0-sdk:1.9.86
-com.google.appengine:appengine-api-stubs:1.9.86
-com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-api-stubs:2.0.4
+com.google.appengine:appengine-remote-api:2.0.4
 com.google.appengine:appengine-testing:1.9.86
-com.google.auth:google-auth-library-credentials:0.26.0
-com.google.auth:google-auth-library-oauth2-http:0.26.0
-com.google.auto.service:auto-service-annotations:1.0-rc7
-com.google.auto.value:auto-value-annotations:1.8.1
-com.google.auto.value:auto-value:1.7.4
-com.google.cloud.bigdataoss:gcsio:2.1.6
-com.google.cloud.bigdataoss:util:2.1.6
-com.google.cloud.bigtable:bigtable-client-core:1.16.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.3
-com.google.cloud.sql:jdbc-socket-factory-core:1.2.1
-com.google.cloud.sql:postgres-socket-factory:1.2.1
-com.google.cloud:google-cloud-bigquery:1.122.2
-com.google.cloud:google-cloud-bigquerystorage:1.5.5
-com.google.cloud:google-cloud-bigtable:1.14.0
-com.google.cloud:google-cloud-core-grpc:1.93.9
-com.google.cloud:google-cloud-core-http:1.95.4
-com.google.cloud:google-cloud-core:1.95.4
-com.google.cloud:google-cloud-nio:0.123.4
-com.google.cloud:google-cloud-pubsub:1.110.0
-com.google.cloud:google-cloud-pubsublite:0.7.0
-com.google.cloud:google-cloud-secretmanager:1.4.0
-com.google.cloud:google-cloud-spanner:2.0.2
-com.google.cloud:google-cloud-storage:1.118.0
-com.google.cloud:google-cloud-tasks:1.33.2
+com.google.auth:google-auth-library-credentials:1.6.0
+com.google.auth:google-auth-library-oauth2-http:1.6.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.value:auto-value-annotations:1.9
+com.google.auto.value:auto-value:1.9
+com.google.cloud.bigdataoss:gcsio:2.2.4
+com.google.cloud.bigdataoss:util:2.2.4
+com.google.cloud.bigtable:bigtable-client-core:1.25.1
+com.google.cloud.bigtable:bigtable-metrics-api:1.25.1
+com.google.cloud.datastore:datastore-v1-proto-client:2.1.3
+com.google.cloud.sql:jdbc-socket-factory-core:1.5.0
+com.google.cloud.sql:postgres-socket-factory:1.5.0
+com.google.cloud:google-cloud-bigquerystorage:2.10.0
+com.google.cloud:google-cloud-bigtable:1.27.1
+com.google.cloud:google-cloud-core-grpc:2.4.0
+com.google.cloud:google-cloud-core-http:2.6.0
+com.google.cloud:google-cloud-core:2.6.0
+com.google.cloud:google-cloud-firestore:3.0.14
+com.google.cloud:google-cloud-nio:0.123.28
+com.google.cloud:google-cloud-pubsub:1.116.0
+com.google.cloud:google-cloud-pubsublite:1.5.0
+com.google.cloud:google-cloud-secretmanager:2.1.7
+com.google.cloud:google-cloud-spanner:6.20.0
+com.google.cloud:google-cloud-storage:2.6.1
+com.google.cloud:google-cloud-tasks:2.1.11
+com.google.cloud:grpc-gcp:1.1.0
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.0.14
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.7
+com.google.code.gson:gson:2.9.0
 com.google.common.html.types:types:1.0.6
-com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.dagger:dagger:2.41
+com.google.errorprone:error_prone_annotations:2.13.0
 com.google.escapevelocity:escapevelocity:0.9.1
-com.google.flogger:flogger-system-backend:0.5.1
-com.google.flogger:flogger:0.5.1
-com.google.flogger:google-extensions:0.5.1
+com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.flogger:google-extensions:0.7.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava-testlib:30.1.1-jre
-com.google.guava:guava:30.1.1-jre
+com.google.guava:guava-testlib:31.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.gwt:gwt-user:2.9.0
-com.google.http-client:google-http-client-apache-v2:1.39.2
-com.google.http-client:google-http-client-appengine:1.39.2
-com.google.http-client:google-http-client-gson:1.39.2
-com.google.http-client:google-http-client-jackson2:1.39.2
-com.google.http-client:google-http-client-protobuf:1.33.0
-com.google.http-client:google-http-client:1.39.2
+com.google.http-client:google-http-client-apache-v2:1.41.7
+com.google.http-client:google-http-client-appengine:1.41.7
+com.google.http-client:google-http-client-gson:1.41.7
+com.google.http-client:google-http-client-jackson2:1.41.7
+com.google.http-client:google-http-client-protobuf:1.40.1
+com.google.http-client:google-http-client:1.41.7
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -142,20 +146,20 @@ com.google.jsinterop:jsinterop-annotations:2.0.0
 com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
-com.google.oauth-client:google-oauth-client-appengine:1.31.4
-com.google.oauth-client:google-oauth-client-java6:1.31.4
-com.google.oauth-client:google-oauth-client-jetty:1.31.4
-com.google.oauth-client:google-oauth-client-servlet:1.31.4
-com.google.oauth-client:google-oauth-client:1.31.5
-com.google.protobuf:protobuf-java-util:3.17.3
-com.google.protobuf:protobuf-java:3.17.3
+com.google.oauth-client:google-oauth-client-appengine:1.33.3
+com.google.oauth-client:google-oauth-client-java6:1.33.3
+com.google.oauth-client:google-oauth-client-jetty:1.33.3
+com.google.oauth-client:google-oauth-client-servlet:1.33.3
+com.google.oauth-client:google-oauth-client:1.33.3
+com.google.protobuf:protobuf-java-util:3.19.4
+com.google.protobuf:protobuf-java:3.19.4
 com.google.re2j:re2j:1.6
 com.google.template:soy:2021-02-01
-com.google.truth.extensions:truth-java8-extension:1.1.2
-com.google.truth:truth:1.1.2
+com.google.truth.extensions:truth-java8-extension:1.1.3
+com.google.truth:truth:1.1.3
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:68.2
+com.ibm.icu:icu4j:71.1
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -166,38 +170,51 @@ com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.4.5
 commons-codec:commons-codec:1.15
 commons-logging:commons-logging:1.2
-dnsjava:dnsjava:3.3.1
+dnsjava:dnsjava:3.5.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
 guru.nidi.com.kitfox:svgSalamander:1.1.3
-guru.nidi:graphviz-java-all-j2v8:0.17.0
-guru.nidi:graphviz-java:0.17.0
-io.dropwizard.metrics:metrics-core:3.2.6
-io.github.classgraph:classgraph:4.8.102
+guru.nidi:graphviz-java-all-j2v8:0.18.1
+guru.nidi:graphviz-java:0.18.1
+io.confluent:common-config:5.3.2
+io.confluent:common-utils:5.3.2
+io.confluent:kafka-avro-serializer:5.3.2
+io.confluent:kafka-schema-registry-client:5.3.2
+io.dropwizard.metrics:metrics-core:3.1.2
+io.github.classgraph:classgraph:4.8.104
 io.github.java-diff-utils:java-diff-utils:4.9
-io.grpc:grpc-alts:1.39.0
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-auth:1.39.0
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-grpclb:1.39.0
-io.grpc:grpc-netty-shaded:1.39.0
-io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.51.Final
-io.netty:netty-codec-http2:4.1.51.Final
-io.netty:netty-codec-http:4.1.51.Final
-io.netty:netty-codec-socks:4.1.51.Final
-io.netty:netty-codec:4.1.51.Final
-io.netty:netty-common:4.1.51.Final
-io.netty:netty-handler-proxy:4.1.51.Final
-io.netty:netty-handler:4.1.51.Final
-io.netty:netty-resolver:4.1.51.Final
-io.netty:netty-tcnative-boringssl-static:2.0.33.Final
-io.netty:netty-transport:4.1.51.Final
-io.opencensus:opencensus-api:0.28.0
-io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.28.0
+io.grpc:grpc-alts:1.45.1
+io.grpc:grpc-api:1.45.1
+io.grpc:grpc-auth:1.45.1
+io.grpc:grpc-context:1.45.1
+io.grpc:grpc-core:1.45.1
+io.grpc:grpc-googleapis:1.45.1
+io.grpc:grpc-grpclb:1.45.1
+io.grpc:grpc-netty-shaded:1.45.1
+io.grpc:grpc-netty:1.44.0
+io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-services:1.45.1
+io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-xds:1.45.1
+io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec:4.1.72.Final
+io.netty:netty-common:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler:4.1.72.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-boringssl-static:2.0.46.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-transport:4.1.72.Final
+io.opencensus:opencensus-api:0.31.0
+io.opencensus:opencensus-contrib-grpc-util:0.31.0
+io.opencensus:opencensus-contrib-http-util:0.31.0
+io.opencensus:opencensus-proto:0.2.0
 io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
@@ -205,108 +222,107 @@ javax.activation:javax.activation-api:1.2.0
 javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.jdo:jdo2-api:2.3-eb
-javax.mail:mail:1.4
+javax.jdo:jdo2-api:2.3-20090302111651
+javax.mail:mail:1.5.0-b01
 javax.persistence:javax.persistence-api:2.2
 javax.servlet:servlet-api:2.5
-javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.5
+joda-time:joda-time:2.10.10
 junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
-net.bytebuddy:byte-buddy-agent:1.10.19
-net.bytebuddy:byte-buddy:1.10.19
-net.java.dev.jna:jna:5.5.0
+net.bytebuddy:byte-buddy-agent:1.12.9
+net.bytebuddy:byte-buddy:1.12.9
+net.java.dev.jna:jna:5.8.0
+org.apache.arrow:arrow-format:5.0.0
+org.apache.arrow:arrow-memory-core:5.0.0
+org.apache.arrow:arrow-vector:5.0.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.28.0
-org.apache.beam:beam-model-job-management:2.28.0
-org.apache.beam:beam-model-pipeline:2.28.0
-org.apache.beam:beam-runners-core-construction-java:2.28.0
-org.apache.beam:beam-runners-core-java:2.28.0
-org.apache.beam:beam-runners-direct-java:2.28.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.28.0
-org.apache.beam:beam-runners-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-core:2.28.0
-org.apache.beam:beam-sdks-java-expansion-service:2.28.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.28.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.28.0
-org.apache.beam:beam-sdks-java-fn-execution:2.28.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.28.0
-org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
-org.apache.beam:beam-vendor-grpc-1_26_0:0.3
+org.apache.beam:beam-model-fn-execution:2.38.0
+org.apache.beam:beam-model-job-management:2.38.0
+org.apache.beam:beam-model-pipeline:2.38.0
+org.apache.beam:beam-runners-core-construction-java:2.38.0
+org.apache.beam:beam-runners-core-java:2.38.0
+org.apache.beam:beam-runners-direct-java:2.38.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.38.0
+org.apache.beam:beam-runners-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-core:2.38.0
+org.apache.beam:beam-sdks-java-expansion-service:2.38.0
+org.apache.beam:beam-sdks-java-extensions-arrow:2.38.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.38.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.38.0
+org.apache.beam:beam-sdks-java-fn-execution:2.38.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.38.0
+org.apache.beam:beam-sdks-java-io-kafka:2.38.0
+org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
+org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 org.apache.beam:beam-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
-org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.8.1
-org.apache.commons:commons-text:1.6
-org.apache.ftpserver:ftplet-api:1.0.6
-org.apache.ftpserver:ftpserver-core:1.0.6
+org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-text:1.9
+org.apache.ftpserver:ftplet-api:1.2.0
+org.apache.ftpserver:ftpserver-core:1.2.0
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.14
-org.apache.logging.log4j:log4j-api:2.13.3
-org.apache.logging.log4j:log4j-core:2.13.3
-org.apache.mina:mina-core:2.0.4
+org.apache.httpcomponents:httpcore:4.4.15
+org.apache.mina:mina-core:2.1.6
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
 org.apache.sshd:sshd-sftp:2.0.0
-org.apache.tomcat:tomcat-annotations-api:8.0.5
-org.apiguardian:apiguardian-api:1.1.0
-org.bouncycastle:bcpg-jdk15on:1.61
-org.bouncycastle:bcpkix-jdk15on:1.61
-org.bouncycastle:bcprov-jdk15on:1.61
+org.apache.tomcat:tomcat-annotations-api:10.1.0-M14
+org.bouncycastle:bcpg-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.21.4
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13
-org.codehaus.mojo:animal-sniffer-annotations:1.20
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
-org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.flywaydb:flyway-core:5.2.4
+org.flywaydb:flyway-core:8.5.10
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:2.2
 org.hamcrest:hamcrest-library:2.2
 org.hamcrest:hamcrest:2.2
 org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
-org.hibernate:hibernate-core:5.4.23.Final
-org.hibernate:hibernate-hikaricp:5.4.23.Final
-org.javassist:javassist:3.24.0-GA
-org.jboss.logging:jboss-logging:3.4.1.Final
+org.hibernate:hibernate-core:5.6.8.Final
+org.hibernate:hibernate-hikaricp:5.6.8.Final
+org.jboss.logging:jboss-logging:3.4.3.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.1.3.Final
+org.jboss:jandex:2.4.2.Final
+org.jetbrains:annotations:17.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20200518
-org.jsoup:jsoup:1.13.1
-org.junit-pioneer:junit-pioneer:0.7.0
-org.junit.jupiter:junit-jupiter-api:5.7.0
-org.junit.jupiter:junit-jupiter-engine:5.7.0
-org.junit.jupiter:junit-jupiter-migrationsupport: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.jsoup:jsoup:1.14.3
+org.junit-pioneer:junit-pioneer:1.7.0
+org.junit.jupiter:junit-jupiter-api:5.8.2
+org.junit.jupiter:junit-jupiter-engine:5.8.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2
+org.junit.jupiter:junit-jupiter-params:5.8.2
+org.junit.platform:junit-platform-commons:1.8.2
+org.junit.platform:junit-platform-engine:1.8.2
+org.junit.platform:junit-platform-launcher:1.8.2
+org.junit.platform:junit-platform-runner:1.8.2
+org.junit.platform:junit-platform-suite-api:1.8.2
+org.junit.platform:junit-platform-suite-commons:1.8.2
+org.junit:junit-bom:5.8.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:3.7.7
-org.mockito:mockito-junit-jupiter:3.7.7
+org.mockito:mockito-core:4.5.1
+org.mockito:mockito-junit-jupiter:4.5.1
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
-org.objenesis:objenesis:3.1
+org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-commons:9.0
-org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm:9.1
-org.postgresql:postgresql:42.2.18
+org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm:9.2
+org.postgresql:postgresql:42.3.4
 org.rnorth.duct-tape:duct-tape:1.0.8
-org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.seleniumhq.selenium:selenium-api:3.141.59
 org.seleniumhq.selenium:selenium-chrome-driver:3.141.59
 org.seleniumhq.selenium:selenium-edge-driver:3.141.59
@@ -319,20 +335,22 @@ org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
-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:selenium:1.15.2
-org.testcontainers:testcontainers:1.15.2
-org.threeten:threetenbp:1.5.1
+org.slf4j:slf4j-api:2.0.0-alpha7
+org.slf4j:slf4j-jdk14:2.0.0-alpha7
+org.springframework:spring-core:4.3.18.RELEASE
+org.springframework:spring-expression:4.3.18.RELEASE
+org.testcontainers:database-commons:1.17.1
+org.testcontainers:jdbc:1.17.1
+org.testcontainers:junit-jupiter:1.17.1
+org.testcontainers:postgresql:1.17.1
+org.testcontainers:selenium:1.17.1
+org.testcontainers:testcontainers:1.17.1
+org.threeten:threetenbp:1.6.0
 org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
-org.webjars.npm:viz.js-for-graphviz-java:2.1.3
-org.xerial.snappy:snappy-java:1.1.4
-org.yaml:snakeyaml:1.17
+org.webjars.npm:viz.js-graphviz-java:2.1.3
+org.xerial.snappy:snappy-java:1.1.8.4
+org.yaml:snakeyaml:1.30
 us.fatehi:schemacrawler-api:16.10.1
 us.fatehi:schemacrawler-diagram:16.10.1
 us.fatehi:schemacrawler-tools:16.10.1
--- a/core/src/main/java/google/registry/backup/BackupModule.java
+++ b/core/src/main/java/google/registry/backup/BackupModule.java
@@ -21,6 +21,7 @@ import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_
 import static google.registry.backup.RestoreCommitLogsAction.BUCKET_OVERRIDE_PARAM;
 import static google.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM;
 import static google.registry.backup.RestoreCommitLogsAction.TO_TIME_PARAM;
+import static google.registry.backup.SyncDatastoreToSqlSnapshotAction.SQL_SNAPSHOT_ID_PARAM;
 import static google.registry.request.RequestParameters.extractOptionalParameter;
 import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter;
 import static google.registry.request.RequestParameters.extractRequiredParameter;
@@ -98,6 +99,12 @@ public final class BackupModule {
    return extractRequiredDatetimeParameter(req, TO_TIME_PARAM);
  }

+  @Provides
+  @Parameter(SQL_SNAPSHOT_ID_PARAM)
+  static String provideSqlSnapshotId(HttpServletRequest req) {
+    return extractRequiredParameter(req, SQL_SNAPSHOT_ID_PARAM);
+  }
+
  @Provides
  @Backups
  static ListeningExecutorService provideListeningExecutorService() {
--- a/core/src/main/java/google/registry/backup/BackupUtils.java
+++ b/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. */
--- a/core/src/main/java/google/registry/backup/CommitLogCheckpointAction.java
+++ b/core/src/main/java/google/registry/backup/CommitLogCheckpointAction.java
@@ -17,20 +17,22 @@ package google.registry.backup;
 import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
 import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
 import static google.registry.model.ofy.ObjectifyService.auditedOfy;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
 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;
 import google.registry.request.Action.Service;
 import google.registry.request.auth.Auth;
-import google.registry.util.Clock;
 import google.registry.util.CloudTasksUtils;
+import java.util.Optional;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;

 /**
 * Action that saves commit log checkpoints to Datastore and kicks off a diff export task.
@@ -48,13 +50,29 @@ 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();

  private static final String QUEUE_NAME = "export-commits";

-  @Inject Clock clock;
+  /**
+   * The amount of time enqueueing should be delayed.
+   *
+   * <p>The {@link ExportCommitLogDiffAction} is enqueued in {@link CommitLogCheckpointAction},
+   * which is inside a Datastore transaction that persists the checkpoint to be exported. After the
+   * switch to CloudTasks API, the task may be invoked before the Datastore transaction commits.
+   * When this happens, the checkpoint is not found which leads to {@link
+   * com.google.common.base.VerifyException}.
+   *
+   * <p>In order to invoke the task after the transaction commits, a reasonable delay should be
+   * added to each task. The latency of the request is mostly in the range of 4-6 seconds; Choosing
+   * a value 30% greater than the upper bound should solve the issue invoking a task before the
+   * transaction commits.
+   */
+  static final Duration ENQUEUE_DELAY_SECONDS = Duration.standardSeconds(8);
+
  @Inject CommitLogCheckpointStrategy strategy;
  @Inject CloudTasksUtils cloudTasksUtils;

@@ -62,32 +80,48 @@ public final class CommitLogCheckpointAction implements Runnable {

  @Override
  public void run() {
+    createCheckPointAndStartAsyncExport();
+  }
+
+  /**
+   * Creates a {@link CommitLogCheckpoint} and initiates an asynchronous export task.
+   *
+   * @return the {@code CommitLogCheckpoint} to be exported
+   */
+  public Optional<CommitLogCheckpoint> createCheckPointAndStartAsyncExport() {
    final CommitLogCheckpoint checkpoint = strategy.computeCheckpoint();
    logger.atInfo().log(
        "Generated candidate checkpoint for time: %s", checkpoint.getCheckpointTime());
-    tm().transact(
-            () -> {
-              DateTime lastWrittenTime = CommitLogCheckpointRoot.loadRoot().getLastWrittenTime();
-              if (isBeforeOrAt(checkpoint.getCheckpointTime(), lastWrittenTime)) {
-                logger.atInfo().log(
-                    "Newer checkpoint already written at time: %s", lastWrittenTime);
-                return;
-              }
-              auditedOfy()
-                  .saveIgnoringReadOnlyWithoutBackup()
-                  .entities(
-                      checkpoint, CommitLogCheckpointRoot.create(checkpoint.getCheckpointTime()));
-              // Enqueue a diff task between previous and current checkpoints.
-              cloudTasksUtils.enqueue(
-                  QUEUE_NAME,
-                  CloudTasksUtils.createPostTask(
-                      ExportCommitLogDiffAction.PATH,
-                      Service.BACKEND.toString(),
-                      ImmutableMultimap.of(
-                          LOWER_CHECKPOINT_TIME_PARAM,
-                          lastWrittenTime.toString(),
-                          UPPER_CHECKPOINT_TIME_PARAM,
-                          checkpoint.getCheckpointTime().toString())));
-            });
+    boolean isCheckPointPersisted =
+        ofyTm()
+            .transact(
+                () -> {
+                  DateTime lastWrittenTime =
+                      CommitLogCheckpointRoot.loadRoot().getLastWrittenTime();
+                  if (isBeforeOrAt(checkpoint.getCheckpointTime(), lastWrittenTime)) {
+                    logger.atInfo().log(
+                        "Newer checkpoint already written at time: %s", lastWrittenTime);
+                    return false;
+                  }
+                  auditedOfy()
+                      .saveIgnoringReadOnlyWithoutBackup()
+                      .entities(
+                          checkpoint,
+                          CommitLogCheckpointRoot.create(checkpoint.getCheckpointTime()));
+                  // Enqueue a diff task between previous and current checkpoints.
+                  cloudTasksUtils.enqueue(
+                      QUEUE_NAME,
+                      cloudTasksUtils.createPostTaskWithDelay(
+                          ExportCommitLogDiffAction.PATH,
+                          Service.BACKEND.toString(),
+                          ImmutableMultimap.of(
+                              LOWER_CHECKPOINT_TIME_PARAM,
+                              lastWrittenTime.toString(),
+                              UPPER_CHECKPOINT_TIME_PARAM,
+                              checkpoint.getCheckpointTime().toString()),
+                          ENQUEUE_DELAY_SECONDS));
+                  return true;
+                });
+    return isCheckPointPersisted ? Optional.of(checkpoint) : Optional.empty();
  }
 }
--- a/core/src/main/java/google/registry/backup/CommitLogCheckpointStrategy.java
+++ b/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;
--- a/core/src/main/java/google/registry/backup/CommitLogImports.java
+++ b/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() {}
--- a/core/src/main/java/google/registry/backup/DeleteOldCommitLogsAction.java
+++ b/core/src/main/java/google/registry/backup/DeleteOldCommitLogsAction.java
@@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.model.ofy.ObjectifyService.auditedOfy;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;

@@ -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;
@@ -286,7 +288,8 @@ public final class DeleteOldCommitLogsAction implements Runnable {
      }

      DeletionResult deletionResult =
-          tm().transactNew(
+          ofyTm()
+              .transactNew(
                  () -> {
                    CommitLogManifest manifest = auditedOfy().load().key(manifestKey).now();
                    // It is possible that the same manifestKey was run twice, if a shard had to be
--- a/core/src/main/java/google/registry/backup/EntityImports.java
+++ b/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 {

  /**
--- a/core/src/main/java/google/registry/backup/ExportCommitLogDiffAction.java
+++ b/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();
--- a/core/src/main/java/google/registry/backup/GcsDiffFileLister.java
+++ b/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;
--- a/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java
+++ b/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,13 +69,17 @@ 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";

  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

-  private static final Duration LEASE_LENGTH = standardHours(1);
+  public static final String REPLAY_TO_SQL_LOCK_NAME =
+      ReplayCommitLogsToSqlAction.class.getSimpleName();
+
+  public static final Duration REPLAY_TO_SQL_LOCK_LEASE_LENGTH = standardHours(1);
  // Stop / pause where we are if we've been replaying for more than five minutes to avoid GAE
  // request timeouts
  private static final Duration REPLAY_TIMEOUT_DURATION = Duration.standardMinutes(5);
@@ -113,7 +118,11 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
    }
    Optional<Lock> lock =
        Lock.acquireSql(
-            this.getClass().getSimpleName(), null, LEASE_LENGTH, requestStatusChecker, false);
+            REPLAY_TO_SQL_LOCK_NAME,
+            null,
+            REPLAY_TO_SQL_LOCK_LEASE_LENGTH,
+            requestStatusChecker,
+            false);
    if (!lock.isPresent()) {
      String message = "Can't acquire SQL commit log replay lock, aborting.";
      logger.atSevere().log(message);
--- a/core/src/main/java/google/registry/backup/RestoreCommitLogsAction.java
+++ b/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();
--- a/core/src/main/java/google/registry/backup/SyncDatastoreToSqlSnapshotAction.java
+++ b/core/src/main/java/google/registry/backup/SyncDatastoreToSqlSnapshotAction.java
@@ -0,0 +1,187 @@
+// Copyright 2022 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.backup;
+
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+import com.google.common.flogger.FluentLogger;
+import google.registry.beam.comparedb.LatestDatastoreSnapshotFinder;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.model.annotations.DeleteAfterMigration;
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.replay.ReplicateToDatastoreAction;
+import google.registry.request.Action;
+import google.registry.request.Action.Service;
+import google.registry.request.Parameter;
+import google.registry.request.Response;
+import google.registry.request.auth.Auth;
+import google.registry.util.Sleeper;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Optional;
+import javax.inject.Inject;
+import org.joda.time.DateTime;
+import org.joda.time.Duration;
+
+/**
+ * Synchronizes Datastore to a given SQL snapshot when SQL is the primary database.
+ *
+ * <p>The caller takes the responsibility for:
+ *
+ * <ul>
+ *   <li>verifying the current migration stage
+ *   <li>acquiring the {@link ReplicateToDatastoreAction#REPLICATE_TO_DATASTORE_LOCK_NAME
+ *       replication lock}, and
+ *   <li>while holding the lock, creating an SQL snapshot and invoking this action with the snapshot
+ *       id
+ * </ul>
+ *
+ * The caller may release the replication lock upon receiving the response from this action. Please
+ * refer to {@link google.registry.tools.ValidateDatastoreCommand} for more information on usage.
+ *
+ * <p>This action plays SQL transactions up to the user-specified snapshot, creates a new CommitLog
+ * checkpoint, and exports all CommitLogs to GCS up to this checkpoint. The timestamp of this
+ * checkpoint can be used to recreate a Datastore snapshot that is equivalent to the given SQL
+ * snapshot. If this action succeeds, the checkpoint timestamp is included in the response (the
+ * format of which is defined by {@link #SUCCESS_RESPONSE_TEMPLATE}).
+ */
+@Action(
+    service = Service.BACKEND,
+    path = SyncDatastoreToSqlSnapshotAction.PATH,
+    method = Action.Method.POST,
+    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
+public class SyncDatastoreToSqlSnapshotAction implements Runnable {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  public static final String PATH = "/_dr/task/syncDatastoreToSqlSnapshot";
+
+  public static final String SUCCESS_RESPONSE_TEMPLATE =
+      "Datastore is up-to-date with provided SQL snapshot (%s). CommitLog timestamp is (%s).";
+
+  static final String SQL_SNAPSHOT_ID_PARAM = "sqlSnapshotId";
+
+  private static final int COMMITLOGS_PRESENCE_CHECK_ATTEMPTS = 10;
+  private static final Duration COMMITLOGS_PRESENCE_CHECK_DELAY = Duration.standardSeconds(6);
+
+  private final Response response;
+  private final Sleeper sleeper;
+
+  @Config("commitLogGcsBucket")
+  private final String gcsBucket;
+
+  private final GcsDiffFileLister gcsDiffFileLister;
+  private final LatestDatastoreSnapshotFinder datastoreSnapshotFinder;
+  private final CommitLogCheckpointAction commitLogCheckpointAction;
+  private final String sqlSnapshotId;
+
+  @Inject
+  SyncDatastoreToSqlSnapshotAction(
+      Response response,
+      Sleeper sleeper,
+      @Config("commitLogGcsBucket") String gcsBucket,
+      GcsDiffFileLister gcsDiffFileLister,
+      LatestDatastoreSnapshotFinder datastoreSnapshotFinder,
+      CommitLogCheckpointAction commitLogCheckpointAction,
+      @Parameter(SQL_SNAPSHOT_ID_PARAM) String sqlSnapshotId) {
+    this.response = response;
+    this.sleeper = sleeper;
+    this.gcsBucket = gcsBucket;
+    this.gcsDiffFileLister = gcsDiffFileLister;
+    this.datastoreSnapshotFinder = datastoreSnapshotFinder;
+    this.commitLogCheckpointAction = commitLogCheckpointAction;
+    this.sqlSnapshotId = sqlSnapshotId;
+  }
+
+  @Override
+  public void run() {
+    logger.atInfo().log("Datastore validation invoked. SqlSnapshotId is %s.", sqlSnapshotId);
+
+    try {
+      CommitLogCheckpoint checkpoint = ensureDatabasesComparable(sqlSnapshotId);
+      response.setStatus(SC_OK);
+      response.setPayload(
+          String.format(SUCCESS_RESPONSE_TEMPLATE, sqlSnapshotId, checkpoint.getCheckpointTime()));
+      return;
+    } catch (Throwable e) {
+      logger.atSevere().withCause(e).log("Failed to sync Datastore to SQL.");
+      response.setStatus(SC_INTERNAL_SERVER_ERROR);
+      response.setPayload(getStackTrace(e));
+    }
+  }
+
+  private static String getStackTrace(Throwable e) {
+    try {
+      ByteArrayOutputStream bis = new ByteArrayOutputStream();
+      PrintStream printStream = new PrintStream(bis);
+      e.printStackTrace(printStream);
+      printStream.close();
+      return bis.toString();
+    } catch (RuntimeException re) {
+      return re.getMessage();
+    }
+  }
+
+  private CommitLogCheckpoint ensureDatabasesComparable(String sqlSnapshotId) {
+    // Replicate SQL transaction to Datastore, up to when this snapshot is taken.
+    int playbacks = ReplicateToDatastoreAction.replayAllTransactions(Optional.of(sqlSnapshotId));
+    logger.atInfo().log("Played %s SQL transactions.", playbacks);
+
+    Optional<CommitLogCheckpoint> checkpoint = exportCommitLogs();
+    if (!checkpoint.isPresent()) {
+      throw new RuntimeException("Cannot create CommitLog checkpoint");
+    }
+    logger.atInfo().log(
+        "CommitLog checkpoint created at %s.", checkpoint.get().getCheckpointTime());
+    verifyCommitLogsPersisted(checkpoint.get());
+    return checkpoint.get();
+  }
+
+  private Optional<CommitLogCheckpoint> exportCommitLogs() {
+    // Trigger an async CommitLog export to GCS. Will check file availability later.
+    // Although we can add support to synchronous execution, it can disrupt the export cadence
+    // when the system is busy
+    Optional<CommitLogCheckpoint> checkpoint =
+        commitLogCheckpointAction.createCheckPointAndStartAsyncExport();
+
+    // Failure to create checkpoint most likely caused by race with cron-triggered checkpointing.
+    // Retry once.
+    if (!checkpoint.isPresent()) {
+      commitLogCheckpointAction.createCheckPointAndStartAsyncExport();
+    }
+    return checkpoint;
+  }
+
+  private void verifyCommitLogsPersisted(CommitLogCheckpoint checkpoint) {
+    DateTime exportStartTime =
+        datastoreSnapshotFinder
+            .getSnapshotInfo(checkpoint.getCheckpointTime().toInstant())
+            .exportInterval()
+            .getStart();
+    logger.atInfo().log("Found Datastore export at %s", exportStartTime);
+    for (int attempts = 0; attempts < COMMITLOGS_PRESENCE_CHECK_ATTEMPTS; attempts++) {
+      try {
+        gcsDiffFileLister.listDiffFiles(gcsBucket, exportStartTime, checkpoint.getCheckpointTime());
+        return;
+      } catch (IllegalStateException e) {
+        // Gap in commitlog files. Fall through to sleep and retry.
+        logger.atInfo().log("Commitlog files not yet found on GCS.");
+      }
+      sleeper.sleepInterruptibly(COMMITLOGS_PRESENCE_CHECK_DELAY);
+    }
+    throw new RuntimeException("Cannot find all commitlog files.");
+  }
+}
--- a/core/src/main/java/google/registry/backup/VersionedEntity.java
+++ b/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;
--- a/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java
+++ b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java
@@ -22,15 +22,17 @@ import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
 import com.google.appengine.api.taskqueue.TransientFailureException;
 import com.google.common.base.Joiner;
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Multimap;
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.EppResource;
-import google.registry.model.domain.RegistryLock;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
-import google.registry.util.AppEngineServiceUtils;
+import google.registry.request.Action.Service;
+import google.registry.util.CloudTasksUtils;
 import google.registry.util.Retrier;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -59,25 +61,23 @@ public final class AsyncTaskEnqueuer {
  private static final Duration MAX_ASYNC_ETA = Duration.standardDays(30);

  private final Duration asyncDeleteDelay;
-  private final Queue asyncActionsPushQueue;
  private final Queue asyncDeletePullQueue;
  private final Queue asyncDnsRefreshPullQueue;
-  private final AppEngineServiceUtils appEngineServiceUtils;
  private final Retrier retrier;

+  private CloudTasksUtils cloudTasksUtils;
+
  @Inject
  public AsyncTaskEnqueuer(
-      @Named(QUEUE_ASYNC_ACTIONS) Queue asyncActionsPushQueue,
      @Named(QUEUE_ASYNC_DELETE) Queue asyncDeletePullQueue,
      @Named(QUEUE_ASYNC_HOST_RENAME) Queue asyncDnsRefreshPullQueue,
      @Config("asyncDeleteFlowMapreduceDelay") Duration asyncDeleteDelay,
-      AppEngineServiceUtils appEngineServiceUtils,
+      CloudTasksUtils cloudTasksUtils,
      Retrier retrier) {
-    this.asyncActionsPushQueue = asyncActionsPushQueue;
    this.asyncDeletePullQueue = asyncDeletePullQueue;
    this.asyncDnsRefreshPullQueue = asyncDnsRefreshPullQueue;
    this.asyncDeleteDelay = asyncDeleteDelay;
-    this.appEngineServiceUtils = appEngineServiceUtils;
+    this.cloudTasksUtils = cloudTasksUtils;
    this.retrier = retrier;
  }

@@ -103,19 +103,17 @@ public final class AsyncTaskEnqueuer {
          entityKey, firstResave, MAX_ASYNC_ETA);
      return;
    }
-    logger.atInfo().log("Enqueuing async re-save of %s to run at %s.", entityKey, whenToResave);
-    String backendHostname = appEngineServiceUtils.getServiceHostname("backend");
-    TaskOptions task =
-        TaskOptions.Builder.withUrl(ResaveEntityAction.PATH)
-            .method(Method.POST)
-            .header("Host", backendHostname)
-            .countdownMillis(etaDuration.getMillis())
-            .param(PARAM_RESOURCE_KEY, entityKey.getOfyKey().getString())
-            .param(PARAM_REQUESTED_TIME, now.toString());
+    Multimap<String, String> params = ArrayListMultimap.create();
+    params.put(PARAM_RESOURCE_KEY, entityKey.stringify());
+    params.put(PARAM_REQUESTED_TIME, now.toString());
    if (whenToResave.size() > 1) {
-      task.param(PARAM_RESAVE_TIMES, Joiner.on(',').join(whenToResave.tailSet(firstResave, false)));
+      params.put(PARAM_RESAVE_TIMES, Joiner.on(',').join(whenToResave.tailSet(firstResave, false)));
    }
-    addTaskToQueueWithRetry(asyncActionsPushQueue, task);
+    logger.atInfo().log("Enqueuing async re-save of %s to run at %s.", entityKey, whenToResave);
+    cloudTasksUtils.enqueue(
+        QUEUE_ASYNC_ACTIONS,
+        cloudTasksUtils.createPostTaskWithDelay(
+            ResaveEntityAction.PATH, Service.BACKEND.toString(), params, etaDuration));
  }

  /** Enqueues a task to asynchronously delete a contact or host, by key. */
@@ -131,7 +129,7 @@ public final class AsyncTaskEnqueuer {
    TaskOptions task =
        TaskOptions.Builder.withMethod(Method.PULL)
            .countdownMillis(asyncDeleteDelay.getMillis())
-            .param(PARAM_RESOURCE_KEY, resourceToDelete.createVKey().getOfyKey().getString())
+            .param(PARAM_RESOURCE_KEY, resourceToDelete.createVKey().stringify())
            .param(PARAM_REQUESTING_CLIENT_ID, requestingRegistrarId)
            .param(PARAM_SERVER_TRANSACTION_ID, trid.getServerTransactionId())
            .param(PARAM_IS_SUPERUSER, Boolean.toString(isSuperuser))
@@ -148,36 +146,10 @@ public final class AsyncTaskEnqueuer {
    addTaskToQueueWithRetry(
        asyncDnsRefreshPullQueue,
        TaskOptions.Builder.withMethod(Method.PULL)
-            .param(PARAM_HOST_KEY, hostKey.getOfyKey().getString())
+            .param(PARAM_HOST_KEY, hostKey.stringify())
            .param(PARAM_REQUESTED_TIME, now.toString()));
  }

-  /**
-   * Enqueues a task to asynchronously re-lock a registry-locked domain after it was unlocked.
-   *
-   * <p>Note: the relockDuration must be present on the lock object.
-   */
-  public void enqueueDomainRelock(RegistryLock lock) {
-    checkArgument(
-        lock.getRelockDuration().isPresent(),
-        "Lock with ID %s not configured for relock",
-        lock.getRevisionId());
-    enqueueDomainRelock(lock.getRelockDuration().get(), lock.getRevisionId(), 0);
-  }
-
-  /** Enqueues a task to asynchronously re-lock a registry-locked domain after it was unlocked. */
-  void enqueueDomainRelock(Duration countdown, long lockRevisionId, int previousAttempts) {
-    String backendHostname = appEngineServiceUtils.getServiceHostname("backend");
-    addTaskToQueueWithRetry(
-        asyncActionsPushQueue,
-        TaskOptions.Builder.withUrl(RelockDomainAction.PATH)
-            .method(Method.POST)
-            .header("Host", backendHostname)
-            .param(RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM, String.valueOf(lockRevisionId))
-            .param(RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM, String.valueOf(previousAttempts))
-            .countdownMillis(countdown.getMillis()));
-  }
-
  /**
   * Adds a task to a queue with retrying, to avoid aborting the entire flow over a transient issue
   * enqueuing a task.
--- a/core/src/main/java/google/registry/batch/BatchModule.java
+++ b/core/src/main/java/google/registry/batch/BatchModule.java
@@ -33,10 +33,8 @@ import static google.registry.request.RequestParameters.extractSetOfDatetimePara

 import com.google.appengine.api.taskqueue.Queue;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import dagger.Module;
 import dagger.Provides;
-import google.registry.model.ImmutableObject;
 import google.registry.request.Parameter;
 import java.util.Optional;
 import javax.inject.Named;
@@ -79,9 +77,8 @@ public class BatchModule {

  @Provides
  @Parameter(PARAM_RESOURCE_KEY)
-  // TODO(b/207363014): figure out if this needs to be modified for vkey string replacement
-  static Key<ImmutableObject> provideResourceKey(HttpServletRequest req) {
-    return Key.create(extractRequiredParameter(req, PARAM_RESOURCE_KEY));
+  static String provideResourceKey(HttpServletRequest req) {
+    return extractRequiredParameter(req, PARAM_RESOURCE_KEY);
  }

  @Provides
@@ -115,6 +112,12 @@ public class BatchModule {
        req, ExpandRecurringBillingEventsAction.PARAM_CURSOR_TIME);
  }

+  @Provides
+  @Parameter(ResaveAllEppResourcesPipelineAction.PARAM_FAST)
+  static Optional<Boolean> provideIsFast(HttpServletRequest req) {
+    return extractOptionalBooleanParameter(req, ResaveAllEppResourcesPipelineAction.PARAM_FAST);
+  }
+
  @Provides
  @Named(QUEUE_ASYNC_ACTIONS)
  static Queue provideAsyncActionsPushQueue() {
--- a/core/src/main/java/google/registry/batch/DeleteContactsAndHostsAction.java
+++ b/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);
--- a/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java
+++ b/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java
@@ -17,6 +17,7 @@ package google.registry.batch;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Sets.difference;
+import static com.google.common.collect.Sets.newHashSet;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.mapreduce.inputs.EppResourceInputs.createChildEntityInput;
 import static google.registry.model.common.Cursor.CursorType.RECURRING_BILLING;
@@ -36,11 +37,13 @@ import static google.registry.util.DomainNameUtils.getTldFromDomainName;
 import com.google.appengine.tools.mapreduce.Mapper;
 import com.google.appengine.tools.mapreduce.Reducer;
 import com.google.appengine.tools.mapreduce.ReducerInput;
+import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Range;
 import com.google.common.collect.Streams;
 import com.google.common.flogger.FluentLogger;
+import google.registry.config.RegistryConfig.Config;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.NullInput;
 import google.registry.model.ImmutableObject;
@@ -61,6 +64,7 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import javax.inject.Inject;
@@ -86,6 +90,11 @@ public class ExpandRecurringBillingEventsAction implements Runnable {

  @Inject Clock clock;
  @Inject MapreduceRunner mrRunner;
+
+  @Inject
+  @Config("jdbcBatchSize")
+  int batchSize;
+
  @Inject @Parameter(PARAM_DRY_RUN) boolean isDryRun;
  @Inject @Parameter(PARAM_CURSOR_TIME) Optional<DateTime> cursorTimeParam;
  @Inject Response response;
@@ -120,61 +129,116 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
                      ImmutableSet.of(DomainBase.class), ImmutableSet.of(Recurring.class))))
          .sendLinkToMapreduceConsole(response);
    } else {
-      int numBillingEventsSaved =
-          jpaTm()
-              .transact(
-                  () ->
-                      jpaTm()
-                          .query(
-                              "FROM BillingRecurrence "
-                                  + "WHERE eventTime <= :executeTime "
-                                  + "AND eventTime < recurrenceEndTime "
-                                  + "ORDER BY id ASC",
-                              Recurring.class)
-                          .setParameter("executeTime", executeTime)
-                          // Need to get a list from the transaction and then convert it to a stream
-                          // for further processing. If we get a stream directly, each elements gets
-                          // processed downstream eagerly but Hibernate returns a
-                          // ScrollableResultsIterator that cannot be advanced outside the
-                          // transaction, resulting in an exception.
-                          .getResultList())
-              .stream()
-              .map(
-                  recurring ->
-                      jpaTm()
-                          .transact(
-                              () ->
-                                  expandBillingEvent(recurring, executeTime, cursorTime, isDryRun)))
-              .reduce(0, Integer::sum);
-
-      if (!isDryRun) {
-        logger.atInfo().log("Saved OneTime billing events.", numBillingEventsSaved);
-      } else {
-        logger.atInfo().log("Generated OneTime billing events (dry run).", numBillingEventsSaved);
-      }
-      logger.atInfo().log(
-          "Recurring event expansion %s complete for billing event range [%s, %s).",
-          isDryRun ? "(dry run) " : "", cursorTime, executeTime);
-      tm().transact(
-              () -> {
-                // Check for the unlikely scenario where the cursor has been altered during the
-                // expansion.
-                DateTime currentCursorTime =
-                    tm().loadByKeyIfPresent(Cursor.createGlobalVKey(RECURRING_BILLING))
-                        .orElse(Cursor.createGlobal(RECURRING_BILLING, START_OF_TIME))
-                        .getCursorTime();
-                if (!currentCursorTime.equals(persistedCursorTime)) {
-                  throw new IllegalStateException(
-                      String.format(
-                          "Current cursor position %s does not match persisted cursor position %s.",
-                          currentCursorTime, persistedCursorTime));
-                }
-                if (!isDryRun) {
-                  tm().put(Cursor.createGlobal(RECURRING_BILLING, executeTime));
-                }
-              });
+      expandSqlBillingEventsInBatches(executeTime, cursorTime, persistedCursorTime);
    }
  }
+
+  private void expandSqlBillingEventsInBatches(
+      DateTime executeTime, DateTime cursorTime, DateTime persistedCursorTime) {
+    int totalBillingEventsSaved = 0;
+    long maxProcessedRecurrenceId = 0;
+    SqlBatchResults sqlBatchResults;
+
+    do {
+      final long prevMaxProcessedRecurrenceId = maxProcessedRecurrenceId;
+      sqlBatchResults =
+          jpaTm()
+              .transact(
+                  () -> {
+                    Set<String> expandedDomains = newHashSet();
+                    int batchBillingEventsSaved = 0;
+                    long maxRecurrenceId = prevMaxProcessedRecurrenceId;
+                    List<Recurring> recurrings =
+                        jpaTm()
+                            .query(
+                                "FROM BillingRecurrence "
+                                    + "WHERE eventTime <= :executeTime "
+                                    + "AND eventTime < recurrenceEndTime "
+                                    + "AND id > :maxProcessedRecurrenceId "
+                                    + "ORDER BY id ASC",
+                                Recurring.class)
+                            .setParameter("executeTime", executeTime)
+                            .setParameter("maxProcessedRecurrenceId", prevMaxProcessedRecurrenceId)
+                            .setMaxResults(batchSize)
+                            .getResultList();
+                    for (Recurring recurring : recurrings) {
+                      if (expandedDomains.contains(recurring.getTargetId())) {
+                        // On the off chance this batch contains multiple recurrences for the same
+                        // domain (which is actually possible if a given domain is quickly renewed
+                        // multiple times in a row), then short-circuit after the first one is
+                        // processed that involves actually expanding a billing event. This is
+                        // necessary because otherwise we get an "Inserted/updated object reloaded"
+                        // error from Hibernate when those billing events would be loaded
+                        // inside a transaction where they were already written. Note, there is no
+                        // actual further work to be done in this case anyway, not unless it has
+                        // somehow been over a year since this action last ran successfully (and if
+                        // that were somehow true, the remaining billing events would still be
+                        // expanded on subsequent runs).
+                        continue;
+                      }
+                      int billingEventsSaved =
+                          expandBillingEvent(recurring, executeTime, cursorTime, isDryRun);
+                      batchBillingEventsSaved += billingEventsSaved;
+                      if (billingEventsSaved > 0) {
+                        expandedDomains.add(recurring.getTargetId());
+                      }
+                      maxRecurrenceId = Math.max(maxRecurrenceId, recurring.getId());
+                    }
+                    return SqlBatchResults.create(
+                        batchBillingEventsSaved,
+                        maxRecurrenceId,
+                        maxRecurrenceId > prevMaxProcessedRecurrenceId);
+                  });
+      totalBillingEventsSaved += sqlBatchResults.batchBillingEventsSaved();
+      maxProcessedRecurrenceId = sqlBatchResults.maxProcessedRecurrenceId();
+      logger.atInfo().log(
+          "Saved %d billing events in batch with max recurrence id %d.",
+          sqlBatchResults.batchBillingEventsSaved(), maxProcessedRecurrenceId);
+    } while (sqlBatchResults.shouldContinue());
+
+    if (!isDryRun) {
+      logger.atInfo().log("Saved OneTime billing events.", totalBillingEventsSaved);
+    } else {
+      logger.atInfo().log("Generated OneTime billing events (dry run).", totalBillingEventsSaved);
+    }
+    logger.atInfo().log(
+        "Recurring event expansion %s complete for billing event range [%s, %s).",
+        isDryRun ? "(dry run) " : "", cursorTime, executeTime);
+    tm().transact(
+            () -> {
+              // Check for the unlikely scenario where the cursor has been altered during the
+              // expansion.
+              DateTime currentCursorTime =
+                  tm().loadByKeyIfPresent(Cursor.createGlobalVKey(RECURRING_BILLING))
+                      .orElse(Cursor.createGlobal(RECURRING_BILLING, START_OF_TIME))
+                      .getCursorTime();
+              if (!currentCursorTime.equals(persistedCursorTime)) {
+                throw new IllegalStateException(
+                    String.format(
+                        "Current cursor position %s does not match persisted cursor position %s.",
+                        currentCursorTime, persistedCursorTime));
+              }
+              if (!isDryRun) {
+                tm().put(Cursor.createGlobal(RECURRING_BILLING, executeTime));
+              }
+            });
+  }
+
+  @AutoValue
+  abstract static class SqlBatchResults {
+    abstract int batchBillingEventsSaved();
+
+    abstract long maxProcessedRecurrenceId();
+
+    abstract boolean shouldContinue();
+
+    static SqlBatchResults create(
+        int batchBillingEventsSaved, long maxProcessedRecurrenceId, boolean shouldContinue) {
+      return new AutoValue_ExpandRecurringBillingEventsAction_SqlBatchResults(
+          batchBillingEventsSaved, maxProcessedRecurrenceId, shouldContinue);
+    }
+  }
+
  /** Mapper to expand {@link Recurring} billing events into synthetic {@link OneTime} events. */
  public static class ExpandRecurringBillingEventsMapper
      extends Mapper<Recurring, DateTime, DateTime> {
--- a/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java
+++ b/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java
@@ -49,6 +49,7 @@ import google.registry.batch.AsyncTaskMetrics.OperationResult;
 import google.registry.dns.DnsQueue;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.NullInput;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.model.server.Lock;
@@ -79,6 +80,8 @@ import org.joda.time.Duration;
    service = Action.Service.BACKEND,
    path = "/_dr/task/refreshDnsOnHostRename",
    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@DeleteAfterMigration
+@Deprecated
 public class RefreshDnsOnHostRenameAction implements Runnable {

  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
--- a/core/src/main/java/google/registry/batch/RelockDomainAction.java
+++ b/core/src/main/java/google/registry/batch/RelockDomainAction.java
@@ -88,7 +88,6 @@ public class RelockDomainAction implements Runnable {
  private final SendEmailService sendEmailService;
  private final DomainLockUtils domainLockUtils;
  private final Response response;
-  private final AsyncTaskEnqueuer asyncTaskEnqueuer;

  @Inject
  public RelockDomainAction(
@@ -99,8 +98,7 @@ public class RelockDomainAction implements Runnable {
      @Config("supportEmail") String supportEmail,
      SendEmailService sendEmailService,
      DomainLockUtils domainLockUtils,
-      Response response,
-      AsyncTaskEnqueuer asyncTaskEnqueuer) {
+      Response response) {
    this.oldUnlockRevisionId = oldUnlockRevisionId;
    this.previousAttempts = previousAttempts;
    this.alertRecipientAddress = alertRecipientAddress;
@@ -109,7 +107,6 @@ public class RelockDomainAction implements Runnable {
    this.sendEmailService = sendEmailService;
    this.domainLockUtils = domainLockUtils;
    this.response = response;
-    this.asyncTaskEnqueuer = asyncTaskEnqueuer;
  }

  @Override
@@ -245,8 +242,7 @@ public class RelockDomainAction implements Runnable {
      }
    }
    Duration timeBeforeRetry = previousAttempts < ATTEMPTS_BEFORE_SLOWDOWN ? TEN_MINUTES : ONE_HOUR;
-    asyncTaskEnqueuer.enqueueDomainRelock(
-        timeBeforeRetry, oldUnlockRevisionId, previousAttempts + 1);
+    domainLockUtils.enqueueDomainRelock(timeBeforeRetry, oldUnlockRevisionId, previousAttempts + 1);
  }

  private void sendSuccessEmail(RegistryLock oldLock) {
--- a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesAction.java
+++ b/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;
--- a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java
+++ b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java
@@ -0,0 +1,129 @@
+// Copyright 2022 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.batch;
+
+import static google.registry.beam.BeamUtils.createJobName;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+import com.google.api.services.dataflow.Dataflow;
+import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;
+import com.google.api.services.dataflow.model.LaunchFlexTemplateRequest;
+import com.google.api.services.dataflow.model.LaunchFlexTemplateResponse;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.flogger.FluentLogger;
+import com.google.common.net.MediaType;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.config.RegistryEnvironment;
+import google.registry.request.Action;
+import google.registry.request.Parameter;
+import google.registry.request.Response;
+import google.registry.request.auth.Auth;
+import google.registry.util.Clock;
+import java.util.Optional;
+import javax.inject.Inject;
+
+/**
+ * Starts a Dataflow pipeline that resaves all EPP resources projected to the current time.
+ *
+ * <p>This is useful for a few situations. First, as a fallback option for resource transfers that
+ * have expired pending transfers (this will resolve them), just in case the enqueued action fails.
+ * Second, it will reflect domain autorenews that have happened. Third, it will remove any expired
+ * grace periods.
+ *
+ * <p>There's also the general principle that it's good to have the data in the database remain as
+ * current as is reasonably possible.
+ *
+ * <p>If the <code>?isFast=true</code> query string parameter is passed as true, the pipeline will
+ * only attempt to load, project, and resave entities where we expect one of the previous situations
+ * has occurred. Otherwise, we will load, project, and resave all EPP resources.
+ *
+ * <p>This runs the {@link google.registry.beam.resave.ResaveAllEppResourcesPipeline}.
+ */
+@Action(
+    service = Action.Service.BACKEND,
+    path = ResaveAllEppResourcesPipelineAction.PATH,
+    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+public class ResaveAllEppResourcesPipelineAction implements Runnable {
+
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  static final String PATH = "/_dr/task/resaveAllEppResourcesPipeline";
+  static final String PIPELINE_NAME = "resave_all_epp_resources_pipeline";
+
+  public static final String PARAM_FAST = "fast";
+
+  private final String projectId;
+  private final String jobRegion;
+  private final String stagingBucketUrl;
+  private final boolean fast;
+  private final Clock clock;
+  private final Response response;
+  private final Dataflow dataflow;
+
+  @Inject
+  ResaveAllEppResourcesPipelineAction(
+      @Config("projectId") String projectId,
+      @Config("defaultJobRegion") String jobRegion,
+      @Config("beamStagingBucketUrl") String stagingBucketUrl,
+      @Parameter(PARAM_FAST) Optional<Boolean> fast,
+      Clock clock,
+      Response response,
+      Dataflow dataflow) {
+    this.projectId = projectId;
+    this.jobRegion = jobRegion;
+    this.stagingBucketUrl = stagingBucketUrl;
+    this.fast = fast.orElse(false);
+    this.clock = clock;
+    this.response = response;
+    this.dataflow = dataflow;
+  }
+
+  @Override
+  public void run() {
+    response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
+    logger.atInfo().log("Launching ResaveAllEppResourcesPipeline");
+    try {
+      LaunchFlexTemplateParameter parameter =
+          new LaunchFlexTemplateParameter()
+              .setJobName(createJobName("resave-all-epp-resources", clock))
+              .setContainerSpecGcsPath(
+                  String.format("%s/%s_metadata.json", stagingBucketUrl, PIPELINE_NAME))
+              .setParameters(
+                  new ImmutableMap.Builder<String, String>()
+                      .put(PARAM_FAST, Boolean.toString(fast))
+                      .put("registryEnvironment", RegistryEnvironment.get().name())
+                      .build());
+      LaunchFlexTemplateResponse launchResponse =
+          dataflow
+              .projects()
+              .locations()
+              .flexTemplates()
+              .launch(
+                  projectId,
+                  jobRegion,
+                  new LaunchFlexTemplateRequest().setLaunchParameter(parameter))
+              .execute();
+      logger.atInfo().log("Got response: %s", launchResponse.getJob().toPrettyString());
+      String jobId = launchResponse.getJob().getId();
+      response.setStatus(SC_OK);
+      response.setPayload(String.format("Launched resaveAllEppResources pipeline: %s", jobId));
+    } catch (Exception e) {
+      logger.atSevere().withCause(e).log("Template Launch failed.");
+      response.setStatus(SC_INTERNAL_SERVER_ERROR);
+      response.setPayload(String.format("Pipeline launch failed: %s", e.getMessage()));
+    }
+  }
+}
--- a/core/src/main/java/google/registry/batch/ResaveEntityAction.java
+++ b/core/src/main/java/google/registry/batch/ResaveEntityAction.java
@@ -22,7 +22,6 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.flogger.FluentLogger;
-import com.googlecode.objectify.Key;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.persistence.VKey;
@@ -50,7 +49,7 @@ public class ResaveEntityAction implements Runnable {

  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

-  private final Key<ImmutableObject> resourceKey;
+  private final String resourceKey;
  private final DateTime requestedTime;
  private final ImmutableSortedSet<DateTime> resaveTimes;
  private final AsyncTaskEnqueuer asyncTaskEnqueuer;
@@ -58,7 +57,7 @@ public class ResaveEntityAction implements Runnable {

  @Inject
  ResaveEntityAction(
-      @Parameter(PARAM_RESOURCE_KEY) Key<ImmutableObject> resourceKey,
+      @Parameter(PARAM_RESOURCE_KEY) String resourceKey,
      @Parameter(PARAM_REQUESTED_TIME) DateTime requestedTime,
      @Parameter(PARAM_RESAVE_TIMES) ImmutableSet<DateTime> resaveTimes,
      AsyncTaskEnqueuer asyncTaskEnqueuer,
@@ -76,15 +75,14 @@ public class ResaveEntityAction implements Runnable {
        "Re-saving entity %s which was enqueued at %s.", resourceKey, requestedTime);
    tm().transact(
            () -> {
-              // TODO(/207363014): figure out if this should modified for vkey string replacement
-              ImmutableObject entity = tm().loadByKey(VKey.from(resourceKey));
+              ImmutableObject entity = tm().loadByKey(VKey.create(resourceKey));
              tm().put(
                      (entity instanceof EppResource)
                          ? ((EppResource) entity).cloneProjectedAtTime(tm().getTransactionTime())
                          : entity);
              if (!resaveTimes.isEmpty()) {
                asyncTaskEnqueuer.enqueueAsyncResave(
-                    VKey.from(resourceKey), requestedTime, resaveTimes);
+                    VKey.create(resourceKey), requestedTime, resaveTimes);
              }
            });
    response.setPayload("Entity re-saved.");
--- a/core/src/main/java/google/registry/batch/WipeoutDatastoreAction.java
+++ b/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();

--- a/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java
+++ b/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Streams;
 import google.registry.beam.common.RegistryQuery.CriteriaQuerySupplier;
 import google.registry.model.UpdateAutoTimestamp;
 import google.registry.model.UpdateAutoTimestamp.DisableAutoUpdateResource;
+import google.registry.model.common.DatabaseMigrationStateSchedule;
 import google.registry.model.replay.SqlEntity;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.persistence.transaction.TransactionManagerFactory;
@@ -234,6 +235,10 @@ public final class RegistryJpaIO {

      @ProcessElement
      public void processElement(OutputReceiver<T> outputReceiver) {
+        // Preload the migration schedule into cache, otherwise the cache loading query may happen
+        // before the setDatabaseSnapshot call in the transaction below, causing it to fail.
+        DatabaseMigrationStateSchedule.get();
+
        jpaTm()
            .transactNoRetry(
                () -> {
--- a/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java
+++ b/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java
@@ -23,6 +23,7 @@ import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.persistence.PersistenceModule;
 import google.registry.persistence.PersistenceModule.BeamBulkQueryJpaTm;
 import google.registry.persistence.PersistenceModule.BeamJpaTm;
+import google.registry.persistence.PersistenceModule.BeamReadOnlyReplicaJpaTm;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.privileges.secretmanager.SecretManagerModule;
@@ -59,6 +60,13 @@ public interface RegistryPipelineComponent {
  @BeamBulkQueryJpaTm
  Lazy<JpaTransactionManager> getBulkQueryJpaTransactionManager();

+  /**
+   * A {@link JpaTransactionManager} that uses the Postgres read-only replica if configured (uses
+   * the standard DB otherwise).
+   */
+  @BeamReadOnlyReplicaJpaTm
+  Lazy<JpaTransactionManager> getReadOnlyReplicaJpaTransactionManager();
+
  @Component.Builder
  interface Builder {

--- a/core/src/main/java/google/registry/beam/common/RegistryPipelineWorkerInitializer.java
+++ b/core/src/main/java/google/registry/beam/common/RegistryPipelineWorkerInitializer.java
@@ -56,6 +56,10 @@ public class RegistryPipelineWorkerInitializer implements JvmInitializer {
      case BULK_QUERY:
        transactionManagerLazy = registryPipelineComponent.getBulkQueryJpaTransactionManager();
        break;
+      case READ_ONLY_REPLICA:
+        transactionManagerLazy =
+            registryPipelineComponent.getReadOnlyReplicaJpaTransactionManager();
+        break;
      case REGULAR:
      default:
        transactionManagerLazy = registryPipelineComponent.getJpaTransactionManager();
--- a/core/src/main/java/google/registry/beam/comparedb/DatastoreSnapshots.java
+++ b/core/src/main/java/google/registry/beam/comparedb/DatastoreSnapshots.java
@@ -23,6 +23,8 @@ 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.EppResource;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.common.Cursor;
 import google.registry.model.contact.ContactHistory;
@@ -41,6 +43,7 @@ import google.registry.model.tld.Registry;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -51,6 +54,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() {}
@@ -91,7 +95,8 @@ public final class DatastoreSnapshots {
      String commitLogDir,
      DateTime commitLogFromTime,
      DateTime commitLogToTime,
-      Set<Class<?>> kinds) {
+      Set<Class<?>> kinds,
+      Optional<DateTime> compareStartTime) {
    PCollectionTuple snapshot =
        pipeline.apply(
            "Load Datastore snapshot.",
@@ -110,11 +115,11 @@ public final class DatastoreSnapshots {
        perTypeSnapshots =
            perTypeSnapshots.and(
                createSqlEntityTupleTag((Class<? extends SqlEntity>) kind),
-                datastoreEntityToPojo(perKindSnapshot, kind.getSimpleName()));
+                datastoreEntityToPojo(perKindSnapshot, kind.getSimpleName(), compareStartTime));
        continue;
      }
      Verify.verify(kind == HistoryEntry.class, "Unexpected Non-SqlEntity class: %s", kind);
-      PCollectionTuple historyEntriesByType = splitHistoryEntry(perKindSnapshot);
+      PCollectionTuple historyEntriesByType = splitHistoryEntry(perKindSnapshot, compareStartTime);
      for (Map.Entry<TupleTag<?>, PCollection<?>> entry :
          historyEntriesByType.getAll().entrySet()) {
        perTypeSnapshots = perTypeSnapshots.and(entry.getKey().getId(), entry.getValue());
@@ -127,7 +132,9 @@ public final class DatastoreSnapshots {
   * Splits a {@link PCollection} of {@link HistoryEntry HistoryEntries} into three collections of
   * its child entities by type.
   */
-  static PCollectionTuple splitHistoryEntry(PCollection<VersionedEntity> historyEntries) {
+  static PCollectionTuple splitHistoryEntry(
+      PCollection<VersionedEntity> historyEntries, Optional<DateTime> compareStartTime) {
+    DateTime nullableStartTime = compareStartTime.orElse(null);
    return historyEntries.apply(
        "Split HistoryEntry by Resource Type",
        ParDo.of(
@@ -136,6 +143,7 @@ public final class DatastoreSnapshots {
                  public void processElement(
                      @Element VersionedEntity historyEntry, MultiOutputReceiver out) {
                    Optional.ofNullable(Transforms.convertVersionedEntityToSqlEntity(historyEntry))
+                        .filter(e -> isEntityIncludedForComparison(e, nullableStartTime))
                        .ifPresent(
                            sqlEntity ->
                                out.get(createSqlEntityTupleTag(sqlEntity.getClass()))
@@ -153,7 +161,8 @@ public final class DatastoreSnapshots {
   * objects.
   */
  static PCollection<SqlEntity> datastoreEntityToPojo(
-      PCollection<VersionedEntity> entities, String desc) {
+      PCollection<VersionedEntity> entities, String desc, Optional<DateTime> compareStartTime) {
+    DateTime nullableStartTime = compareStartTime.orElse(null);
    return entities.apply(
        "Datastore Entity to Pojo " + desc,
        ParDo.of(
@@ -162,8 +171,23 @@ public final class DatastoreSnapshots {
              public void processElement(
                  @Element VersionedEntity entity, OutputReceiver<SqlEntity> out) {
                Optional.ofNullable(Transforms.convertVersionedEntityToSqlEntity(entity))
+                    .filter(e -> isEntityIncludedForComparison(e, nullableStartTime))
                    .ifPresent(out::output);
              }
            }));
  }
+
+  static boolean isEntityIncludedForComparison(
+      SqlEntity entity, @Nullable DateTime compareStartTime) {
+    if (compareStartTime == null) {
+      return true;
+    }
+    if (entity instanceof HistoryEntry) {
+      return compareStartTime.isBefore(((HistoryEntry) entity).getModificationTime());
+    }
+    if (entity instanceof EppResource) {
+      return compareStartTime.isBefore(((EppResource) entity).getUpdateTimestamp().getTimestamp());
+    }
+    return true;
+  }
 }
--- a/core/src/main/java/google/registry/beam/comparedb/LatestDatastoreSnapshotFinder.java
+++ b/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;
@@ -51,11 +53,11 @@ public class LatestDatastoreSnapshotFinder {
  }

  /**
-   * Finds information of the most recent Datastore snapshot, including the GCS folder of the
-   * exported data files and the start and stop times of the export. The folder of the CommitLogs is
-   * also included in the return.
+   * Finds information of the most recent Datastore snapshot that ends strictly before {@code
+   * exportEndTimeUpperBound}, including the GCS folder of the exported data files and the start and
+   * stop times of the export. The folder of the CommitLogs is also included in the return.
   */
-  public DatastoreSnapshotInfo getSnapshotInfo() {
+  public DatastoreSnapshotInfo getSnapshotInfo(Instant exportEndTimeUpperBound) {
    String bucketName = RegistryConfig.getDatastoreBackupsBucket().substring("gs://".length());
    /**
     * Find the bucket-relative path to the overall metadata file of the last Datastore export.
@@ -63,7 +65,8 @@ public class LatestDatastoreSnapshotFinder {
     * return value is like
     * "2021-11-19T06:00:00_76493/2021-11-19T06:00:00_76493.overall_export_metadata".
     */
-    Optional<String> metaFilePathOptional = findMostRecentExportMetadataFile(bucketName, 2);
+    Optional<String> metaFilePathOptional =
+        findNewestExportMetadataFileBeforeTime(bucketName, exportEndTimeUpperBound, 5);
    if (!metaFilePathOptional.isPresent()) {
      throw new NoSuchElementException("No exports found over the past 2 days.");
    }
@@ -83,8 +86,9 @@ public class LatestDatastoreSnapshotFinder {
  }

  /**
-   * Finds the bucket-relative path of the overall export metadata file, in the given bucket,
-   * searching back up to {@code lookBackDays} days, including today.
+   * Finds the latest Datastore export that ends strictly before {@code endTimeUpperBound} and
+   * returns the bucket-relative path of the overall export metadata file, in the given bucket. The
+   * search goes back for up to {@code lookBackDays} days in time, including today.
   *
   * <p>The overall export metadata file is the last file created during a Datastore export. All
   * data has been exported by the creation time of this file. The name of this file, like that of
@@ -93,7 +97,8 @@ public class LatestDatastoreSnapshotFinder {
   * <p>An example return value: {@code
   * 2021-11-19T06:00:00_76493/2021-11-19T06:00:00_76493.overall_export_metadata}.
   */
-  private Optional<String> findMostRecentExportMetadataFile(String bucketName, int lookBackDays) {
+  private Optional<String> findNewestExportMetadataFileBeforeTime(
+      String bucketName, Instant endTimeUpperBound, int lookBackDays) {
    DateTime today = clock.nowUtc();
    for (int day = 0; day < lookBackDays; day++) {
      String dateString = today.minusDays(day).toString("yyyy-MM-dd");
@@ -105,7 +110,11 @@ public class LatestDatastoreSnapshotFinder {
                .sorted(Comparator.<String>naturalOrder().reversed())
                .findFirst();
        if (metaFilePath.isPresent()) {
-          return metaFilePath;
+          BlobInfo blobInfo = gcsUtils.getBlobInfo(BlobId.of(bucketName, metaFilePath.get()));
+          Instant exportEndTime = new Instant(blobInfo.getCreateTime());
+          if (exportEndTime.isBefore(endTimeUpperBound)) {
+            return metaFilePath;
+          }
        }
      } catch (IOException ioe) {
        throw new RuntimeException(ioe);
@@ -116,12 +125,12 @@ public class LatestDatastoreSnapshotFinder {

  /** Holds information about a Datastore snapshot. */
  @AutoValue
-  abstract static class DatastoreSnapshotInfo {
-    abstract String exportDir();
+  public abstract static class DatastoreSnapshotInfo {
+    public abstract String exportDir();

-    abstract String commitLogDir();
+    public abstract String commitLogDir();

-    abstract Interval exportInterval();
+    public abstract Interval exportInterval();

    static DatastoreSnapshotInfo create(
        String exportDir, String commitLogDir, Interval exportOperationInterval) {
--- a/core/src/main/java/google/registry/beam/comparedb/SqlSnapshots.java
+++ b/core/src/main/java/google/registry/beam/comparedb/SqlSnapshots.java
@@ -14,15 +14,23 @@

 package google.registry.beam.comparedb;

+import static com.google.common.base.Preconditions.checkState;
 import static google.registry.beam.comparedb.ValidateSqlUtils.createSqlEntityTupleTag;
 import static google.registry.beam.comparedb.ValidateSqlUtils.getMedianIdForHistoryTable;

+import com.google.auto.value.AutoValue;
+import com.google.common.base.Strings;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 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.beam.common.RegistryJpaIO.Read;
+import google.registry.model.EppResource;
+import google.registry.model.UpdateAutoTimestamp;
+import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.bulkquery.BulkQueryEntities;
 import google.registry.model.bulkquery.DomainBaseLite;
@@ -49,8 +57,10 @@ import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.tld.Registry;
 import google.registry.persistence.transaction.CriteriaQueryBuilder;
+import google.registry.util.DateTimeUtils;
 import java.io.Serializable;
 import java.util.Optional;
+import javax.persistence.Entity;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.Flatten;
@@ -64,6 +74,7 @@ import org.apache.beam.sdk.values.PCollectionList;
 import org.apache.beam.sdk.values.PCollectionTuple;
 import org.apache.beam.sdk.values.TypeDescriptor;
 import org.apache.beam.sdk.values.TypeDescriptors;
+import org.joda.time.DateTime;

 /**
 * Utilities for loading SQL snapshots.
@@ -76,6 +87,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() {}
@@ -111,28 +123,48 @@ public final class SqlSnapshots {
  public static PCollectionTuple loadCloudSqlSnapshotByType(
      Pipeline pipeline,
      ImmutableSet<Class<? extends SqlEntity>> sqlEntityTypes,
-      Optional<String> snapshotId) {
+      Optional<String> snapshotId,
+      Optional<DateTime> compareStartTime) {
    PCollectionTuple perTypeSnapshots = PCollectionTuple.empty(pipeline);
    for (Class<? extends SqlEntity> clazz : sqlEntityTypes) {
      if (clazz == DomainBase.class) {
        perTypeSnapshots =
            perTypeSnapshots.and(
                createSqlEntityTupleTag(DomainBase.class),
-                loadAndAssembleDomainBase(pipeline, snapshotId));
+                loadAndAssembleDomainBase(pipeline, snapshotId, compareStartTime));
        continue;
      }
      if (clazz == DomainHistory.class) {
        perTypeSnapshots =
            perTypeSnapshots.and(
                createSqlEntityTupleTag(DomainHistory.class),
-                loadAndAssembleDomainHistory(pipeline, snapshotId));
+                loadAndAssembleDomainHistory(pipeline, snapshotId, compareStartTime));
        continue;
      }
      if (clazz == ContactHistory.class) {
        perTypeSnapshots =
            perTypeSnapshots.and(
                createSqlEntityTupleTag(ContactHistory.class),
-                loadContactHistory(pipeline, snapshotId));
+                loadContactHistory(pipeline, snapshotId, compareStartTime));
+        continue;
+      }
+      if (clazz == HostHistory.class) {
+        perTypeSnapshots =
+            perTypeSnapshots.and(
+                createSqlEntityTupleTag(HostHistory.class),
+                loadHostHistory(
+                    pipeline, snapshotId, compareStartTime.orElse(DateTimeUtils.START_OF_TIME)));
+        continue;
+      }
+      if (EppResource.class.isAssignableFrom(clazz) && compareStartTime.isPresent()) {
+        perTypeSnapshots =
+            perTypeSnapshots.and(
+                createSqlEntityTupleTag(clazz),
+                pipeline.apply(
+                    "SQL Load " + clazz.getSimpleName(),
+                    buildEppResourceQueryWithTimeFilter(
+                            clazz, SqlEntity.class, snapshotId, compareStartTime.get())
+                        .withSnapshot(snapshotId.orElse(null))));
        continue;
      }
      perTypeSnapshots =
@@ -153,20 +185,33 @@ public final class SqlSnapshots {
   * @see BulkQueryEntities
   */
  public static PCollection<SqlEntity> loadAndAssembleDomainBase(
-      Pipeline pipeline, Optional<String> snapshotId) {
+      Pipeline pipeline, Optional<String> snapshotId, Optional<DateTime> compareStartTime) {
    PCollection<KV<String, Serializable>> baseObjects =
-        readAllAndAssignKey(pipeline, DomainBaseLite.class, DomainBaseLite::getRepoId, snapshotId);
+        readAllAndAssignKey(
+            pipeline,
+            DomainBaseLite.class,
+            DomainBaseLite::getRepoId,
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> gracePeriods =
-        readAllAndAssignKey(pipeline, GracePeriod.class, GracePeriod::getDomainRepoId, snapshotId);
+        readAllAndAssignKey(
+            pipeline,
+            GracePeriod.class,
+            GracePeriod::getDomainRepoId,
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> delegationSigners =
        readAllAndAssignKey(
            pipeline,
            DelegationSignerData.class,
            DelegationSignerData::getDomainRepoId,
-            snapshotId);
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> domainHosts =
-        readAllAndAssignKey(pipeline, DomainHost.class, DomainHost::getDomainRepoId, snapshotId);
+        readAllAndAssignKey(
+            pipeline, DomainHost.class, DomainHost::getDomainRepoId, snapshotId, compareStartTime);

+    DateTime nullableCompareStartTime = compareStartTime.orElse(null);
    return PCollectionList.of(
            ImmutableList.of(baseObjects, gracePeriods, delegationSigners, domainHosts))
        .apply("SQL Merge DomainBase parts", Flatten.pCollections())
@@ -182,6 +227,14 @@ public final class SqlSnapshots {
                    TypedClassifier partsByType = new TypedClassifier(kv.getValue());
                    ImmutableSet<DomainBaseLite> baseObjects =
                        partsByType.getAllOf(DomainBaseLite.class);
+                    if (nullableCompareStartTime != null) {
+                      Verify.verify(
+                          baseObjects.size() <= 1,
+                          "Found duplicate DomainBaseLite object per repoId: " + kv.getKey());
+                      if (baseObjects.isEmpty()) {
+                        return;
+                      }
+                    }
                    Verify.verify(
                        baseObjects.size() == 1,
                        "Expecting one DomainBaseLite object per repoId: " + kv.getKey());
@@ -203,16 +256,16 @@ public final class SqlSnapshots {
   * <p>This method uses two queries to load data in parallel. This is a performance optimization
   * specifically for the production database.
   */
-  static PCollection<SqlEntity> loadContactHistory(Pipeline pipeline, Optional<String> snapshotId) {
-    long medianId =
-        getMedianIdForHistoryTable("ContactHistory")
-            .orElseThrow(
-                () -> new IllegalStateException("Not a valid database: no ContactHistory."));
+  static PCollection<SqlEntity> loadContactHistory(
+      Pipeline pipeline, Optional<String> snapshotId, Optional<DateTime> compareStartTime) {
+    PartitionedQuery partitionedQuery =
+        buildPartitonedHistoryQuery(ContactHistory.class, compareStartTime);
    PCollection<SqlEntity> part1 =
        pipeline.apply(
            "SQL Load ContactHistory first half",
            RegistryJpaIO.read(
-                    String.format("select c from ContactHistory c where id <= %s", medianId),
+                    partitionedQuery.firstHalfQuery(),
+                    partitionedQuery.parameters(),
                    false,
                    SqlEntity.class::cast)
                .withSnapshot(snapshotId.orElse(null)));
@@ -220,7 +273,8 @@ public final class SqlSnapshots {
        pipeline.apply(
            "SQL Load ContactHistory second half",
            RegistryJpaIO.read(
-                    String.format("select c from ContactHistory c where id > %s", medianId),
+                    partitionedQuery.secondHalfQuery(),
+                    partitionedQuery.parameters(),
                    false,
                    SqlEntity.class::cast)
                .withSnapshot(snapshotId.orElse(null)));
@@ -229,6 +283,19 @@ public final class SqlSnapshots {
        .apply("Combine ContactHistory parts", Flatten.pCollections());
  }

+  /** Loads all {@link HostHistory} entities from the database. */
+  static PCollection<SqlEntity> loadHostHistory(
+      Pipeline pipeline, Optional<String> snapshotId, DateTime compareStartTime) {
+    return pipeline.apply(
+        "SQL Load HostHistory",
+        RegistryJpaIO.read(
+                "select c from HostHistory c where :compareStartTime  < modificationTime",
+                ImmutableMap.of("compareStartTime", compareStartTime),
+                false,
+                SqlEntity.class::cast)
+            .withSnapshot(snapshotId.orElse(null)));
+  }
+
  /**
   * Bulk-loads all parts of {@link DomainHistory} and assembles them in the pipeline.
   *
@@ -238,16 +305,15 @@ public final class SqlSnapshots {
   * @see BulkQueryEntities
   */
  static PCollection<SqlEntity> loadAndAssembleDomainHistory(
-      Pipeline pipeline, Optional<String> snapshotId) {
-    long medianId =
-        getMedianIdForHistoryTable("DomainHistory")
-            .orElseThrow(
-                () -> new IllegalStateException("Not a valid database: no DomainHistory."));
+      Pipeline pipeline, Optional<String> snapshotId, Optional<DateTime> compareStartTime) {
+    PartitionedQuery partitionedQuery =
+        buildPartitonedHistoryQuery(DomainHistoryLite.class, compareStartTime);
    PCollection<KV<String, Serializable>> baseObjectsPart1 =
        queryAndAssignKey(
            pipeline,
            "first half",
-            String.format("select c from DomainHistory c where id <= %s", medianId),
+            partitionedQuery.firstHalfQuery(),
+            partitionedQuery.parameters(),
            DomainHistoryLite.class,
            compose(DomainHistoryLite::getDomainHistoryId, DomainHistoryId::toString),
            snapshotId);
@@ -255,7 +321,8 @@ public final class SqlSnapshots {
        queryAndAssignKey(
            pipeline,
            "second half",
-            String.format("select c from DomainHistory c where id > %s", medianId),
+            partitionedQuery.secondHalfQuery(),
+            partitionedQuery.parameters(),
            DomainHistoryLite.class,
            compose(DomainHistoryLite::getDomainHistoryId, DomainHistoryId::toString),
            snapshotId);
@@ -264,26 +331,31 @@ public final class SqlSnapshots {
            pipeline,
            GracePeriodHistory.class,
            compose(GracePeriodHistory::getDomainHistoryId, DomainHistoryId::toString),
-            snapshotId);
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> delegationSigners =
        readAllAndAssignKey(
            pipeline,
            DomainDsDataHistory.class,
            compose(DomainDsDataHistory::getDomainHistoryId, DomainHistoryId::toString),
-            snapshotId);
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> domainHosts =
        readAllAndAssignKey(
            pipeline,
            DomainHistoryHost.class,
            compose(DomainHistoryHost::getDomainHistoryId, DomainHistoryId::toString),
-            snapshotId);
+            snapshotId,
+            compareStartTime);
    PCollection<KV<String, Serializable>> transactionRecords =
        readAllAndAssignKey(
            pipeline,
            DomainTransactionRecord.class,
            compose(DomainTransactionRecord::getDomainHistoryId, DomainHistoryId::toString),
-            snapshotId);
+            snapshotId,
+            compareStartTime);

+    DateTime nullableCompareStartTime = compareStartTime.orElse(null);
    return PCollectionList.of(
            ImmutableList.of(
                baseObjectsPart1,
@@ -305,6 +377,15 @@ public final class SqlSnapshots {
                    TypedClassifier partsByType = new TypedClassifier(kv.getValue());
                    ImmutableSet<DomainHistoryLite> baseObjects =
                        partsByType.getAllOf(DomainHistoryLite.class);
+                    if (nullableCompareStartTime != null) {
+                      Verify.verify(
+                          baseObjects.size() <= 1,
+                          "Found duplicate DomainHistoryLite object per domainHistoryId: "
+                              + kv.getKey());
+                      if (baseObjects.isEmpty()) {
+                        return;
+                      }
+                    }
                    Verify.verify(
                        baseObjects.size() == 1,
                        "Expecting one DomainHistoryLite object per domainHistoryId: "
@@ -326,12 +407,19 @@ public final class SqlSnapshots {
      Pipeline pipeline,
      Class<R> type,
      SerializableFunction<R, String> keyFunction,
-      Optional<String> snapshotId) {
+      Optional<String> snapshotId,
+      Optional<DateTime> compareStartTime) {
+    Read<R, R> queryObject;
+    if (compareStartTime.isPresent() && EppResource.class.isAssignableFrom(type)) {
+      queryObject =
+          buildEppResourceQueryWithTimeFilter(type, type, snapshotId, compareStartTime.get());
+    } else {
+      queryObject =
+          RegistryJpaIO.read(() -> CriteriaQueryBuilder.create(type).build())
+              .withSnapshot(snapshotId.orElse(null));
+    }
    return pipeline
-        .apply(
-            "SQL Load " + type.getSimpleName(),
-            RegistryJpaIO.read(() -> CriteriaQueryBuilder.create(type).build())
-                .withSnapshot(snapshotId.orElse(null)))
+        .apply("SQL Load " + type.getSimpleName(), queryObject)
        .apply(
            "Assign Key to " + type.getSimpleName(),
            MapElements.into(
@@ -344,13 +432,15 @@ public final class SqlSnapshots {
      Pipeline pipeline,
      String diffrentiator,
      String jplQuery,
+      ImmutableMap<String, Object> queryParameters,
      Class<R> type,
      SerializableFunction<R, String> keyFunction,
      Optional<String> snapshotId) {
    return pipeline
        .apply(
            "SQL Load " + type.getSimpleName() + " " + diffrentiator,
-            RegistryJpaIO.read(jplQuery, false, type::cast).withSnapshot(snapshotId.orElse(null)))
+            RegistryJpaIO.read(jplQuery, queryParameters, false, type::cast)
+                .withSnapshot(snapshotId.orElse(null)))
        .apply(
            "Assign Key to " + type.getSimpleName() + " " + diffrentiator,
            MapElements.into(
@@ -365,6 +455,71 @@ public final class SqlSnapshots {
    return r -> f2.apply(f1.apply(r));
  }

+  static <R, T> Read<R, T> buildEppResourceQueryWithTimeFilter(
+      Class<R> entityType,
+      Class<T> castOutputAsType,
+      Optional<String> snapshotId,
+      DateTime compareStartTime) {
+    String tableName = getJpaEntityName(entityType);
+    String jpql =
+        String.format("select c from %s c where :compareStartTime < updateTimestamp", tableName);
+    return RegistryJpaIO.read(
+            jpql,
+            ImmutableMap.of("compareStartTime", UpdateAutoTimestamp.create(compareStartTime)),
+            false,
+            (R x) -> castOutputAsType.cast(x))
+        .withSnapshot(snapshotId.orElse(null));
+  }
+
+  static PartitionedQuery buildPartitonedHistoryQuery(
+      Class<?> entityType, Optional<DateTime> compareStartTime) {
+    String tableName = getJpaEntityName(entityType);
+    Verify.verify(
+        !Strings.isNullOrEmpty(tableName), "Invalid entity type %s", entityType.getSimpleName());
+    long medianId =
+        getMedianIdForHistoryTable(tableName)
+            .orElseThrow(() -> new IllegalStateException("Not a valid database: no " + tableName));
+    String firstHalfQuery = String.format("select c from %s c where id <= :historyId", tableName);
+    String secondHalfQuery = String.format("select c from %s c where id > :historyId", tableName);
+    if (compareStartTime.isPresent()) {
+      String timeFilter = "  and :compareStartTime  < modificationTime";
+      firstHalfQuery += timeFilter;
+      secondHalfQuery += timeFilter;
+      return PartitionedQuery.createPartitionedQuery(
+          firstHalfQuery,
+          secondHalfQuery,
+          ImmutableMap.of("historyId", medianId, "compareStartTime", compareStartTime.get()));
+    } else {
+      return PartitionedQuery.createPartitionedQuery(
+          firstHalfQuery, secondHalfQuery, ImmutableMap.of("historyId", medianId));
+    }
+  }
+
+  private static String getJpaEntityName(Class entityType) {
+    Entity entityAnnotation = (Entity) entityType.getAnnotation(Entity.class);
+    checkState(
+        entityAnnotation != null, "Unexpected non-entity type %s", entityType.getSimpleName());
+    return Strings.isNullOrEmpty(entityAnnotation.name())
+        ? entityType.getSimpleName()
+        : entityAnnotation.name();
+  }
+
+  /** Contains two queries that partition the target table in two. */
+  @AutoValue
+  abstract static class PartitionedQuery {
+    abstract String firstHalfQuery();
+
+    abstract String secondHalfQuery();
+
+    abstract ImmutableMap<String, Object> parameters();
+
+    public static PartitionedQuery createPartitionedQuery(
+        String firstHalfQuery, String secondHalfQuery, ImmutableMap<String, Object> parameters) {
+      return new AutoValue_SqlSnapshots_PartitionedQuery(
+          firstHalfQuery, secondHalfQuery, parameters);
+    }
+  }
+
  /** Container that receives mixed-typed data and groups them by {@link Class}. */
  static class TypedClassifier {
    private final ImmutableSetMultimap<Class<?>, Object> classifiedEntities;
--- a/core/src/main/java/google/registry/beam/comparedb/ValidateDatabasePipeline.java
+++ b/core/src/main/java/google/registry/beam/comparedb/ValidateDatabasePipeline.java
@@ -0,0 +1,206 @@
+// 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.beam.comparedb;
+
+import static com.google.common.base.Verify.verify;
+import static org.apache.beam.sdk.values.TypeDescriptors.strings;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
+import com.google.common.flogger.FluentLogger;
+import google.registry.beam.common.RegistryPipelineOptions;
+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.persistence.PersistenceModule.JpaTransactionManagerType;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
+import google.registry.util.SystemClock;
+import java.io.Serializable;
+import java.util.Optional;
+import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.coders.SerializableCoder;
+import org.apache.beam.sdk.io.TextIO;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.apache.beam.sdk.transforms.Flatten;
+import org.apache.beam.sdk.transforms.GroupByKey;
+import org.apache.beam.sdk.transforms.ParDo;
+import org.apache.beam.sdk.transforms.WithKeys;
+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 between Datastore and Cloud SQL.
+ *
+ * <p>This pipeline is to be launched by {@link google.registry.tools.ValidateDatastoreCommand} or
+ * {@link google.registry.tools.ValidateSqlCommand}.
+ */
+@DeleteAfterMigration
+public class ValidateDatabasePipeline {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  /** Specifies the extra CommitLogs to load before the start of a Database export. */
+  private static final Duration COMMITLOG_START_TIME_MARGIN = Duration.standardMinutes(10);
+
+  private final ValidateDatabasePipelineOptions options;
+  private final LatestDatastoreSnapshotFinder datastoreSnapshotFinder;
+
+  public ValidateDatabasePipeline(
+      ValidateDatabasePipelineOptions options,
+      LatestDatastoreSnapshotFinder datastoreSnapshotFinder) {
+    this.options = options;
+    this.datastoreSnapshotFinder = datastoreSnapshotFinder;
+  }
+
+  @VisibleForTesting
+  void run(Pipeline pipeline) {
+    DateTime latestCommitLogTime = DateTime.parse(options.getLatestCommitLogTimestamp());
+    DatastoreSnapshotInfo mostRecentExport =
+        datastoreSnapshotFinder.getSnapshotInfo(latestCommitLogTime.toInstant());
+
+    logger.atInfo().log(
+        "Comparing datastore export at %s and commitlog timestamp %s.",
+        mostRecentExport.exportDir(), latestCommitLogTime);
+
+    Optional<String> outputPath =
+        Optional.ofNullable(options.getDiffOutputGcsBucket())
+            .map(
+                bucket ->
+                    String.format(
+                        "gs://%s/validate_database/%s/diffs.txt",
+                        bucket, new SystemClock().nowUtc()));
+    outputPath.ifPresent(path -> logger.atInfo().log("Discrepancies will be logged to %s", path));
+
+    setupPipeline(
+        pipeline,
+        Optional.ofNullable(options.getSqlSnapshotId()),
+        mostRecentExport,
+        latestCommitLogTime,
+        Optional.ofNullable(options.getComparisonStartTimestamp()).map(DateTime::parse),
+        outputPath);
+
+    pipeline.run();
+  }
+
+  static void setupPipeline(
+      Pipeline pipeline,
+      Optional<String> sqlSnapshotId,
+      DatastoreSnapshotInfo mostRecentExport,
+      DateTime latestCommitLogTime,
+      Optional<DateTime> compareStartTime,
+      Optional<String> diffOutputPath) {
+    pipeline
+        .getCoderRegistry()
+        .registerCoderForClass(SqlEntity.class, SerializableCoder.of(Serializable.class));
+
+    PCollectionTuple datastoreSnapshot =
+        DatastoreSnapshots.loadDatastoreSnapshotByKind(
+            pipeline,
+            mostRecentExport.exportDir(),
+            mostRecentExport.commitLogDir(),
+            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),
+            DatastoreSnapshots.ALL_DATASTORE_KINDS,
+            compareStartTime);
+
+    PCollectionTuple cloudSqlSnapshot =
+        SqlSnapshots.loadCloudSqlSnapshotByType(
+            pipeline, SqlSnapshots.ALL_SQL_ENTITIES, sqlSnapshotId, compareStartTime);
+
+    verify(
+        datastoreSnapshot.getAll().keySet().equals(cloudSqlSnapshot.getAll().keySet()),
+        "Expecting the same set of types in both snapshots.");
+
+    PCollectionList<String> diffLogs = PCollectionList.empty(pipeline);
+
+    for (Class<? extends SqlEntity> clazz : SqlSnapshots.ALL_SQL_ENTITIES) {
+      TupleTag<SqlEntity> tag = ValidateSqlUtils.createSqlEntityTupleTag(clazz);
+      verify(
+          datastoreSnapshot.has(tag), "Missing %s in Datastore snapshot.", clazz.getSimpleName());
+      verify(cloudSqlSnapshot.has(tag), "Missing %s in Cloud SQL snapshot.", clazz.getSimpleName());
+      diffLogs =
+          diffLogs.and(
+              PCollectionList.of(datastoreSnapshot.get(tag))
+                  .and(cloudSqlSnapshot.get(tag))
+                  .apply(
+                      "Combine from both snapshots: " + clazz.getSimpleName(),
+                      Flatten.pCollections())
+                  .apply(
+                      "Assign primary key to merged " + clazz.getSimpleName(),
+                      WithKeys.of(ValidateDatabasePipeline::getPrimaryKeyString)
+                          .withKeyType(strings()))
+                  .apply("Group by primary key " + clazz.getSimpleName(), GroupByKey.create())
+                  .apply("Compare " + clazz.getSimpleName(), ParDo.of(new CompareSqlEntity())));
+    }
+    if (diffOutputPath.isPresent()) {
+      diffLogs
+          .apply("Gather diff logs", Flatten.pCollections())
+          .apply(
+              "Output diffs",
+              TextIO.write()
+                  .to(diffOutputPath.get())
+                  /**
+                   * Output to a single file for ease of use since diffs should be few. If this
+                   * assumption turns out not to be false, user should abort the pipeline and
+                   * investigate why.
+                   */
+                  .withoutSharding()
+                  .withDelimiter((Strings.repeat("-", 80) + "\n").toCharArray()));
+    }
+  }
+
+  private static String getPrimaryKeyString(SqlEntity sqlEntity) {
+    // SqlEntity.getPrimaryKeyString only works with entities registered with Hibernate.
+    // We are using the BulkQueryJpaTransactionManager, which does not recognize DomainBase and
+    // DomainHistory. See BulkQueryEntities.java for more information.
+    if (sqlEntity instanceof DomainBase) {
+      return "DomainBase_" + ((DomainBase) sqlEntity).getRepoId();
+    }
+    if (sqlEntity instanceof DomainHistory) {
+      return "DomainHistory_" + ((DomainHistory) sqlEntity).getDomainHistoryId().toString();
+    }
+    return sqlEntity.getPrimaryKeyString();
+  }
+
+  public static void main(String[] args) {
+    ValidateDatabasePipelineOptions options =
+        PipelineOptionsFactory.fromArgs(args)
+            .withValidation()
+            .as(ValidateDatabasePipelineOptions.class);
+    RegistryPipelineOptions.validateRegistryPipelineOptions(options);
+
+    // Defensively set important options.
+    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_REPEATABLE_READ);
+    options.setJpaTransactionManagerType(JpaTransactionManagerType.BULK_QUERY);
+
+    // Set up JPA in the pipeline harness (the locally executed part of the main() method). Reuse
+    // code in RegistryPipelineWorkerInitializer, which only applies to pipeline worker VMs.
+    new RegistryPipelineWorkerInitializer().beforeProcessing(options);
+
+    LatestDatastoreSnapshotFinder datastoreSnapshotFinder =
+        DaggerLatestDatastoreSnapshotFinder_LatestDatastoreSnapshotFinderFinderComponent.create()
+            .datastoreSnapshotInfoFinder();
+
+    new ValidateDatabasePipeline(options, datastoreSnapshotFinder).run(Pipeline.create(options));
+  }
+}
--- a/core/src/main/java/google/registry/beam/comparedb/ValidateDatabasePipelineOptions.java
+++ b/core/src/main/java/google/registry/beam/comparedb/ValidateDatabasePipelineOptions.java
@@ -0,0 +1,55 @@
+// Copyright 2022 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.beam.comparedb;
+
+import google.registry.beam.common.RegistryPipelineOptions;
+import google.registry.model.annotations.DeleteAfterMigration;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.options.Description;
+import org.apache.beam.sdk.options.Validation;
+
+/** BEAM pipeline options for {@link ValidateDatabasePipeline}. */
+@DeleteAfterMigration
+public interface ValidateDatabasePipelineOptions extends RegistryPipelineOptions {
+
+  @Description(
+      "The id of the SQL snapshot to be compared with Datastore. "
+          + "If null, the current state of the SQL database is used.")
+  @Nullable
+  String getSqlSnapshotId();
+
+  void setSqlSnapshotId(String snapshotId);
+
+  @Description("The latest CommitLogs to load, in ISO8601 format.")
+  @Validation.Required
+  String getLatestCommitLogTimestamp();
+
+  void setLatestCommitLogTimestamp(String commitLogEndTimestamp);
+
+  @Description(
+      "For history entries and EPP resources, only those modified strictly after this time are "
+          + "included in comparison. Value is in ISO8601 format. "
+          + "Other entity types are not affected.")
+  @Nullable
+  String getComparisonStartTimestamp();
+
+  void setComparisonStartTimestamp(String comparisonStartTimestamp);
+
+  @Description("The GCS bucket where discrepancies found during comparison should be logged.")
+  @Nullable
+  String getDiffOutputGcsBucket();
+
+  void setDiffOutputGcsBucket(String gcsBucket);
+}
--- a/core/src/main/java/google/registry/beam/comparedb/ValidateSqlPipeline.java
+++ b/core/src/main/java/google/registry/beam/comparedb/ValidateSqlPipeline.java
@@ -1,159 +0,0 @@
-// 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.beam.comparedb;
-
-import static com.google.common.base.Verify.verify;
-import static org.apache.beam.sdk.values.TypeDescriptors.strings;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-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.domain.DomainBase;
-import google.registry.model.domain.DomainHistory;
-import google.registry.model.replay.SqlEntity;
-import google.registry.model.replay.SqlReplayCheckpoint;
-import google.registry.persistence.PersistenceModule.JpaTransactionManagerType;
-import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
-import google.registry.persistence.transaction.TransactionManagerFactory;
-import java.io.Serializable;
-import java.util.Optional;
-import org.apache.beam.sdk.Pipeline;
-import org.apache.beam.sdk.PipelineResult.State;
-import org.apache.beam.sdk.coders.SerializableCoder;
-import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.transforms.Flatten;
-import org.apache.beam.sdk.transforms.GroupByKey;
-import org.apache.beam.sdk.transforms.ParDo;
-import org.apache.beam.sdk.transforms.WithKeys;
-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;
-
-/**
- * Validates the asynchronous data replication process from Datastore (primary storage) to Cloud SQL
- * (secondary storage).
- */
-public class ValidateSqlPipeline {
-
-  /** Specifies the extra CommitLogs to load before the start of a Database export. */
-  private static final int COMMIT_LOG_MARGIN_MINUTES = 10;
-
-  private final ValidateSqlPipelineOptions options;
-  private final DatastoreSnapshotInfo mostRecentExport;
-
-  public ValidateSqlPipeline(
-      ValidateSqlPipelineOptions options, DatastoreSnapshotInfo mostRecentExport) {
-    this.options = options;
-    this.mostRecentExport = mostRecentExport;
-  }
-
-  void run() {
-    run(Pipeline.create(options));
-  }
-
-  @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);
-      }
-    }
-  }
-
-  void setupPipeline(
-      Pipeline pipeline, Optional<String> sqlSnapshotId, DateTime latestCommitLogTime) {
-    pipeline
-        .getCoderRegistry()
-        .registerCoderForClass(SqlEntity.class, SerializableCoder.of(Serializable.class));
-
-    PCollectionTuple datastoreSnapshot =
-        DatastoreSnapshots.loadDatastoreSnapshotByKind(
-            pipeline,
-            mostRecentExport.exportDir(),
-            mostRecentExport.commitLogDir(),
-            mostRecentExport.exportInterval().getStart().minusMinutes(COMMIT_LOG_MARGIN_MINUTES),
-            // Increase by 1ms since we want to include commitLogs latestCommitLogTime but
-            // this parameter is exclusive.
-            latestCommitLogTime.plusMillis(1),
-            DatastoreSnapshots.ALL_DATASTORE_KINDS);
-
-    PCollectionTuple cloudSqlSnapshot =
-        SqlSnapshots.loadCloudSqlSnapshotByType(
-            pipeline, SqlSnapshots.ALL_SQL_ENTITIES, sqlSnapshotId);
-
-    verify(
-        datastoreSnapshot.getAll().keySet().equals(cloudSqlSnapshot.getAll().keySet()),
-        "Expecting the same set of types in both snapshots.");
-
-    for (Class<? extends SqlEntity> clazz : SqlSnapshots.ALL_SQL_ENTITIES) {
-      TupleTag<SqlEntity> tag = ValidateSqlUtils.createSqlEntityTupleTag(clazz);
-      verify(
-          datastoreSnapshot.has(tag), "Missing %s in Datastore snapshot.", clazz.getSimpleName());
-      verify(cloudSqlSnapshot.has(tag), "Missing %s in Cloud SQL snapshot.", clazz.getSimpleName());
-      PCollectionList.of(datastoreSnapshot.get(tag))
-          .and(cloudSqlSnapshot.get(tag))
-          .apply("Combine from both snapshots: " + clazz.getSimpleName(), Flatten.pCollections())
-          .apply(
-              "Assign primary key to merged " + clazz.getSimpleName(),
-              WithKeys.of(ValidateSqlPipeline::getPrimaryKeyString).withKeyType(strings()))
-          .apply("Group by primary key " + clazz.getSimpleName(), GroupByKey.create())
-          .apply("Compare " + clazz.getSimpleName(), ParDo.of(new CompareSqlEntity()));
-    }
-  }
-
-  private static String getPrimaryKeyString(SqlEntity sqlEntity) {
-    // SqlEntity.getPrimaryKeyString only works with entities registered with Hibernate.
-    // We are using the BulkQueryJpaTransactionManager, which does not recognize DomainBase and
-    // DomainHistory. See BulkQueryEntities.java for more information.
-    if (sqlEntity instanceof DomainBase) {
-      return "DomainBase_" + ((DomainBase) sqlEntity).getRepoId();
-    }
-    if (sqlEntity instanceof DomainHistory) {
-      return "DomainHistory_" + ((DomainHistory) sqlEntity).getDomainHistoryId().toString();
-    }
-    return sqlEntity.getPrimaryKeyString();
-  }
-
-  public static void main(String[] args) {
-    ValidateSqlPipelineOptions options =
-        PipelineOptionsFactory.fromArgs(args).withValidation().as(ValidateSqlPipelineOptions.class);
-
-    // Defensively set important options.
-    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_REPEATABLE_READ);
-    options.setJpaTransactionManagerType(JpaTransactionManagerType.BULK_QUERY);
-
-    // Reuse Dataflow worker initialization code to set up JPA in the pipeline harness.
-    new RegistryPipelineWorkerInitializer().beforeProcessing(options);
-
-    DatastoreSnapshotInfo mostRecentExport =
-        DaggerLatestDatastoreSnapshotFinder_LatestDatastoreSnapshotFinderFinderComponent.create()
-            .datastoreSnapshotInfoFinder()
-            .getSnapshotInfo();
-
-    new ValidateSqlPipeline(options, mostRecentExport).run(Pipeline.create(options));
-  }
-}
--- a/core/src/main/java/google/registry/beam/comparedb/ValidateSqlUtils.java
+++ b/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.flogger.FluentLogger;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Maps.EntryTransformer;
+import google.registry.beam.initsql.Transforms;
+import google.registry.config.RegistryEnvironment;
 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,33 +35,44 @@ 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 google.registry.util.DiffUtils;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.math.BigInteger;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.beam.sdk.metrics.Counter;
 import org.apache.beam.sdk.metrics.Metrics;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.TupleTag;
+import org.checkerframework.checker.nullness.qual.Nullable;

-/** Helpers for use by {@link ValidateSqlPipeline}. */
+/** Helpers for use by {@link ValidateDatabasePipeline}. */
+@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.
   *
-   * <p>The {@link ValidateSqlPipeline} uses this query to parallelize the query to some of the
+   * <p>The {@link ValidateDatabasePipeline} uses this query to parallelize the query to some of the
   * history tables. Although the {@code repo_id} column is the leading column in the primary keys
   * of these tables, in practice and with production data, division by {@code history_revision_id}
   * works slightly faster for unknown reasons.
@@ -87,13 +104,12 @@ final class ValidateSqlUtils {
    return new TupleTag<SqlEntity>(actualType.getSimpleName()) {};
  }

-  static class CompareSqlEntity extends DoFn<KV<String, Iterable<SqlEntity>>, Void> {
+  static class CompareSqlEntity extends DoFn<KV<String, Iterable<SqlEntity>>, String> {
    private final HashMap<String, Counter> totalCounters = new HashMap<>();
    private final HashMap<String, Counter> missingCounters = new HashMap<>();
    private final HashMap<String, Counter> unequalCounters = new HashMap<>();
    private final HashMap<String, Counter> badEntityCounters = new HashMap<>();
-
-    private volatile boolean logPrinted = false;
+    private final HashMap<String, Counter> duplicateEntityCounters = new HashMap<>();

    private String getCounterKey(Class<?> clazz) {
      return PollMessage.class.isAssignableFrom(clazz) ? "PollMessage" : clazz.getSimpleName();
@@ -108,81 +124,129 @@ final class ValidateSqlUtils {
          counterKey, Metrics.counter("CompareDB", "Missing In One DB: " + counterKey));
      unequalCounters.put(counterKey, Metrics.counter("CompareDB", "Not Equal:" + counterKey));
      badEntityCounters.put(counterKey, Metrics.counter("CompareDB", "Bad Entities:" + counterKey));
+      duplicateEntityCounters.put(
+          counterKey, Metrics.counter("CompareDB", "Duplicate Entities:" + counterKey));
+    }
+
+    String duplicateEntityLog(String key, ImmutableList<SqlEntity> entities) {
+      return String.format("%s: %d entities.", key, entities.size());
+    }
+
+    String unmatchedEntityLog(String key, SqlEntity entry) {
+      // For a PollMessage only found in Datastore, key is not enough to query for it.
+      return String.format("Missing in one DB:\n%s", entry instanceof PollMessage ? entry : key);
    }

    /**
     * A rudimentary debugging helper that prints the first pair of unequal entities in each worker.
     * This will be removed when we start exporting such entities to GCS.
     */
-    void logDiff(String key, Object entry0, Object entry1) {
-      if (logPrinted) {
-        return;
-      }
-      logPrinted = true;
+    String unEqualEntityLog(String key, SqlEntity entry0, SqlEntity entry1) {
      Map<String, Object> fields0 = ((ImmutableObject) entry0).toDiffableFieldMap();
      Map<String, Object> fields1 = ((ImmutableObject) entry1).toDiffableFieldMap();
-      StringBuilder sb = new StringBuilder();
-      fields0.forEach(
-          (field, value) -> {
-            if (fields1.containsKey(field)) {
-              if (!Objects.equals(value, fields1.get(field))) {
-                sb.append(field + " not match: " + value + " -> " + fields1.get(field) + "\n");
-              }
-            } else {
-              sb.append(field + "Not found in entity 2\n");
-            }
-          });
-      fields1.forEach(
-          (field, value) -> {
-            if (!fields0.containsKey(field)) {
-              sb.append(field + "Not found in entity 1\n");
-            }
-          });
-      logger.atWarning().log(key + "  " + sb.toString());
+      return key + "  " + DiffUtils.prettyPrintEntityDeepDiff(fields0, fields1);
+    }
+
+    String badEntitiesLog(String key, SqlEntity entry0, SqlEntity entry1) {
+      Map<String, Object> fields0 = ((ImmutableObject) entry0).toDiffableFieldMap();
+      Map<String, Object> fields1 = ((ImmutableObject) entry1).toDiffableFieldMap();
+      return String.format(
+          "Failed to parse one or both entities for key %s:\n%s\n",
+          key, DiffUtils.prettyPrintEntityDeepDiff(fields0, fields1));
    }

    @ProcessElement
-    public void processElement(@Element KV<String, Iterable<SqlEntity>> kv) {
+    public void processElement(
+        @Element KV<String, Iterable<SqlEntity>> kv, OutputReceiver<String> out) {
      ImmutableList<SqlEntity> entities = ImmutableList.copyOf(kv.getValue());

      verify(!entities.isEmpty(), "Can't happen: no value for key %s.", kv.getKey());
-      verify(entities.size() <= 2, "Unexpected duplicates for key %s", kv.getKey());

      String counterKey = getCounterKey(entities.get(0).getClass());
      ensureCounterExists(counterKey);
      totalCounters.get(counterKey).inc();

-      if (entities.size() == 1) {
-        missingCounters.get(counterKey).inc();
-        // Temporary debugging help. See logDiff() above.
-        if (!logPrinted) {
-          logPrinted = true;
-          logger.atWarning().log("Unexpected single entity: %s", kv.getKey());
-        }
+      if (entities.size() > 2) {
+        // Duplicates may happen with Cursors if imported across projects. Its key in Datastore, the
+        // id field, encodes the project name and is not fixed by the importing job.
+        duplicateEntityCounters.get(counterKey).inc();
+        out.output(duplicateEntityLog(kv.getKey(), entities) + "\n");
+        return;
+      }
+
+      if (entities.size() == 1) {
+        if (isSpecialCaseProberEntity(entities.get(0))) {
+          return;
+        }
+        missingCounters.get(counterKey).inc();
+        out.output(unmatchedEntityLog(kv.getKey(), entities.get(0)) + "\n");
+        return;
+      }
+      SqlEntity entity0 = entities.get(0);
+      SqlEntity entity1 = entities.get(1);
+
+      if (isSpecialCaseProberEntity(entity0) && isSpecialCaseProberEntity(entity1)) {
+        // Ignore prober-related data: their deletions are not propagated from Datastore to SQL.
+        // When code reaches here, in most cases it involves one soft deleted entity in Datastore
+        // and an SQL entity with its pre-deletion status.
        return;
      }
-      SqlEntity entity0;
-      SqlEntity entity1;

      try {
-        entity0 = normalizeEntity(entities.get(0));
-        entity1 = normalizeEntity(entities.get(1));
+        entity0 = normalizeEntity(entity0);
+        entity1 = normalizeEntity(entity1);
      } catch (Exception e) {
-        // Temporary debugging help. See logDiff() above.
-        if (!logPrinted) {
-          logPrinted = true;
-          badEntityCounters.get(counterKey).inc();
-        }
+        badEntityCounters.get(counterKey).inc();
+        out.output(badEntitiesLog(kv.getKey(), entity0, entity1));
        return;
      }

-      if (!Objects.equals(entity0, entity1)) {
+      Map<String, Object> fields0 =
+          Maps.transformEntries(
+              ((ImmutableObject) entity0).toDiffableFieldMap(), new DiffableFieldNormalizer());
+      Map<String, Object> fields1 =
+          Maps.transformEntries(
+              ((ImmutableObject) entity1).toDiffableFieldMap(), new DiffableFieldNormalizer());
+      if (!Objects.equals(fields0, fields1)) {
        unequalCounters.get(counterKey).inc();
-        logDiff(kv.getKey(), entities.get(0), entities.get(1));
+        out.output(kv.getKey() + "  " + DiffUtils.prettyPrintEntityDeepDiff(fields0, fields1));
      }
    }
  }

+  /**
+   * Normalizes trivial differences between objects persisted in Datastore and SQL.
+   *
+   * <p>This class works on a map generated by {@link ImmutableObject#toDiffableFieldMap}, and
+   * performs the following changes:
+   *
+   * <ul>
+   *   <li>If a value is an empty {@link Collection}, it is converted to null
+   *   <li>For each {@link google.registry.model.eppcommon.Address} object, empty strings are
+   *       removed from its {@code string} field, which is a {@link List}.
+   * </ul>
+   */
+  static class DiffableFieldNormalizer
+      implements EntryTransformer<String, Object, Object>, Serializable {
+
+    @Override
+    public Object transformEntry(String key, @Nullable Object value) {
+      if (value instanceof Collection && ((Collection<?>) value).isEmpty()) {
+        return null;
+      }
+      if (key.equals("street") && value instanceof List) {
+        return ((List<?>) value)
+            .stream().filter(v -> v != null && !Objects.equals("", v)).collect(Collectors.toList());
+      }
+      // Short-term hack: LinkedHashMap<String, ?> represents a child ImmutableObject instance.
+      if (value instanceof LinkedHashMap
+          && ((LinkedHashMap<?, ?>) value).keySet().stream().anyMatch(e -> e instanceof String)) {
+        return Maps.transformEntries((Map<String, Object>) value, this);
+      }
+      return value;
+    }
+  }
+
  static SqlEntity normalizeEntity(SqlEntity sqlEntity) {
    if (sqlEntity instanceof EppResource) {
      return normalizeEppResource(sqlEntity);
@@ -246,6 +310,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 +318,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 +342,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;
+  }
 }
--- a/core/src/main/java/google/registry/beam/datastore/BulkDeleteDatastorePipeline.java
+++ b/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();

--- a/core/src/main/java/google/registry/beam/datastore/DatastoreV1.java
+++ b/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
--- a/core/src/main/java/google/registry/beam/initsql/BackupPaths.java
+++ b/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() {}
--- a/core/src/main/java/google/registry/beam/initsql/DomainBaseUtil.java
+++ b/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() {}
--- a/core/src/main/java/google/registry/beam/initsql/InitSqlPipeline.java
+++ b/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 {

  /**
@@ -156,7 +158,7 @@ public class InitSqlPipeline implements Serializable {
                    .addAll(toKindStrings(PHASE_TWO_ORDERED))
                    .build()));

-    // Set up the pipeline to write entity kinds from PHASE_ONE_ORDERED to SQL. Return a object
+    // Set up the pipeline to write entity kinds from PHASE_ONE_ORDERED to SQL. Return an object
    // that signals the completion of the phase.
    PCollection<Void> blocker =
        scheduleOnePhaseWrites(datastoreSnapshot, PHASE_ONE_ORDERED, Optional.empty(), null);
--- a/core/src/main/java/google/registry/beam/initsql/InitSqlPipelineOptions.java
+++ b/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.")
--- a/core/src/main/java/google/registry/beam/initsql/Transforms.java
+++ b/core/src/main/java/google/registry/beam/initsql/Transforms.java
@@ -22,7 +22,7 @@ import static google.registry.beam.initsql.BackupPaths.getExportFilePatterns;
 import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
+import static google.registry.util.DomainNameUtils.canonicalizeHostname;
 import static java.util.Comparator.comparing;
 import static org.apache.beam.sdk.values.TypeDescriptors.kvs;
 import static org.apache.beam.sdk.values.TypeDescriptors.strings;
@@ -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;
  }

@@ -339,11 +343,11 @@ public final class Transforms {
      // Canonicalize old domain/host names from 2016 and earlier before we were enforcing this.
      entity.setIndexedProperty(
          "fullyQualifiedDomainName",
-          canonicalizeDomainName((String) entity.getProperty("fullyQualifiedDomainName")));
+          canonicalizeHostname((String) entity.getProperty("fullyQualifiedDomainName")));
    } else if (entity.getKind().equals("HostResource")) {
      entity.setIndexedProperty(
          "fullyQualifiedHostName",
-          canonicalizeDomainName((String) entity.getProperty("fullyQualifiedHostName")));
+          canonicalizeHostname((String) entity.getProperty("fullyQualifiedHostName")));
    }
    return entity;
  }
--- a/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java
+++ b/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java
@@ -18,6 +18,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.beam.BeamUtils.getQueryFromFile;
 import static org.apache.beam.sdk.values.TypeDescriptors.strings;

+import com.google.common.flogger.FluentLogger;
 import google.registry.beam.common.RegistryJpaIO;
 import google.registry.beam.common.RegistryJpaIO.Read;
 import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey;
@@ -35,6 +36,7 @@ import java.time.LocalTime;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import org.apache.beam.sdk.Pipeline;
@@ -53,6 +55,7 @@ import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TypeDescriptor;
+import org.joda.money.CurrencyUnit;

 /**
 * Definition of a Dataflow Flex pipeline template, which generates a given month's invoices.
@@ -73,6 +76,8 @@ public class InvoicingPipeline implements Serializable {
  private static final Pattern SQL_COMMENT_REGEX =
      Pattern.compile("^\\s*--.*\\n", Pattern.MULTILINE);

+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
  private final InvoicingPipelineOptions options;

  InvoicingPipeline(InvoicingPipelineOptions options) {
@@ -113,31 +118,44 @@ public class InvoicingPipeline implements Serializable {
      InvoicingPipelineOptions options, Pipeline pipeline) {
    Read<Object[], BillingEvent> read =
        RegistryJpaIO.read(
-            makeCloudSqlQuery(options.getYearMonth()), false, InvoicingPipeline::parseRow);
+            makeCloudSqlQuery(options.getYearMonth()), false, row -> parseRow(row).orElse(null));

-    return pipeline.apply("Read BillingEvents from Cloud SQL", read);
+    PCollection<BillingEvent> billingEventsWithNulls =
+        pipeline.apply("Read BillingEvents from Cloud SQL", read);
+
+    // Remove null billing events
+    return billingEventsWithNulls.apply(Filter.by(Objects::nonNull));
  }

-  private static BillingEvent parseRow(Object[] row) {
+  private static Optional<BillingEvent> parseRow(Object[] row) {
    google.registry.model.billing.BillingEvent.OneTime oneTime =
        (google.registry.model.billing.BillingEvent.OneTime) row[0];
    Registrar registrar = (Registrar) row[1];
-    return BillingEvent.create(
-        oneTime.getId(),
-        DateTimeUtils.toZonedDateTime(oneTime.getBillingTime(), ZoneId.of("UTC")),
-        DateTimeUtils.toZonedDateTime(oneTime.getEventTime(), ZoneId.of("UTC")),
-        registrar.getRegistrarId(),
-        registrar.getBillingIdentifier().toString(),
-        registrar.getPoNumber().orElse(""),
-        DomainNameUtils.getTldFromDomainName(oneTime.getTargetId()),
-        oneTime.getReason().toString(),
-        oneTime.getTargetId(),
-        oneTime.getDomainRepoId(),
-        Optional.ofNullable(oneTime.getPeriodYears()).orElse(0),
-        oneTime.getCost().getCurrencyUnit().toString(),
-        oneTime.getCost().getAmount().doubleValue(),
-        String.join(
-            " ", oneTime.getFlags().stream().map(Flag::toString).collect(toImmutableSet())));
+    CurrencyUnit currency = oneTime.getCost().getCurrencyUnit();
+    if (!registrar.getBillingAccountMap().containsKey(currency)) {
+      logger.atSevere().log(
+          "Registrar %s does not have a product account key for the currency unit: %s",
+          registrar.getRegistrarId(), currency);
+      return Optional.empty();
+    }
+
+    return Optional.of(
+        BillingEvent.create(
+            oneTime.getId(),
+            DateTimeUtils.toZonedDateTime(oneTime.getBillingTime(), ZoneId.of("UTC")),
+            DateTimeUtils.toZonedDateTime(oneTime.getEventTime(), ZoneId.of("UTC")),
+            registrar.getRegistrarId(),
+            registrar.getBillingAccountMap().get(currency),
+            registrar.getPoNumber().orElse(""),
+            DomainNameUtils.getTldFromDomainName(oneTime.getTargetId()),
+            oneTime.getReason().toString(),
+            oneTime.getTargetId(),
+            oneTime.getDomainRepoId(),
+            Optional.ofNullable(oneTime.getPeriodYears()).orElse(0),
+            oneTime.getCost().getCurrencyUnit().toString(),
+            oneTime.getCost().getAmount().doubleValue(),
+            String.join(
+                " ", oneTime.getFlags().stream().map(Flag::toString).collect(toImmutableSet()))));
  }

  /** Transform that converts a {@code BillingEvent} into an invoice CSV row. */
--- a/core/src/main/java/google/registry/beam/rde/RdeIO.java
+++ b/core/src/main/java/google/registry/beam/rde/RdeIO.java
@@ -68,6 +68,7 @@ import org.apache.beam.sdk.values.PDone;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;

 public class RdeIO {

@@ -167,13 +168,13 @@ public class RdeIO {
          Optional.ofNullable(key.revision())
              .orElseGet(() -> RdeRevision.getNextRevision(tld, watermark, mode));
      String id = RdeUtil.timestampToId(watermark);
-      String prefix = options.getJobName();
-      String basename = RdeNamingUtils.makeRydeFilename(tld, watermark, mode, 1, revision);
+      String prefix =
+          options.getJobName()
+              + '/'
+              + RdeNamingUtils.makeRydeFilename(tld, watermark, mode, 1, revision);
      if (key.manual()) {
        checkState(key.directoryWithTrailingSlash() != null, "Manual subdirectory not specified");
-        prefix = prefix + "/manual/" + key.directoryWithTrailingSlash() + basename;
-      } else {
-        prefix = prefix + '/' + basename;
+        prefix = "manual/" + key.directoryWithTrailingSlash() + prefix;
      }
      BlobId xmlFilename = BlobId.of(rdeBucket, prefix + ".xml.ghostryde");
      // This file will contain the byte length (ASCII) of the raw unencrypted XML.
@@ -248,6 +249,9 @@ public class RdeIO {
      // Now that we're done, output roll the cursor forward.
      if (key.manual()) {
        logger.atInfo().log("Manual operation; not advancing cursor or enqueuing upload task.");
+        // Temporary measure to run RDE in beam in parallel with the daily MapReduce based RDE runs.
+      } else if (tm().isOfy()) {
+        logger.atInfo().log("Ofy is primary TM; not advancing cursor or enqueuing upload task.");
      } else {
        outputReceiver.output(KV.of(key, revision));
      }
@@ -258,6 +262,7 @@ public class RdeIO {

    private static final FluentLogger logger = FluentLogger.forEnclosingClass();
    private static final long serialVersionUID = 5822176227753327224L;
+    private static final Duration ENQUEUE_DELAY = Duration.standardMinutes(1);

    private final CloudTasksUtils cloudTasksUtils;

@@ -268,10 +273,10 @@ public class RdeIO {
    @ProcessElement
    public void processElement(
        @Element KV<PendingDeposit, Integer> input, PipelineOptions options) {
+
      tm().transact(
              () -> {
                PendingDeposit key = input.getKey();
-                int revision = input.getValue();
                Registry registry = Registry.get(key.tld());
                Optional<Cursor> cursor =
                    transactIfJpaTm(
@@ -293,22 +298,30 @@ public class RdeIO {
                tm().put(Cursor.create(key.cursor(), newPosition, registry));
                logger.atInfo().log(
                    "Rolled forward %s on %s cursor to %s.", key.cursor(), key.tld(), newPosition);
-                RdeRevision.saveRevision(key.tld(), key.watermark(), key.mode(), revision);
+                RdeRevision.saveRevision(key.tld(), key.watermark(), key.mode(), input.getValue());
+                // Enqueueing a task is a side effect that is not undone if the transaction rolls
+                // back. So this may result in multiple copies of the same task being processed.
+                // This is fine because the RdeUploadAction is guarded by a lock and tracks progress
+                // by cursor. The BrdaCopyAction writes a file to GCS, which is an atomic action. It
+                // is also guarded by a cursor to not run before the cursor is updated. We also
+                // include a delay to minimize the chance that the enqueued job executes before the
+                // transaction is committed, which triggers a retry.
                if (key.mode() == RdeMode.FULL) {
                  cloudTasksUtils.enqueue(
                      RDE_UPLOAD_QUEUE,
-                      CloudTasksUtils.createPostTask(
+                      cloudTasksUtils.createPostTaskWithDelay(
                          RdeUploadAction.PATH,
                          Service.BACKEND.getServiceId(),
                          ImmutableMultimap.of(
                              RequestParameters.PARAM_TLD,
                              key.tld(),
                              RdeModule.PARAM_PREFIX,
-                              options.getJobName() + '/')));
+                              options.getJobName() + '/'),
+                          ENQUEUE_DELAY));
                } else {
                  cloudTasksUtils.enqueue(
                      BRDA_QUEUE,
-                      CloudTasksUtils.createPostTask(
+                      cloudTasksUtils.createPostTaskWithDelay(
                          BrdaCopyAction.PATH,
                          Service.BACKEND.getServiceId(),
                          ImmutableMultimap.of(
@@ -317,7 +330,8 @@ public class RdeIO {
                              RdeModule.PARAM_WATERMARK,
                              key.watermark().toString(),
                              RdeModule.PARAM_PREFIX,
-                              options.getJobName() + '/')));
+                              options.getJobName() + '/'),
+                          ENQUEUE_DELAY));
                }
              });
    }
--- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java
+++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java
@@ -15,6 +15,7 @@
 package google.registry.beam.rde;

 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.beam.rde.RdePipeline.TupleTags.DOMAIN_FRAGMENTS;
 import static google.registry.beam.rde.RdePipeline.TupleTags.EXTERNAL_HOST_FRAGMENTS;
@@ -28,10 +29,12 @@ import static google.registry.model.reporting.HistoryEntryDao.RESOURCE_TYPES_TO_
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static org.apache.beam.sdk.values.TypeDescriptors.kvs;

+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
+import com.google.common.flogger.FluentLogger;
 import com.google.common.io.BaseEncoding;
 import dagger.BindsInstance;
 import dagger.Component;
@@ -198,6 +201,8 @@ public class RdePipeline implements Serializable {
          HostHistory.class,
          "hostBase");

+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
  @Inject
  RdePipeline(RdePipelineOptions options, GcsUtils gcsUtils, CloudTasksUtils cloudTasksUtils) {
    this.options = options;
@@ -357,6 +362,33 @@ public class RdePipeline implements Serializable {
        .setCoder(KvCoder.of(StringUtf8Coder.of(), VarLongCoder.of()));
  }

+  private <T extends HistoryEntry> EppResource loadResourceByHistoryEntryId(
+      Class<T> historyEntryClazz, String repoId, Iterable<Long> revisionIds) {
+    ImmutableList<Long> ids = ImmutableList.copyOf(revisionIds);
+    // The size should always be 1 because we are only getting one repo ID -> revision ID pair per
+    // repo ID from the source transform (the JPA query in the method above). But for some reason
+    // after CoGroupByKey (joining the revision IDs and the pending deposits on repo IDs), in
+    // #removedUnreferencedResources, duplicate revision IDs are sometimes introduced. Here we
+    // attempt to deduplicate the iterable. If it contains multiple revision IDs that are NOT the
+    // same, we have a more serious problem as we cannot be sure which one to use. We should use the
+    // highest revision ID, but we don't even know where it comes from, as the query should
+    // definitively only give us one revision ID per repo ID. In this case we have to abort and
+    // require manual intervention.
+    if (ids.size() != 1) {
+      ImmutableSet<Long> dedupedIds = ImmutableSet.copyOf(ids);
+      checkState(
+          dedupedIds.size() == 1,
+          "Multiple unique revision IDs detected for %s repo ID %s: %s",
+          EPP_RESOURCE_FIELD_NAME.get(historyEntryClazz),
+          repoId,
+          ids);
+      logger.atSevere().log(
+          "Duplicate revision IDs detected for %s repo ID %s: %s",
+          EPP_RESOURCE_FIELD_NAME.get(historyEntryClazz), repoId, ids);
+    }
+    return loadResourceByHistoryEntryId(historyEntryClazz, repoId, ids.get(0));
+  }
+
  private <T extends HistoryEntry> EppResource loadResourceByHistoryEntryId(
      Class<T> historyEntryClazz, String repoId, long revisionId) {
    try {
@@ -516,7 +548,7 @@ public class RdePipeline implements Serializable {
                              loadResourceByHistoryEntryId(
                                  ContactHistory.class,
                                  kv.getKey(),
-                                  kv.getValue().getOnly(REVISION_ID));
+                                  kv.getValue().getAll(REVISION_ID));
                      DepositFragment fragment = marshaller.marshalContact(contact);
                      ImmutableSet<KV<PendingDeposit, DepositFragment>> fragments =
                          Streams.stream(kv.getValue().getAll(PENDING_DEPOSIT))
@@ -549,8 +581,8 @@ public class RdePipeline implements Serializable {
                                loadResourceByHistoryEntryId(
                                    HostHistory.class,
                                    kv.getKey(),
-                                    kv.getValue().getOnly(REVISION_ID));
-                        // When a host is subordinate, we need to find it's superordinate domain and
+                                    kv.getValue().getAll(REVISION_ID));
+                        // When a host is subordinate, we need to find its superordinate domain and
                        // include it in the deposit as well.
                        if (host.isSubordinate()) {
                          subordinateHostCounter.inc();
@@ -627,7 +659,7 @@ public class RdePipeline implements Serializable {
                              loadResourceByHistoryEntryId(
                                  DomainHistory.class,
                                  kv.getKey(),
-                                  kv.getValue().getOnly(REVISION_ID));
+                                  kv.getValue().getAll(REVISION_ID));
                      ImmutableSet.Builder<KV<PendingDeposit, DepositFragment>> results =
                          new ImmutableSet.Builder<>();
                      for (KV<String, CoGbkResult> hostToPendingDeposits :
@@ -637,7 +669,7 @@ public class RdePipeline implements Serializable {
                                loadResourceByHistoryEntryId(
                                    HostHistory.class,
                                    hostToPendingDeposits.getKey(),
-                                    hostToPendingDeposits.getValue().getOnly(REVISION_ID));
+                                    hostToPendingDeposits.getValue().getAll(REVISION_ID));
                        DepositFragment fragment =
                            marshaller.marshalSubordinateHost(host, superordinateDomain);
                        Streams.stream(hostToPendingDeposits.getValue().getAll(PENDING_DEPOSIT))
@@ -696,6 +728,7 @@ public class RdePipeline implements Serializable {
   * CoGbkResult}s are used.
   */
  protected abstract static class TupleTags {
+
    protected static final TupleTag<KV<PendingDeposit, DepositFragment>> DOMAIN_FRAGMENTS =
        new TupleTag<KV<PendingDeposit, DepositFragment>>() {};

@@ -729,10 +762,12 @@ public class RdePipeline implements Serializable {
        UtilsModule.class
      })
  interface RdePipelineComponent {
+
    RdePipeline rdePipeline();

    @Component.Builder
    interface Builder {
+
      @BindsInstance
      Builder options(RdePipelineOptions options);

--- a/core/src/main/java/google/registry/beam/resave/ResaveAllEppResourcesPipeline.java
+++ b/core/src/main/java/google/registry/beam/resave/ResaveAllEppResourcesPipeline.java
@@ -0,0 +1,174 @@
+// Copyright 2022 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.beam.resave;
+
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+import static org.apache.beam.sdk.values.TypeDescriptors.integers;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import google.registry.beam.common.RegistryJpaIO;
+import google.registry.beam.common.RegistryJpaIO.Read;
+import google.registry.model.EppResource;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainBase;
+import google.registry.model.host.HostResource;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
+import google.registry.persistence.transaction.CriteriaQueryBuilder;
+import google.registry.util.DateTimeUtils;
+import java.io.Serializable;
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.PipelineResult;
+import org.apache.beam.sdk.transforms.DoFn;
+import org.apache.beam.sdk.transforms.GroupIntoBatches;
+import org.apache.beam.sdk.transforms.ParDo;
+import org.apache.beam.sdk.transforms.WithKeys;
+import org.apache.beam.sdk.util.ShardedKey;
+import org.apache.beam.sdk.values.KV;
+import org.joda.time.DateTime;
+
+/**
+ * A Dataflow Flex pipeline that resaves changed EPP resources in SQL.
+ *
+ * <p>Due to the way that Hibernate works, if an entity is unchanged by {@link
+ * EppResource#cloneProjectedAtTime(DateTime)} it will not actually be re-persisted to the database.
+ * Thus, the only actual changes occur when objects are changed by projecting them to now, such as
+ * when a pending transfer is resolved.
+ */
+public class ResaveAllEppResourcesPipeline implements Serializable {
+
+  private static final ImmutableSet<Class<? extends EppResource>> EPP_RESOURCE_CLASSES =
+      ImmutableSet.of(ContactResource.class, DomainBase.class, HostResource.class);
+
+  /**
+   * There exist three possible situations where we know we'll want to project domains to the
+   * current point in time:
+   *
+   * <ul>
+   *   <li>A pending domain transfer has expired.
+   *   <li>A domain is past its expiration time without being deleted (this means it autorenewed).
+   *   <li>A domain has expired grace periods.
+   * </ul>
+   *
+   * <p>This command contains all three scenarios so that we can avoid querying the Domain table
+   * multiple times, and to avoid projecting and resaving the same domain multiple times.
+   */
+  private static final String DOMAINS_TO_PROJECT_QUERY =
+      "FROM Domain d WHERE (d.transferData.transferStatus = 'PENDING' AND"
+          + " d.transferData.pendingTransferExpirationTime < current_timestamp()) OR"
+          + " (d.registrationExpirationTime < current_timestamp() AND d.deletionTime ="
+          + " (:END_OF_TIME)) OR (EXISTS (SELECT 1 FROM GracePeriod gp WHERE gp.domainRepoId ="
+          + " d.repoId AND gp.expirationTime < current_timestamp()))";
+
+  private final ResaveAllEppResourcesPipelineOptions options;
+
+  ResaveAllEppResourcesPipeline(ResaveAllEppResourcesPipelineOptions options) {
+    this.options = options;
+  }
+
+  PipelineResult run() {
+    Pipeline pipeline = Pipeline.create(options);
+    setupPipeline(pipeline);
+    return pipeline.run();
+  }
+
+  void setupPipeline(Pipeline pipeline) {
+    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_READ_COMMITTED);
+    if (options.getFast()) {
+      fastResaveContacts(pipeline);
+      fastResaveDomains(pipeline);
+    } else {
+      EPP_RESOURCE_CLASSES.forEach(clazz -> forceResaveAllResources(pipeline, clazz));
+    }
+  }
+
+  /** Projects to the current time and saves any contacts with expired transfers. */
+  private void fastResaveContacts(Pipeline pipeline) {
+    Read<ContactResource, ContactResource> read =
+        RegistryJpaIO.read(
+            "FROM Contact WHERE transferData.transferStatus = 'PENDING' AND"
+                + " transferData.pendingTransferExpirationTime < current_timestamp()",
+            ContactResource.class,
+            c -> c);
+    projectAndResaveResources(pipeline, ContactResource.class, read);
+  }
+
+  /**
+   * Projects to the current time and saves any domains with expired pending actions (e.g.
+   * transfers, grace periods).
+   *
+   * <p>The logic of what might have changed is paraphrased from {@link
+   * google.registry.model.domain.DomainContent#cloneProjectedAtTime(DateTime)}.
+   */
+  private void fastResaveDomains(Pipeline pipeline) {
+    Read<DomainBase, DomainBase> read =
+        RegistryJpaIO.read(
+            DOMAINS_TO_PROJECT_QUERY,
+            ImmutableMap.of("END_OF_TIME", DateTimeUtils.END_OF_TIME),
+            DomainBase.class,
+            d -> d);
+    projectAndResaveResources(pipeline, DomainBase.class, read);
+  }
+
+  /** Projects all resources to the current time and saves them. */
+  private <T extends EppResource> void forceResaveAllResources(Pipeline pipeline, Class<T> clazz) {
+    Read<T, T> read = RegistryJpaIO.read(() -> CriteriaQueryBuilder.create(clazz).build());
+    projectAndResaveResources(pipeline, clazz, read);
+  }
+
+  /** Projects and re-saves the result of the provided {@link Read}. */
+  private <T extends EppResource> void projectAndResaveResources(
+      Pipeline pipeline, Class<T> clazz, Read<?, T> read) {
+    int numShards = options.getSqlWriteShards();
+    int batchSize = options.getSqlWriteBatchSize();
+    String className = clazz.getSimpleName();
+    pipeline
+        .apply("Read " + className, read)
+        .apply(
+            "Shard data for class" + className,
+            WithKeys.<Integer, T>of(e -> ThreadLocalRandom.current().nextInt(numShards))
+                .withKeyType(integers()))
+        .apply(
+            "Group into batches for class" + className,
+            GroupIntoBatches.<Integer, T>ofSize(batchSize).withShardedKey())
+        .apply("Map " + className + " to now", ParDo.of(new BatchedProjectionFunction<>()))
+        .apply(
+            "Write transformed " + className,
+            RegistryJpaIO.<EppResource>write()
+                .withName("Write transformed " + className)
+                .withBatchSize(batchSize)
+                .withShards(numShards));
+  }
+
+  private static class BatchedProjectionFunction<T extends EppResource>
+      extends DoFn<KV<ShardedKey<Integer>, Iterable<T>>, EppResource> {
+
+    @ProcessElement
+    public void processElement(
+        @Element KV<ShardedKey<Integer>, Iterable<T>> element,
+        OutputReceiver<EppResource> outputReceiver) {
+      jpaTm()
+          .transact(
+              () ->
+                  element
+                      .getValue()
+                      .forEach(
+                          resource ->
+                              outputReceiver.output(
+                                  resource.cloneProjectedAtTime(jpaTm().getTransactionTime()))));
+    }
+  }
+}
--- a/core/src/main/java/google/registry/beam/resave/ResaveAllEppResourcesPipelineOptions.java
+++ b/core/src/main/java/google/registry/beam/resave/ResaveAllEppResourcesPipelineOptions.java
@@ -0,0 +1,26 @@
+// Copyright 2022 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.beam.resave;
+
+import google.registry.beam.common.RegistryPipelineOptions;
+import org.apache.beam.sdk.options.Description;
+
+public interface ResaveAllEppResourcesPipelineOptions extends RegistryPipelineOptions {
+
+  @Description("True if we should attempt to run only over potentially out-of-date EPP resources")
+  boolean getFast();
+
+  void setFast(boolean fast);
+}
--- a/core/src/main/java/google/registry/config/CloudTasksUtilsModule.java
+++ b/core/src/main/java/google/registry/config/CloudTasksUtilsModule.java
@@ -21,6 +21,7 @@ import dagger.Module;
 import dagger.Provides;
 import google.registry.config.CredentialModule.DefaultCredential;
 import google.registry.config.RegistryConfig.Config;
+import google.registry.util.Clock;
 import google.registry.util.CloudTasksUtils;
 import google.registry.util.CloudTasksUtils.GcpCloudTasksClient;
 import google.registry.util.CloudTasksUtils.SerializableCloudTasksClient;
@@ -46,8 +47,9 @@ public abstract class CloudTasksUtilsModule {
      @Config("projectId") String projectId,
      @Config("locationId") String locationId,
      SerializableCloudTasksClient client,
-      Retrier retrier) {
-    return new CloudTasksUtils(retrier, projectId, locationId, client);
+      Retrier retrier,
+      Clock clock) {
+    return new CloudTasksUtils(retrier, clock, projectId, locationId, client);
  }

  // Provides a supplier instead of using a Dagger @Provider because the latter is not serializable.
--- a/core/src/main/java/google/registry/config/RegistryConfig.java
+++ b/core/src/main/java/google/registry/config/RegistryConfig.java
@@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import dagger.Module;
 import dagger.Provides;
+import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.util.TaskQueueUtils;
 import google.registry.util.YamlUtils;
 import java.lang.annotation.Documented;
@@ -392,19 +393,26 @@ public final class RegistryConfig {

    @Provides
    @Config("cloudSqlJdbcUrl")
-    public static String providesCloudSqlJdbcUrl(RegistryConfigSettings config) {
+    public static String provideCloudSqlJdbcUrl(RegistryConfigSettings config) {
      return config.cloudSql.jdbcUrl;
    }

    @Provides
    @Config("cloudSqlInstanceConnectionName")
-    public static String providesCloudSqlInstanceConnectionName(RegistryConfigSettings config) {
+    public static String provideCloudSqlInstanceConnectionName(RegistryConfigSettings config) {
      return config.cloudSql.instanceConnectionName;
    }

+    @Provides
+    @Config("cloudSqlReplicaInstanceConnectionName")
+    public static Optional<String> provideCloudSqlReplicaInstanceConnectionName(
+        RegistryConfigSettings config) {
+      return Optional.ofNullable(config.cloudSql.replicaInstanceConnectionName);
+    }
+
    @Provides
    @Config("cloudSqlDbInstanceName")
-    public static String providesCloudSqlDbInstance(RegistryConfigSettings config) {
+    public static String provideCloudSqlDbInstance(RegistryConfigSettings config) {
      // Format of instanceConnectionName: project-id:region:instance-name
      int lastColonIndex = config.cloudSql.instanceConnectionName.lastIndexOf(':');
      return config.cloudSql.instanceConnectionName.substring(lastColonIndex + 1);
@@ -568,6 +576,19 @@ public final class RegistryConfig {
      return config.beam.highPerformanceMachineType;
    }

+    /**
+     * Returns initial number of workers used for a Beam pipeline. Autoscaling can still in effect.
+     *
+     * @see <a
+     *     href=https://cloud.google.com/dataflow/docs/guides/deploying-a-pipeline#horizontal-autoscaling>
+     *     Horizontal Autoscaling </a>
+     */
+    @Provides
+    @Config("initialWorkerCount")
+    public static int provideInitialWorkerCount(RegistryConfigSettings config) {
+      return config.beam.initialWorkerCount;
+    }
+
    /**
     * Returns the default job region to run Apache Beam (Cloud Dataflow) jobs in.
     *
@@ -1330,6 +1351,12 @@ public final class RegistryConfig {
    public static int provideWipeOutQueryBatchSize(RegistryConfigSettings config) {
      return config.contactHistory.wipeOutQueryBatchSize;
    }
+
+    @Provides
+    @Config("jdbcBatchSize")
+    public static int provideHibernateJdbcBatchSize(RegistryConfigSettings config) {
+      return config.hibernate.jdbcBatchSize;
+    }
  }

  /** Returns the App Engine project ID, which is based off the environment name. */
@@ -1417,8 +1444,8 @@ public final class RegistryConfig {
  }

  /** Returns the amount of time a singleton should be cached, before expiring. */
-  public static Duration getSingletonCacheRefreshDuration() {
-    return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.singletonCacheRefreshSeconds);
+  public static java.time.Duration getSingletonCacheRefreshDuration() {
+    return java.time.Duration.ofSeconds(CONFIG_SETTINGS.get().caching.singletonCacheRefreshSeconds);
  }

  /**
@@ -1427,13 +1454,13 @@ public final class RegistryConfig {
   * @see google.registry.model.tld.label.ReservedList
   * @see google.registry.model.tld.label.PremiumList
   */
-  public static Duration getDomainLabelListCacheDuration() {
-    return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.domainLabelCachingSeconds);
+  public static java.time.Duration getDomainLabelListCacheDuration() {
+    return java.time.Duration.ofSeconds(CONFIG_SETTINGS.get().caching.domainLabelCachingSeconds);
  }

  /** Returns the amount of time a singleton should be cached in persist mode, before expiring. */
-  public static Duration getSingletonCachePersistDuration() {
-    return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.singletonCachePersistSeconds);
+  public static java.time.Duration getSingletonCachePersistDuration() {
+    return java.time.Duration.ofSeconds(CONFIG_SETTINGS.get().caching.singletonCachePersistSeconds);
  }

  /**
@@ -1455,8 +1482,8 @@ public final class RegistryConfig {
  /**
   * Returns the amount of time an EPP resource or key should be cached in memory before expiring.
   */
-  public static Duration getEppResourceCachingDuration() {
-    return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.eppResourceCachingSeconds);
+  public static java.time.Duration getEppResourceCachingDuration() {
+    return java.time.Duration.ofSeconds(CONFIG_SETTINGS.get().caching.eppResourceCachingSeconds);
  }

  /** Returns the maximum number of EPP resources and keys to keep in in-memory cache. */
@@ -1524,6 +1551,31 @@ public final class RegistryConfig {
    return CONFIG_SETTINGS.get().hibernate.hikariIdleTimeout;
  }

+  /**
+   * JDBC-specific: driver default batch size is 0, which means that every INSERT statement will be
+   * sent to the database individually. Batching allows us to group together multiple inserts into
+   * one single INSERT statement which can dramatically increase speed in situations with many
+   * inserts.
+   *
+   * <p>Hibernate docs, i.e.
+   * https://docs.jboss.org/hibernate/orm/5.6/userguide/html_single/Hibernate_User_Guide.html,
+   * recommend between 10 and 50.
+   */
+  public static int getHibernateJdbcBatchSize() {
+    return CONFIG_SETTINGS.get().hibernate.jdbcBatchSize;
+  }
+
+  /**
+   * Returns the JDBC fetch size.
+   *
+   * <p>Postgresql-specific: driver default fetch size is 0, which disables streaming result sets.
+   * Here we set a small default geared toward Nomulus server transactions. Large queries can
+   * override the defaults using {@link JpaTransactionManager#setQueryFetchSize}.
+   */
+  public static String getHibernateJdbcFetchSize() {
+    return CONFIG_SETTINGS.get().hibernate.jdbcFetchSize;
+  }
+
  /** Returns the roid suffix to be used for the roids of all contacts and hosts. */
  public static String getContactAndHostRoidSuffix() {
    return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix;
--- a/core/src/main/java/google/registry/config/RegistryConfigSettings.java
+++ b/core/src/main/java/google/registry/config/RegistryConfigSettings.java
@@ -120,6 +120,8 @@ public class RegistryConfigSettings {
    public String hikariMinimumIdle;
    public String hikariMaximumPoolSize;
    public String hikariIdleTimeout;
+    public int jdbcBatchSize;
+    public String jdbcFetchSize;
  }

  /** Configuration for Cloud SQL. */
@@ -128,12 +130,14 @@ public class RegistryConfigSettings {
    // TODO(05012021): remove username field after it is removed from all yaml files.
    public String username;
    public String instanceConnectionName;
+    public String replicaInstanceConnectionName;
  }

  /** Configuration for Apache Beam (Cloud Dataflow). */
  public static class Beam {
    public String defaultJobRegion;
    public String highPerformanceMachineType;
+    public int initialWorkerCount;
    public String stagingBucketUrl;
  }

--- a/Show More
+++ b/Show More