Add hoc tool to fix duplicate contactId (#1076 )

* Add hoc tool to fix duplicate contactId
Convert TmchCrl and ServerSecret to cleaner tm() impls (#1068 )
2026-07-12 11:02:36 +00:00 · 2021-04-13 22:29:22 -04:00 · 2021-04-13 20:50:07 -04:00 · 2021-04-13 15:14:02 -04:00 · 2021-04-13 11:59:14 -04:00 · 2021-04-13 11:45:45 -04:00
602 changed files with 20257 additions and 16089 deletions
@@ -401,6 +401,10 @@ def createGetBuildSrcDirectDepsTask(outputFileName) {

 rootProject.ext {
  invokeJavaDiffFormatScript = { action ->
+    println("JAVA_HOME=${System.env.JAVA_HOME}")
+    println("PATH=${System.env.PATH}")
+    println(ext.execInBash("type java", "${rootDir}"))
+    println(ext.execInBash("java -version", "${rootDir}"))
    def scriptDir = rootDir.path.endsWith('buildSrc')
            ? "${rootDir}/../java-format"
            : "${rootDir}/java-format"
@@ -3,53 +3,56 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
@@ -57,4 +60,4 @@ org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.5.0
@@ -3,53 +3,56 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
@@ -57,4 +60,4 @@ org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.5.0
@@ -3,53 +3,56 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
@@ -57,4 +60,4 @@ org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.5.0
@@ -3,53 +3,56 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
@@ -57,4 +60,4 @@ org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.5.0
@@ -3,53 +3,56 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
@@ -57,4 +60,4 @@ org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.5.0
@@ -3,62 +3,63 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
-junit:junit:4.12
+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
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
 org.junit.jupiter:junit-jupiter-api:5.6.2
@@ -73,5 +74,5 @@ org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
@@ -3,62 +3,63 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
-junit:junit:4.12
+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
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
 org.junit.jupiter:junit-jupiter-api:5.6.2
@@ -73,5 +74,5 @@ org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
@@ -3,62 +3,63 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
-junit:junit:4.12
+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
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
 org.junit.jupiter:junit-jupiter-api:5.6.2
@@ -73,5 +74,5 @@ org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
@@ -3,62 +3,63 @@
 # 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.9.9
-com.google.api-client:google-api-client:1.27.0
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-iam-v1:0.12.0
-com.google.api:api-common:1.7.0
-com.google.api:gax-httpjson:0.52.1
-com.google.api:gax:1.35.1
-com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
+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.59.0
-com.google.cloud:google-cloud-core:1.59.0
-com.google.cloud:google-cloud-storage:1.59.0
+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.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.5.1
 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.gwt:gwt-user:2.8.0-beta1
-com.google.http-client:google-http-client-appengine:1.27.0
-com.google.http-client:google-http-client-jackson2:1.30.1
-com.google.http-client:google-http-client:1.30.1
+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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
-com.google.oauth-client:google-oauth-client:1.27.0
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.13.0
+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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.19.0
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-http-util:0.21.0
-javax.annotation:javax.annotation-api: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
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.validation:validation-api:1.0.0.GA
-joda-time:joda-time:2.9.2
-junit:junit:4.12
+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
-org.apache.httpcomponents:httpclient:4.5.8
-org.apache.httpcomponents:httpcore:4.4.11
+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.5.0
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
 org.junit.jupiter:junit-jupiter-api:5.6.2
@@ -73,5 +74,5 @@ org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm:6.0
-org.threeten:threetenbp:1.3.3
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
@@ -91,7 +91,7 @@ abstract class ProjectData {
      /** The task was actually run and has finished successfully. */
      SUCCESS,
      /** The task was up-to-date and successful, and hence didn't need to run again. */
-      UP_TO_DATE;
+      UP_TO_DATE
    }

    abstract String uniqueName();
@@ -1,24 +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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.1
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.5.1
 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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
+junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
@@ -26,3 +24,4 @@ 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.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
@@ -1,24 +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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.1
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.5.1
 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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
+junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
@@ -26,3 +24,4 @@ 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.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
@@ -1,25 +1,23 @@
 # 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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.1
-com.google.flogger:flogger:0.1
+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.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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
+junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
@@ -27,3 +25,4 @@ 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.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
@@ -1,25 +1,23 @@
 # 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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.1
-com.google.flogger:flogger:0.1
+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.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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
+junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
@@ -27,3 +25,4 @@ 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.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
@@ -1,21 +1,20 @@
 # 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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.1
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.5.1
 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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
@@ -1,21 +1,20 @@
 # 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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.1
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.5.1
 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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
@@ -1,22 +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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.1
-com.google.flogger:flogger:0.1
+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.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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
@@ -1,22 +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.6.3
+com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.1
-com.google.flogger:flogger:0.1
+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.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.j2objc:j2objc-annotations:1.3
-com.google.truth:truth:1.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-io.github.java-diff-utils:java-diff-utils:4.0
+com.google.truth:truth:1.1.2
+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.12
-org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.5.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
 org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
@@ -35,6 +35,8 @@ public final class FakeClock implements Clock {
  // threads should see a consistent flow.
  private final AtomicLong currentTimeMillis = new AtomicLong();

+  private volatile long autoIncrementStepMs;
+
  /** Creates a FakeClock that starts at START_OF_TIME. */
  public FakeClock() {
    this(START_OF_TIME);
@@ -48,7 +50,21 @@ public final class FakeClock implements Clock {
  /** Returns the current time. */
  @Override
  public DateTime nowUtc() {
-    return new DateTime(currentTimeMillis.get(), UTC);
+    return new DateTime(currentTimeMillis.addAndGet(autoIncrementStepMs), UTC);
+  }
+
+  /**
+   * Sets the increment applied to the clock whenever it is queried. The increment is zero by
+   * default: the clock is left unchanged when queried.
+   *
+   * <p>Passing a duration of zero to this method effectively unsets the auto increment mode.
+   *
+   * @param autoIncrementStep the new auto increment duration
+   * @return this
+   */
+  public FakeClock setAutoIncrementStep(ReadableDuration autoIncrementStep) {
+    this.autoIncrementStepMs = autoIncrementStep.getMillis();
+    return this;
  }

  /** Advances clock by one millisecond. */
@@ -21,7 +21,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;

 import com.github.difflib.DiffUtils;
 import com.github.difflib.UnifiedDiffUtils;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow;
 import com.github.difflib.text.DiffRowGenerator;
@@ -132,12 +131,7 @@ public class TextDiffSubject extends Subject {

  static String generateUnifiedDiff(
      ImmutableList<String> expectedContent, ImmutableList<String> actualContent) {
-    Patch<String> diff;
-    try {
-      diff = DiffUtils.diff(expectedContent, actualContent);
-    } catch (DiffException e) {
-      throw new RuntimeException(e);
-    }
+    Patch<String> diff = DiffUtils.diff(expectedContent, actualContent);
    List<String> unifiedDiff =
        UnifiedDiffUtils.generateUnifiedDiff("expected", "actual", expectedContent, diff, 0);

@@ -153,12 +147,7 @@ public class TextDiffSubject extends Subject {
            .oldTag(f -> "~")
            .newTag(f -> "**")
            .build();
-    List<DiffRow> rows;
-    try {
-      rows = generator.generateDiffRows(expectedContent, actualContent);
-    } catch (DiffException e) {
-      throw new RuntimeException(e);
-    }
+    List<DiffRow> rows = generator.generateDiffRows(expectedContent, actualContent);

    int maxExpectedLineLength =
        findMaxLineLength(rows.stream().map(DiffRow::getOldLine).collect(Collectors.toList()));
@@ -135,6 +135,12 @@
    {
      "moduleLicense": "Eclipse Distribution License v. 1.0"
    },
+    {
+      "moduleLicense": "Eclipse Distribution License - v 1.0"
+    },
+    {
+      "moduleLicense": "EDL 1.0"
+    },
    {
      "moduleLicense": "Eclipse Public License - Version 1.0"
    },
@@ -153,21 +159,24 @@
    {
      "moduleLicense": "Eclipse Public License 2.0"
    },
+    {
+      "moduleLicense": "Eclipse Public License v. 2.0"
+    },
    {
      "moduleLicense": "Eclipse Public License v2.0"
    },
    {
      "moduleLicense": "https://www.eclipse.org/legal/epl-2.0/, http://www.gnu.org/copyleft/gpl.html, http://www.gnu.org/licenses/lgpl.html"
    },
-    {
-      "moduleLicense": "Google App Engine Terms of Service"
-    },
    {
      "moduleLicense": "GNU General Public License Version 2"
    },
    {
      "moduleLicense": "GNU General Public License, version 2, with the Classpath Exception"
    },
+    {
+      "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception"
+    },
    {
      "moduleLicense": "GNU GENERAL PUBLIC LICENSE, Version 2 + Classpath Exception"
    },
@@ -186,9 +195,16 @@
    {
      "moduleLicense": "GNU Library General Public License v2.1 or later"
    },
+    // This is just 3-clause BSD.
+    {
+      "moduleLicense": "Go License"
+    },
    {
      "moduleLicense": "The Go license"
    },
+    {
+      "moduleLicense": "Google App Engine Terms of Service"
+    },
    {
      "moduleLicense": "GWT Terms"
    },
@@ -228,6 +244,9 @@
    {
      "moduleLicense": "Mozilla Public License Version 2.0"
    },
+    {
+      "moduleLicense": "Unicode/ICU License"
+    },
    {
      "moduleLicense": "Public Domain",
      "moduleName": "aopalliance:aopalliance"
@@ -237,10 +256,10 @@
      "moduleName": "org.tukaani:xz"
    },
    {
-      // "Apache License, Version 2.0". The plugin is able to parse
-      // 2.11.3 correctly but not this version.
+      // "Apache License, Version 2.0". The plugin is able to parse up to
+      // 2.11.3 correctly but then something changed with 2.12.* and it no
+      // longer parses correctly, even though it's still Apache 2.0.
      "moduleLicense": null,
-      "moduleVersion": "2.12.1",
      "moduleName": "com.fasterxml.jackson:jackson-bom"
    },
    {
@@ -111,8 +111,9 @@ PROPERTIES = [

    # Cloud SQL properties
    Property('dbServer',
-             'The host[:port] of a database that accepts direct IP access. '
-             'This is typically used with a testing database.'),
+             'Sets the target database of a Flyway task. This may be a '
+             'registry environment name (e.g., alpha) or the host[:port] '
+             'of a database that accepts direct IP access.'),
    Property('dbName',
             'Database name to use in connection.',
             'postgres'),
@@ -196,7 +196,7 @@ PRESUBMITS = {
        #    - concatenation of literals: (\s*\+\s*"([^"]|\\")*")*
        # Line 3: , or the closing parenthesis, marking the end of the first
        #    parameter
-        r'.*\.create(Native)?Query\('
+        r'.*\.(query|createQuery|createNativeQuery)\('
        r'(?!(\s*([A-Z_]+|"([^"]|\\")*"(\s*\+\s*"([^"]|\\")*")*)'
        r'(,|\s*\))))',
        "java",
@@ -206,9 +206,12 @@ PRESUBMITS = {
         # using Criteria
         "ForeignKeyIndex.java",
         "HistoryEntryDao.java",
+         "JpaTransactionManager.java",
         "JpaTransactionManagerImpl.java",
         # CriteriaQueryBuilder is a false positive
         "CriteriaQueryBuilder.java",
+         "RdapDomainSearchAction.java",
+         "RdapNameserverSearchAction.java",
         "RdapSearchActionBase.java",
         },
    ):
@@ -0,0 +1,187 @@
+# 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.
+
+"""Show the set of dependency diffs introduced by a branch.
+
+Usage:
+    show-upgrade-diffs.py [-d <directory>] <user> <branch>
+
+Assumes that there is a <user>/nomulus repository on github with the specified
+branch name.
+"""
+
+import argparse
+import os
+import six
+import subprocess
+import sys
+import tempfile
+from typing import cast, Dict, Set, Tuple, Union
+
+
+def run(*args):
+    if subprocess.call(args):
+        raise Abort(f'"{" ".join(args)}" failed')
+
+
+PackageName = Tuple[bytes, bytes]
+VersionSet = Set[bytes]
+PackageMap = Dict[PackageName, VersionSet]
+
+RED = b'\033[40;31;1m'
+GREEN = b'\033[40;32;1m'
+
+
+class Abort(Exception):
+    """Raised to abort processing and record an error."""
+
+
+def merge(dest: PackageMap, new: PackageMap) -> None:
+    for key, val in new.items():
+        dest[key] = dest.setdefault(key, set()) | val
+
+
+def parse_lockfile(filename: str) -> PackageMap:
+    result: PackageMap = {}
+    for line in open(filename, 'rb'):
+        if line.startswith(b'#'):
+            continue
+        line = line.rstrip()
+        package = cast(Tuple[bytes, bytes, bytes], tuple(line.split(b':')))
+        result.setdefault(package[:-1], set()).add(package[-1])
+    return result
+
+
+def get_all_package_versions(dir: str) -> PackageMap:
+    """Return list of all package versions in the directory."""
+    packages = {}
+    for file in os.listdir(dir):
+        file = os.path.join(dir, file)
+        if file.endswith('.lockfile'):
+            merge(packages, parse_lockfile(file))
+        elif os.path.isdir(file):
+            merge(packages, get_all_package_versions(file))
+    return packages
+
+
+def pr(*args: Union[str, bytes]) -> None:
+    """Print replacement that prints bytes without weird conversions."""
+    for text in args:
+        sys.stdout.buffer.write(six.ensure_binary(text))
+    sys.stdout.buffer.flush()
+
+
+def format_versions(a: VersionSet, b: VersionSet, missing_esc: bytes) -> bytes:
+    """Returns a formatted string of the elements of "a".
+
+    Returns the elements of "a" as a comma-separated string, colorizes the
+    elements of "a" that are not also in "b" with "missing_esc".
+
+    Args:
+        a: Elements to print.
+        b: Other set, if a printed element is not a member of "b" it is
+            colorized.
+        missing_esc: ANSI terminal sequence to use to colorize elements that
+            are missing from "b".
+    """
+    elems = []
+    for item in a:
+        if item in b:
+            elems.append(item)
+        else:
+            elems.append(missing_esc + item + b'\033[0m')
+    return b', '.join(elems)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--directory', '-d', type=str, default='',
+                        dest='directory',
+                        help=('Directory to use for a local git '
+                              'repository.  By default, this script clones '
+                              'the nomulus repo into a temporary directory '
+                              'which is deleted after the script is run.  '
+                              'This option allows you to specify the '
+                              'directory and causes it to be retained (not '
+                              'deleted) after the script is run, allowing '
+                              'it to be reused for subsequent runs, speeding '
+                              'them up considerably.'))
+    parser.add_argument('user', type=str,
+                        help=('The name of the user on github.  The full '
+                              'github repository name is presumed to be '
+                              '"$user/nomulus".'))
+    parser.add_argument('branch', type=str,
+                        help='The git branch containing the changes.')
+
+    args = parser.parse_args()
+
+    user = args.user
+    branch = args.branch
+    if not args.directory:
+        tempdir = tempfile.TemporaryDirectory()
+        dir = tempdir.name
+    else:
+        dir = args.directory
+
+    # Either clone or fetch the master branch if it exists.
+    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')
+    else:
+        run('git', 'clone', 'git@github.com:google/nomulus', dir)
+        os.chdir(dir)
+
+    old_packages = get_all_package_versions('.')
+    run('git', 'fetch', f'https://github.com/{user}/nomulus.git',
+        f'{branch}:{branch}')
+    run('git', 'checkout', branch)
+    new_packages = get_all_package_versions('.')
+
+    if new_packages != old_packages:
+        pr('\n\nPackage version change report:\n')
+        pr('change package-name: {old versions} -> {new versions}\n')
+        pr('=====================================================\n\n')
+        for package, new_versions in new_packages.items():
+            old_versions = old_packages.get(package)
+            if not old_versions:
+                pr('added ', b':'.join(package), ': {',
+                   format_versions(new_versions, set(), GREEN),
+                   '}\n')
+            elif new_versions != old_versions:
+
+                # Print out "package-name: {old versions} -> {new versions} with
+                # pretty colors.
+                formatted_old_versions = (
+                    format_versions(old_versions, new_versions, RED))
+                formatted_new_versions = (
+                    format_versions(new_versions, old_versions, GREEN))
+                pr('updated ', b':'.join(package), ': {',
+                   formatted_old_versions, '} -> {',
+                   formatted_new_versions, '}\n')
+
+        # Print the list of packages that were removed.
+        for package in old_packages:
+            if package not in new_packages:
+                pr('removed ', b':'.join(package))
+    else:
+        pr('Package versions not updated!\n')
+
+    if args.directory:
+        pr(f'\nRetaining git directory {dir}, to delete: rm -rf {dir}\n')
+
+
+if __name__ == '__main__':
+    main()
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-import java.lang.reflect.Constructor
+import com.google.common.base.CaseFormat
 import java.util.Optional

 plugins {
@@ -76,6 +76,9 @@ def fragileTestPatterns = [
    "google/registry/model/tmch/ClaimsListShardTest.*",
    // Creates large object (64MBytes), occasionally throws OOM error.
    "google/registry/model/server/KmsSecretRevisionTest.*",
+    // Changes cache timeouts and for some reason appears to have contention
+    // with other tests.
+    "google/registry/whois/WhoisCommandFactoryTest.*",
 ] + dockerIncompatibleTestPatterns

 sourceSets {
@@ -420,7 +423,7 @@ task jaxbToJava {
      }
    }
    execInBash(
-        'find . -name *.java -exec sed -i /\\*\\ \\<p\\>\\$/d {} +',
+        "find . -name *.java -exec sed -i -e '/" + /\* <p>$/ + "/d' {} +",
        generatedDir)
  }
 }
@@ -748,7 +751,8 @@ project.tasks.create('initSqlPipeline', JavaExec) {
 // nom_build :core:bulkDeleteDatastore --args="--project=domain-registry-crash \
 //     --region=us-central1 --runner=DataflowRunner --kindsToDelete=*"
 createToolTask(
-    'bulkDeleteDatastore', 'google.registry.beam.datastore.BulkDeletePipeline')
+    'bulkDeleteDatastore',
+    'google.registry.beam.datastore.BulkDeleteDatastorePipeline')

 project.tasks.create('generateSqlSchema', JavaExec) {
  classpath = sourceSets.nonprod.runtimeClasspath
@@ -779,6 +783,57 @@ generateGoldenImages.finalizedBy(findGoldenImages)

 createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool')

+// Build the Uber jar shared by all flex-template based BEAM pipelines.
+// This packages more code and dependency than necessary. However, without
+// restructuring the source tree it is difficult to generate leaner jars.
+createUberJar(
+    'beam_pipeline_common',
+    'beam_pipeline_common',
+    '')
+
+// Create beam staging task if environment is alpha or crash.
+// All other environments use formally released pipelines through CloudBuild.
+//
+// User should install gcloud and login to GCP before invoking this tasks.
+if (environment in ['alpha', 'crash']) {
+  def pipelines = [
+      [
+          mainClass: 'google.registry.beam.initsql.InitSqlPipeline',
+          metaData: 'google/registry/beam/init_sql_pipeline_metadata.json'
+      ],
+      [
+          mainClass: 'google.registry.beam.datastore.BulkDeleteDatastorePipeline',
+          metaData: 'google/registry/beam/bulk_delete_datastore_pipeline_metadata.json'
+      ],
+  ]
+  project.tasks.create("stage_beam_pipelines") {
+    doLast {
+      pipelines.each {
+        def mainClass = it['mainClass']
+        def metaData = it['metaData']
+        def pipelineName = CaseFormat.UPPER_CAMEL.to(
+                CaseFormat.LOWER_UNDERSCORE,
+                mainClass.substring(mainClass.lastIndexOf('.') + 1))
+        def imageName = "gcr.io/${gcpProject}/beam/${pipelineName}"
+        def metaDataBaseName = metaData.substring(metaData.lastIndexOf('/') + 1)
+        def uberJarName = tasks.beam_pipeline_common.outputs.files.asPath
+
+        def command = "\
+            gcloud dataflow flex-template build \
+            gs://${gcpProject}-deploy/live/beam/${metaDataBaseName} \
+            --image-gcr-path ${imageName}:live \
+            --sdk-language JAVA \
+            --flex-template-base-image JAVA11 \
+            --metadata-file ${projectDir}/src/main/resources/${metaData} \
+            --jar ${uberJarName} \
+            --env FLEX_TEMPLATE_JAVA_MAIN_CLASS=${mainClass} \
+            --project ${gcpProject}".toString()
+        rootProject.ext.execInBash(command, '/tmp')
+      }
+    }
+  }.dependsOn(tasks.beam_pipeline_common)
+}
+
 // A jar with classes and resources from main sourceSet, excluding internal
 // data. See comments on configurations.nomulus_test above for details.
 // TODO(weiminyu): release process should build this using the public repo to eliminate the need
@@ -9,10 +9,10 @@ com.google.auto.value:auto-value:1.7.4
 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.28
-com.google.dagger:dagger-producers:2.28
-com.google.dagger:dagger-spi:2.28
-com.google.dagger:dagger:2.28
+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.errorprone:error_prone_annotation:2.3.4
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_check_api:2.3.4
@@ -26,7 +26,7 @@ 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.12.1
+com.squareup:javapoet:1.13.0
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.persistence:javax.persistence-api:2.2
@@ -35,8 +35,8 @@ org.checkerframework:checker-compat-qual:2.5.3
 org.checkerframework:checker-qual:3.5.0
 org.checkerframework:dataflow:3.0.0
 org.checkerframework:javacutil:3.0.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
-org.jetbrains.kotlin:kotlin-stdlib:1.3.61
+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:annotations:13.0
 org.pcollections:pcollections:2.1.2
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,21 +14,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -46,45 +46,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -92,7 +92,7 @@ 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.0.16
+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
@@ -101,42 +101,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -144,20 +146,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -169,10 +171,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -192,26 +194,27 @@ junit:junit:4.13.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -220,7 +223,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -240,14 +243,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -257,7 +258,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,20 +14,20 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-x86asm:1.0.2
 com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -45,45 +45,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -91,7 +91,7 @@ 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.0.16
+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
@@ -100,41 +100,43 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
+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.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -142,20 +144,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -165,9 +167,9 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -186,26 +188,27 @@ joda-time:joda-time:2.10.5
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -233,14 +236,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -250,7 +251,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,8 +96,8 @@ 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.0.16
-com.google.cloud.sql:postgres-socket-factory:1.0.16
+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
@@ -106,42 +106,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -149,23 +151,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -177,10 +179,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -201,27 +203,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -231,7 +234,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -251,14 +254,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -271,7 +272,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,8 +96,8 @@ 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.0.16
-com.google.cloud.sql:postgres-socket-factory:1.0.16
+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
@@ -106,42 +106,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -149,23 +151,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -177,10 +179,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -200,27 +202,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -230,7 +233,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -250,14 +253,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -270,7 +271,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -1,8 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.sun.activation:jakarta.activation:1.2.2
 com.sun.activation:javax.activation:1.2.0
-com.sun.xml.bind:jaxb-impl:2.2.11
-com.sun.xml.bind:jaxb-osgi:2.2.11
-com.sun.xml.bind:jaxb-xjc:2.2.11
+com.sun.xml.bind:jaxb-impl:2.3.3
+com.sun.xml.bind:jaxb-osgi:2.3.3
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,21 +14,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -46,45 +46,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -92,7 +92,7 @@ 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.0.16
+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
@@ -101,42 +101,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -144,20 +146,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -169,10 +171,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -192,26 +194,27 @@ junit:junit:4.13.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -220,7 +223,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -240,14 +243,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -257,7 +258,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,20 +14,20 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-x86asm:1.0.2
 com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -45,45 +45,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -91,7 +91,7 @@ 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.0.16
+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
@@ -100,41 +100,43 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
+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.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -142,20 +144,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -165,9 +167,9 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -187,26 +189,27 @@ junit:junit:4.13.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -234,14 +237,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -251,7 +252,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,7 +96,7 @@ 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.0.16
+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
@@ -105,42 +105,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -148,23 +150,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -176,10 +178,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -200,27 +202,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -230,7 +233,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -250,14 +253,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -269,7 +270,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,7 +96,7 @@ 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.0.16
+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
@@ -105,42 +105,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -148,23 +150,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -176,10 +178,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -200,27 +202,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -230,7 +233,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -250,14 +253,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -269,7 +270,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,7 +96,7 @@ 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.0.16
+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
@@ -105,42 +105,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -148,23 +150,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -176,10 +178,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -200,27 +202,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -230,7 +233,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -250,14 +253,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -269,7 +270,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,45 +50,45 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+com.google.appengine:appengine-api-1.0-sdk:1.9.86
+com.google.appengine:appengine-remote-api:1.9.86
+com.google.appengine:appengine-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -96,8 +96,8 @@ 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.0.16
-com.google.cloud.sql:postgres-socket-factory:1.0.16
+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
@@ -106,42 +106,44 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
 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.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
@@ -149,23 +151,23 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -177,10 +179,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -200,27 +202,28 @@ net.arnx:nashorn-promise:0.1.1
 net.bytebuddy:byte-buddy:1.10.17
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -230,7 +233,7 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.7.0
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -250,14 +253,12 @@ org.joda:joda-money:1.0.1
 org.json:json:20200518
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
-org.mortbay.jetty:jetty-util:6.1.26
-org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -270,7 +271,7 @@ org.testcontainers:jdbc:1.15.1
 org.testcontainers:postgresql:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -7,10 +7,10 @@ com.google.auto.value:auto-value:1.7.4
 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.28
-com.google.dagger:dagger-producers:2.28
-com.google.dagger:dagger-spi:2.28
-com.google.dagger:dagger:2.28
+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.errorprone:error_prone_annotation:2.3.4
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_check_api:2.3.4
@@ -24,7 +24,7 @@ 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.12.1
+com.squareup:javapoet:1.13.0
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.persistence:javax.persistence-api:2.2
@@ -33,8 +33,8 @@ org.checkerframework:checker-compat-qual:2.5.3
 org.checkerframework:checker-qual:3.5.0
 org.checkerframework:dataflow:3.0.0
 org.checkerframework:javacutil:3.0.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
-org.jetbrains.kotlin:kotlin-stdlib:1.3.61
+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:annotations:13.0
 org.pcollections:pcollections:2.1.2
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,21 +14,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -46,46 +46,46 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-api-stubs:1.9.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+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-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -93,7 +93,7 @@ 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.0.16
+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
@@ -102,13 +102,13 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
@@ -116,33 +116,34 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.googlecode.charts4j:charts4j:1.3
-com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -153,20 +154,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.github.classgraph:classgraph:4.8.102
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -178,10 +179,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -202,23 +203,24 @@ net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-direct-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
@@ -226,7 +228,7 @@ 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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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.sshd:sshd-core:2.0.0
@@ -238,10 +240,10 @@ org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.7.0
+org.checkerframework:checker-qual:3.9.1
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
@@ -279,11 +281,11 @@ org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -305,7 +307,7 @@ org.testcontainers:postgresql:1.15.1
 org.testcontainers:selenium:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
@@ -14,20 +14,20 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-x86asm:1.0.2
 com.github.rholder:guava-retrying:2.0.0
-com.google.api-client:google-api-client-appengine:1.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -45,46 +45,46 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-api-stubs:1.9.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+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-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -92,7 +92,7 @@ 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.0.16
+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
@@ -101,46 +101,47 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
+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.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.googlecode.charts4j:charts4j:1.3
-com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -151,20 +152,20 @@ 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:2.1.7
+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.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.github.classgraph:classgraph:4.8.102
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -174,9 +175,9 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -197,23 +198,24 @@ net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-direct-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
@@ -221,7 +223,7 @@ 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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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.sshd:sshd-core:2.0.0
@@ -233,7 +235,7 @@ org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.7.0
+org.checkerframework:checker-qual:3.9.1
 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
@@ -273,11 +275,11 @@ org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -299,7 +301,7 @@ org.testcontainers:postgresql:1.15.1
 org.testcontainers:selenium:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+org.tukaani:xz:1.5
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,46 +50,46 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-api-stubs:1.9.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+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-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -97,8 +97,8 @@ 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.0.16
-com.google.cloud.sql:postgres-socket-factory:1.0.16
+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
@@ -107,13 +107,13 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
@@ -121,33 +121,34 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.googlecode.charts4j:charts4j:1.3
-com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -158,24 +159,24 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-alts:1.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.github.classgraph:classgraph:4.8.102
+io.github.java-diff-utils:java-diff-utils:4.9
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -187,10 +188,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -212,23 +213,24 @@ net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-direct-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
@@ -236,7 +238,7 @@ 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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -249,14 +251,13 @@ org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.7.0
+org.checkerframework:checker-qual:3.9.1
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
@@ -291,11 +292,11 @@ org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -319,7 +320,7 @@ org.testcontainers:postgresql:1.15.1
 org.testcontainers:selenium:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.33
+args4j:args4j:2.0.23
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
 com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
@@ -18,21 +18,21 @@ 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.2.23
+com.github.jnr:jffi:1.3.1
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.15
-com.github.jnr:jnr-enxio:0.26
-com.github.jnr:jnr-ffi:2.1.13
-com.github.jnr:jnr-posix:3.0.55
-com.github.jnr:jnr-unixsocket:0.30
+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-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.30.8
+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.30.10
-com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client: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
@@ -50,46 +50,46 @@ 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.0
+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.2.9
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:1.2.9
+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-common-protos:2.0.1
-com.google.api.grpc:proto-google-iam-v1:1.0.5
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.9
 com.google.api:api-common:1.10.1
-com.google.api:gax-grpc:1.60.1
+com.google.api:gax-grpc:1.62.0
 com.google.api:gax-httpjson:0.76.1
-com.google.api:gax:1.60.1
-com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0
-com.google.apis:google-api-services-appengine:v1-rev101-1.25.0
+com.google.api:gax:1.62.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-rev12-1.22.0
+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-dns:v2beta1-rev6-1.22.0
-com.google.apis:google-api-services-drive:v2-rev160-1.19.1
-com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0
+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-rev426-1.23.0
+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-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+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-rev20200927-1.30.10
-com.google.appengine.tools:appengine-gcs-client:0.6
+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.81
-com.google.appengine:appengine-api-stubs:1.9.81
-com.google.appengine:appengine-remote-api:1.9.81
-com.google.appengine:appengine-testing:1.9.81
-com.google.auth:google-auth-library-credentials:0.22.2
-com.google.auth:google-auth-library-oauth2-http:0.22.2
+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-testing:1.9.86
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.7.4
@@ -97,8 +97,8 @@ 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.0.16
-com.google.cloud.sql:postgres-socket-factory:1.0.16
+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
@@ -107,13 +107,13 @@ com.google.cloud:google-cloud-core-http:1.93.9
 com.google.cloud:google-cloud-core:1.93.9
 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.2.9
+com.google.cloud:google-cloud-secretmanager:1.4.0
 com.google.cloud:google-cloud-spanner:2.0.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.28
-com.google.errorprone:error_prone_annotations:2.5.0
+com.google.dagger:dagger:2.33
+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.flogger:google-extensions:0.5.1
@@ -121,33 +121,34 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.gwt:gwt-user:2.8.2
-com.google.http-client:google-http-client-appengine:1.36.0
-com.google.http-client:google-http-client-jackson2:1.38.0
+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.0
+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.38.0
+com.google.http-client:google-http-client:1.39.0
 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.2
+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.30.5
-com.google.oauth-client:google-oauth-client-java6:1.31.2
-com.google.oauth-client:google-oauth-client-jetty:1.28.0
-com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.31.2
-com.google.protobuf:protobuf-java-util:3.14.0
-com.google.protobuf:protobuf-java:3.14.0
-com.google.re2j:re2j:1.1
+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.2
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
 com.google.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.googlecode.charts4j:charts4j:1.3
-com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j:57.1
+com.ibm.icu:icu4j:68.2
 com.jcraft:jsch:0.1.55
 com.squareup.okhttp3:okhttp:3.11.0
 com.squareup.okio:okio:1.14.0
@@ -158,24 +159,24 @@ 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:2.1.7
+dnsjava:dnsjava:3.3.1
 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.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-alts:1.34.1
-io.grpc:grpc-api:1.34.1
-io.grpc:grpc-auth:1.34.1
-io.grpc:grpc-context:1.34.1
-io.grpc:grpc-core:1.34.1
-io.grpc:grpc-grpclb:1.34.1
-io.grpc:grpc-netty-shaded:1.34.1
+io.github.classgraph:classgraph:4.8.102
+io.github.java-diff-utils:java-diff-utils:4.9
+io.grpc:grpc-alts:1.36.0
+io.grpc:grpc-api:1.36.0
+io.grpc:grpc-auth:1.36.0
+io.grpc:grpc-context:1.36.0
+io.grpc:grpc-core:1.36.0
+io.grpc:grpc-grpclb:1.36.0
+io.grpc:grpc-netty-shaded:1.36.0
 io.grpc:grpc-netty:1.32.2
-io.grpc:grpc-protobuf-lite:1.34.1
-io.grpc:grpc-protobuf:1.34.1
-io.grpc:grpc-stub:1.34.1
+io.grpc:grpc-protobuf-lite:1.36.0
+io.grpc:grpc-protobuf:1.36.0
+io.grpc:grpc-stub:1.36.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
@@ -187,10 +188,10 @@ 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.24.0
+io.opencensus:opencensus-api:0.28.0
 io.opencensus:opencensus-contrib-grpc-util:0.24.0
-io.opencensus:opencensus-contrib-http-util:0.24.0
-io.perfmark:perfmark-api:0.19.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -212,23 +213,24 @@ net.bytebuddy:byte-buddy-agent:1.10.19
 net.bytebuddy:byte-buddy:1.10.19
 net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-fn-execution:2.27.0
-org.apache.beam:beam-model-job-management:2.27.0
-org.apache.beam:beam-model-pipeline:2.27.0
-org.apache.beam:beam-runners-core-construction-java:2.27.0
-org.apache.beam:beam-runners-direct-java:2.27.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.27.0
-org.apache.beam:beam-runners-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-core:2.27.0
-org.apache.beam:beam-sdks-java-expansion-service:2.27.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.27.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.27.0
-org.apache.beam:beam-sdks-java-fn-execution:2.27.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.27.0
+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-vendor-guava-26_0-jre:0.1
-org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.27.0
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.28.0
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
@@ -236,7 +238,7 @@ 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.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.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
@@ -249,14 +251,13 @@ org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.7.0
+org.checkerframework:checker-qual:3.9.1
 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.19
+org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
-org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
@@ -291,11 +292,11 @@ org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:8.0.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:8.0.1
-org.ow2.asm:asm-util:8.0.1
-org.ow2.asm:asm:8.0.1
+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.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
@@ -320,7 +321,7 @@ org.testcontainers:postgresql:1.15.1
 org.testcontainers:selenium:1.15.1
 org.testcontainers:testcontainers:1.15.1
 org.threeten:threetenbp:1.5.0
-org.tukaani:xz:1.8
+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
@@ -37,6 +37,7 @@ import google.registry.request.auth.Auth;
 import google.registry.schema.replay.DatastoreEntity;
 import google.registry.schema.replay.DatastoreOnlyEntity;
 import google.registry.schema.replay.NonReplicatedEntity;
+import google.registry.schema.replay.ReplaySpecializer;
 import google.registry.schema.replay.SqlReplayCheckpoint;
 import google.registry.util.RequestStatusChecker;
 import java.io.IOException;
@@ -153,7 +154,13 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
    Object ofyPojo = ofy().toPojo(entity);
    if (ofyPojo instanceof DatastoreEntity) {
      DatastoreEntity datastoreEntity = (DatastoreEntity) ofyPojo;
-      datastoreEntity.toSqlEntity().ifPresent(jpaTm()::put);
+      datastoreEntity
+          .toSqlEntity()
+          .ifPresent(
+              sqlEntity -> {
+                ReplaySpecializer.beforeSqlSave(sqlEntity);
+                jpaTm().put(sqlEntity);
+              });
    } else {
      // this should never happen, but we shouldn't fail on it
      logger.atSevere().log(
@@ -179,6 +186,7 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
    if (!NonReplicatedEntity.class.isAssignableFrom(entityClass)
        && !DatastoreOnlyEntity.class.isAssignableFrom(entityClass)
        && entityClass.getAnnotation(javax.persistence.Entity.class) != null) {
+      ReplaySpecializer.beforeSqlDelete(entityVKey);
      jpaTm().delete(entityVKey);
    }
  }
@@ -57,8 +57,6 @@ public final class AsyncTaskEnqueuer {
  public static final String QUEUE_ASYNC_DELETE = "async-delete-pull";
  public static final String QUEUE_ASYNC_HOST_RENAME = "async-host-rename-pull";

-  public static final String PATH_RESAVE_ENTITY = "/_dr/task/resaveEntity";
-
  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
  private static final Duration MAX_ASYNC_ETA = Duration.standardDays(30);

@@ -112,7 +110,7 @@ public final class AsyncTaskEnqueuer {
    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(PATH_RESAVE_ENTITY)
+        TaskOptions.Builder.withUrl(ResaveEntityAction.PATH)
            .method(Method.POST)
            .header("Host", backendHostname)
            .countdownMillis(etaDuration.getMillis())
@@ -37,13 +37,13 @@ import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.request.Action;
-import google.registry.request.Action.Method;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
 import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.logging.Level;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
@@ -59,12 +59,17 @@ import org.joda.time.Duration;
 * <p>Note that this action works by running a superuser EPP domain delete command, and as a side
 * effect of when domains are deleted (just past their expiration date), they are invariably in the
 * autorenew grace period when this happens.
+ *
+ * <p>Note also that the delete flow may fail in the uncommon case that a non-autorenewing domain
+ * has a subordinate host. It is not trivial to handle this case automatically (as said host may be
+ * in use by other domains), nor is it possible to take the correct action without exercising some
+ * human judgment. Accordingly, such deletes will fail with SEVERE-level log messages every day when
+ * this action runs, thus alerting us that human action is needed to correctly process the delete.
 */
@Action(
    service = Action.Service.BACKEND,
    path = DeleteExpiredDomainsAction.PATH,
-    auth = Auth.AUTH_INTERNAL_OR_ADMIN,
-    method = Method.POST)
+    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
 public class DeleteExpiredDomainsAction implements Runnable {

  public static final String PATH = "/_dr/task/deleteExpiredDomains";
@@ -141,12 +146,23 @@ public class DeleteExpiredDomainsAction implements Runnable {
        String.join(
            ", ",
            domainsToDelete.stream().map(DomainBase::getDomainName).collect(toImmutableList())));
-    domainsToDelete.forEach(this::runDomainDeleteFlow);
-    logger.atInfo().log("Finished deleting domains.");
-    response.setPayload("Finished deleting domains.");
+    int successes = 0;
+    for (DomainBase domain : domainsToDelete) {
+      if (runDomainDeleteFlow(domain)) {
+        successes++;
+      }
+    }
+    int failures = domainsToDelete.size() - successes;
+    String msg =
+        String.format(
+            "Finished; %d domains were successfully deleted and %d errored out.",
+            successes, failures);
+    logger.at(failures == 0 ? Level.INFO : Level.SEVERE).log(msg);
+    response.setPayload(msg);
  }

-  private void runDomainDeleteFlow(DomainBase domain) {
+  /** Runs the actual domain delete flow and returns whether the deletion was successful. */
+  private boolean runDomainDeleteFlow(DomainBase domain) {
    logger.atInfo().log("Attempting to delete domain %s", domain.getDomainName());
    // Create a new transaction that the flow's execution will be enlisted in that loads the domain
    // transactionally. This way we can ensure that nothing else has modified the domain in question
@@ -185,10 +201,11 @@ public class DeleteExpiredDomainsAction implements Runnable {
      if (eppOutput.get().isSuccess()) {
        logger.atInfo().log("Successfully deleted domain %s", domain.getDomainName());
      } else {
-        logger.atWarning().log(
+        logger.atSevere().log(
            "Failed to delete domain %s; EPP response:\n\n%s",
            domain.getDomainName(), new String(marshalWithLenientRetry(eppOutput.get()), UTF_8));
      }
    }
+    return eppOutput.map(EppOutput::isSuccess).orElse(false);
  }
 }
@@ -25,8 +25,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_AUTORENEW;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.pricing.PricingEngineProxy.getDomainRenewCost;
-import static google.registry.schema.cursor.Cursor.GLOBAL;
-import static google.registry.schema.cursor.CursorDao.loadAndCompare;
 import static google.registry.util.CollectionUtils.union;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.earliestOf;
@@ -60,7 +58,6 @@ import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.schema.cursor.CursorDao;
 import google.registry.util.Clock;
 import java.util.Optional;
 import java.util.Set;
@@ -95,7 +92,6 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
  @Override
  public void run() {
    Cursor cursor = ofy().load().key(Cursor.createGlobalKey(RECURRING_BILLING)).now();
-    loadAndCompare(cursor, GLOBAL);
    DateTime executeTime = clock.nowUtc();
    DateTime persistedCursorTime = (cursor == null ? START_OF_TIME : cursor.getCursorTime());
    DateTime cursorTime = cursorTimeParam.orElse(persistedCursorTime);
@@ -332,7 +328,6 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
      tm().transact(
              () -> {
                Cursor cursor = ofy().load().key(Cursor.createGlobalKey(RECURRING_BILLING)).now();
-                loadAndCompare(cursor, GLOBAL);
                DateTime currentCursorTime =
                    (cursor == null ? START_OF_TIME : cursor.getCursorTime());
                if (!currentCursorTime.equals(expectedPersistedCursorTime)) {
@@ -342,8 +337,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
                  return;
                }
                if (!isDryRun) {
-                  CursorDao.saveCursor(
-                      Cursor.createGlobal(RECURRING_BILLING, executionTime), GLOBAL);
+                  tm().put(Cursor.createGlobal(RECURRING_BILLING, executionTime));
                }
              });
    }
@@ -25,7 +25,7 @@ import static google.registry.batch.AsyncTaskMetrics.OperationType.DNS_REFRESH;
 import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
 import static google.registry.model.EppResourceUtils.isActive;
 import static google.registry.model.EppResourceUtils.isDeleted;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.latestOf;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -44,7 +44,6 @@ import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.flogger.FluentLogger;
-import com.googlecode.objectify.Key;
 import google.registry.batch.AsyncTaskMetrics.OperationResult;
 import google.registry.dns.DnsQueue;
 import google.registry.mapreduce.MapreduceRunner;
@@ -64,6 +63,7 @@ import google.registry.util.SystemClock;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.logging.Level;
 import javax.annotation.Nullable;
@@ -123,7 +123,7 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
    }

    ImmutableList.Builder<DnsRefreshRequest> requestsBuilder = new ImmutableList.Builder<>();
-    ImmutableList.Builder<Key<HostResource>> hostKeys = new ImmutableList.Builder<>();
+    ImmutableList.Builder<VKey<HostResource>> hostKeys = new ImmutableList.Builder<>();
    final List<DnsRefreshRequest> requestsToDelete = new ArrayList<>();

    for (TaskHandle task : tasks) {
@@ -204,10 +204,10 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
        emit(true, true);
        return;
      }
-      Key<HostResource> referencingHostKey = null;
+      VKey<HostResource> referencingHostKey = null;
      for (DnsRefreshRequest request : refreshRequests) {
        if (isActive(domain, request.lastUpdateTime())
-            && domain.getNameservers().contains(VKey.from(request.hostKey()))) {
+            && domain.getNameservers().contains(request.hostKey())) {
          referencingHostKey = request.hostKey();
          break;
        }
@@ -293,7 +293,8 @@ public class RefreshDnsOnHostRenameAction implements Runnable {

    private static final long serialVersionUID = 1772812852271288622L;

-    abstract Key<HostResource> hostKey();
+    abstract VKey<HostResource> hostKey();
+
    abstract DateTime lastUpdateTime();
    abstract DateTime requestedTime();
    abstract boolean isRefreshNeeded();
@@ -301,7 +302,8 @@ public class RefreshDnsOnHostRenameAction implements Runnable {

    @AutoValue.Builder
    abstract static class Builder {
-      abstract Builder setHostKey(Key<HostResource> hostKey);
+      abstract Builder setHostKey(VKey<HostResource> hostKey);
+
      abstract Builder setLastUpdateTime(DateTime lastUpdateTime);
      abstract Builder setRequestedTime(DateTime requestedTime);
      abstract Builder setIsRefreshNeeded(boolean isRefreshNeeded);
@@ -314,10 +316,12 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
     */
    static DnsRefreshRequest createFromTask(TaskHandle task, DateTime now) throws Exception {
      ImmutableMap<String, String> params = ImmutableMap.copyOf(task.extractParams());
-      Key<HostResource> hostKey =
-          Key.create(checkNotNull(params.get(PARAM_HOST_KEY), "Host to refresh not specified"));
+      VKey<HostResource> hostKey =
+          VKey.fromWebsafeKey(
+              checkNotNull(params.get(PARAM_HOST_KEY), "Host to refresh not specified"));
      HostResource host =
-          checkNotNull(ofy().load().key(hostKey).now(), "Host to refresh doesn't exist");
+          tm().transact(() -> tm().loadByKeyIfPresent(hostKey))
+              .orElseThrow(() -> new NoSuchElementException("Host to refresh doesn't exist"));
      boolean isHostDeleted =
          isDeleted(host, latestOf(now, host.getUpdateTimestamp().getTimestamp()));
      if (isHostDeleted) {
@@ -16,7 +16,6 @@ package google.registry.batch;

 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
@@ -33,6 +32,7 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.registry.RegistryLockDao;
+import google.registry.persistence.VKey;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
@@ -125,6 +125,7 @@ public class RelockDomainAction implements Runnable {
    response.setContentType(MediaType.PLAIN_TEXT_UTF_8);

    // nb: DomainLockUtils relies on the JPA transaction being the outermost transaction
+    // if we have Datastore as the primary DB (if SQL is the primary DB, it's irrelevant)
    jpaTm().transact(() -> tm().transact(this::relockDomain));
  }

@@ -139,12 +140,8 @@ public class RelockDomainAction implements Runnable {
                      new IllegalArgumentException(
                          String.format("Unknown revision ID %d", oldUnlockRevisionId)));
      domain =
-          ofy()
-              .load()
-              .type(DomainBase.class)
-              .id(oldLock.getRepoId())
-              .now()
-              .cloneProjectedAtTime(jpaTm().getTransactionTime());
+          tm().loadByKey(VKey.create(DomainBase.class, oldLock.getRepoId()))
+              .cloneProjectedAtTime(tm().getTransactionTime());
    } catch (Throwable t) {
      handleTransientFailure(Optional.ofNullable(oldLock), t);
      return;
@@ -17,7 +17,6 @@ package google.registry.batch;
 import static google.registry.batch.AsyncTaskEnqueuer.PARAM_REQUESTED_TIME;
 import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESAVE_TIMES;
 import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESOURCE_KEY;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;

 import com.google.common.collect.ImmutableSet;
@@ -26,6 +25,7 @@ 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;
 import google.registry.request.Action;
 import google.registry.request.Action.Method;
 import google.registry.request.Parameter;
@@ -74,16 +74,17 @@ public class ResaveEntityAction implements Runnable {
  public void run() {
    logger.atInfo().log(
        "Re-saving entity %s which was enqueued at %s.", resourceKey, requestedTime);
-    tm().transact(() -> {
-      ImmutableObject entity = ofy().load().key(resourceKey).now();
-      ofy().save().entity(
-          (entity instanceof EppResource)
-              ? ((EppResource) entity).cloneProjectedAtTime(tm().getTransactionTime()) : entity
-      );
-      if (!resaveTimes.isEmpty()) {
-        asyncTaskEnqueuer.enqueueAsyncResave(entity, requestedTime, resaveTimes);
-      }
-    });
+    tm().transact(
+            () -> {
+              ImmutableObject entity = tm().loadByKey(VKey.from(resourceKey));
+              tm().put(
+                      (entity instanceof EppResource)
+                          ? ((EppResource) entity).cloneProjectedAtTime(tm().getTransactionTime())
+                          : entity);
+              if (!resaveTimes.isEmpty()) {
+                asyncTaskEnqueuer.enqueueAsyncResave(entity, requestedTime, resaveTimes);
+              }
+            });
    response.setPayload("Entity re-saved.");
  }
 }
@@ -0,0 +1,98 @@
+// 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.batch;
+
+import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.persistence.PersistenceModule.SchemaManagerConnection;
+import google.registry.request.Action;
+import google.registry.request.Response;
+import google.registry.request.auth.Auth;
+import google.registry.util.Retrier;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.function.Supplier;
+import javax.inject.Inject;
+import org.flywaydb.core.api.FlywayException;
+
+/**
+ * Wipes out all Cloud SQL data in a Nomulus GCP environment.
+ *
+ * <p>This class is created for the QA environment, where migration testing with production data
+ * will happen. A regularly scheduled wipeout is a prerequisite to using production data there.
+ */
+@Action(
+    service = Action.Service.BACKEND,
+    path = "/_dr/task/wipeOutCloudSql",
+    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+public class WipeOutCloudSqlAction implements Runnable {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  // As a short-lived class, hardcode allowed projects here instead of using config files.
+  private static final ImmutableSet<String> ALLOWED_PROJECTS =
+      ImmutableSet.of("domain-registry-qa");
+
+  private final String projectId;
+  private final Supplier<Connection> connectionSupplier;
+  private final Response response;
+  private final Retrier retrier;
+
+  @Inject
+  WipeOutCloudSqlAction(
+      @Config("projectId") String projectId,
+      @SchemaManagerConnection Supplier<Connection> connectionSupplier,
+      Response response,
+      Retrier retrier) {
+    this.projectId = projectId;
+    this.connectionSupplier = connectionSupplier;
+    this.response = response;
+    this.retrier = retrier;
+  }
+
+  @Override
+  public void run() {
+    response.setContentType(PLAIN_TEXT_UTF_8);
+
+    if (!ALLOWED_PROJECTS.contains(projectId)) {
+      response.setStatus(SC_FORBIDDEN);
+      response.setPayload("Wipeout is not allowed in " + projectId);
+      return;
+    }
+
+    try {
+      retrier.callWithRetry(
+          () -> {
+            try (Connection conn = connectionSupplier.get();
+                Statement statement = conn.createStatement()) {
+              statement.execute("drop owned by schema_deployer;");
+            }
+            return null;
+          },
+          e -> !(e instanceof FlywayException));
+      response.setStatus(SC_OK);
+      response.setPayload("Wiped out Cloud SQL in " + projectId);
+    } catch (RuntimeException e) {
+      logger.atSevere().withCause(e).log("Failed to wipe out Cloud SQL data.");
+      response.setStatus(SC_INTERNAL_SERVER_ERROR);
+      response.setPayload("Failed to wipe out Cloud SQL in " + projectId);
+    }
+  }
+}
@@ -0,0 +1,115 @@
+// 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.batch;
+
+import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+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.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.request.Action;
+import google.registry.request.Response;
+import google.registry.request.auth.Auth;
+import javax.inject.Inject;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
+/**
+ * Wipes out all Cloud Datastore data in a Nomulus GCP environment.
+ *
+ * <p>This class is created for the QA environment, where migration testing with production data
+ * will happen. A regularly scheduled wipeout is a prerequisite to using production data there.
+ */
+@Action(
+    service = Action.Service.BACKEND,
+    path = "/_dr/task/wipeOutDatastore",
+    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+public class WipeoutDatastoreAction implements Runnable {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  private static final String PIPELINE_NAME = "bulk_delete_datastore_pipeline";
+
+  // As a short-lived class, hardcode allowed projects here instead of using config files.
+  private static final ImmutableSet<String> ALLOWED_PROJECTS =
+      ImmutableSet.of("domain-registry-qa");
+
+  private final String projectId;
+  private final String jobRegion;
+  private final Response response;
+  private final Dataflow dataflow;
+  private final String stagingBucketUrl;
+
+  @Inject
+  WipeoutDatastoreAction(
+      @Config("projectId") String projectId,
+      @Config("defaultJobRegion") String jobRegion,
+      @Config("beamStagingBucketUrl") String stagingBucketUrl,
+      Response response,
+      Dataflow dataflow) {
+    this.projectId = projectId;
+    this.jobRegion = jobRegion;
+    this.stagingBucketUrl = stagingBucketUrl;
+    this.response = response;
+    this.dataflow = dataflow;
+  }
+
+  @Override
+  public void run() {
+    response.setContentType(PLAIN_TEXT_UTF_8);
+
+    if (!ALLOWED_PROJECTS.contains(projectId)) {
+      response.setStatus(SC_FORBIDDEN);
+      response.setPayload("Wipeout is not allowed in " + projectId);
+      return;
+    }
+
+    try {
+      LaunchFlexTemplateParameter parameters =
+          new LaunchFlexTemplateParameter()
+              // Job name must be unique and in [-a-z0-9].
+              .setJobName(
+                  "bulk-delete-datastore-"
+                      + DateTime.now(DateTimeZone.UTC).toString("yyyy-MM-dd'T'HH-mm-ss'Z'"))
+              .setContainerSpecGcsPath(
+                  String.format("%s/%s_metadata.json", stagingBucketUrl, PIPELINE_NAME))
+              .setParameters(ImmutableMap.of("kindsToDelete", "*"));
+      LaunchFlexTemplateResponse launchResponse =
+          dataflow
+              .projects()
+              .locations()
+              .flexTemplates()
+              .launch(
+                  projectId,
+                  jobRegion,
+                  new LaunchFlexTemplateRequest().setLaunchParameter(parameters))
+              .execute();
+      response.setStatus(SC_OK);
+      response.setPayload("Launched " + launchResponse.getJob().getName());
+    } catch (Exception e) {
+      String msg = String.format("Failed to launch %s.", PIPELINE_NAME);
+      logger.atSevere().withCause(e).log(msg);
+      response.setStatus(SC_INTERNAL_SERVER_ERROR);
+      response.setPayload(msg);
+    }
+  }
+}
@@ -0,0 +1,229 @@
+// Copyright 2020 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.common;
+
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+import static org.apache.beam.sdk.values.TypeDescriptors.integers;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
+import google.registry.backup.AppEngineEnvironment;
+import google.registry.model.ofy.ObjectifyService;
+import google.registry.persistence.transaction.JpaTransactionManager;
+import google.registry.persistence.transaction.TransactionManagerFactory;
+import java.util.Objects;
+import java.util.concurrent.ThreadLocalRandom;
+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.transforms.GroupIntoBatches;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.transforms.ParDo;
+import org.apache.beam.sdk.transforms.SerializableFunction;
+import org.apache.beam.sdk.transforms.WithKeys;
+import org.apache.beam.sdk.util.ShardedKey;
+import org.apache.beam.sdk.values.KV;
+import org.apache.beam.sdk.values.PCollection;
+
+/**
+ * Contains IO {@link PTransform transforms} for a BEAM pipeline that interacts with a single
+ * database through a {@link JpaTransactionManager}.
+ *
+ * <p>The {@code JpaTransactionManager} is instantiated once on each pipeline worker VM (through
+ * {@link RegistryPipelineWorkerInitializer}), made available through the static method {@link
+ * TransactionManagerFactory#jpaTm()}, and is shared by all threads on the VM. Configuration is
+ * through {@link RegistryPipelineOptions}.
+ */
+public final class RegistryJpaIO {
+
+  private RegistryJpaIO() {}
+
+  public static <T> Write<T> write() {
+    return Write.<T>builder().build();
+  }
+
+  /**
+   * A {@link PTransform transform} that writes a PCollection of entities to the SQL database using
+   * the {@link JpaTransactionManager}.
+   *
+   * <p>Unlike typical BEAM {@link Write} transforms, the output type of this transform is {@code
+   * PCollection<Void>} instead of {@link org.apache.beam.sdk.values.PDone}. This deviation allows
+   * the sequencing of multiple {@code PCollections}: we have use cases where one collection of data
+   * must be completely written before another can start (due to foreign key constraints in the
+   * latter).
+   *
+   * @param <T> type of the entities to be written
+   */
+  @AutoValue
+  public abstract static class Write<T> extends PTransform<PCollection<T>, PCollection<Void>> {
+
+    public static final String DEFAULT_NAME = "RegistryJpaIO.Write";
+
+    public static final int DEFAULT_BATCH_SIZE = 1;
+
+    /** The default number of write shard. Please refer to {@link #shards} for more information. */
+    public static final int DEFAULT_SHARDS = 1;
+
+    public abstract String name();
+
+    /** Number of elements to be written in one call. */
+    public abstract int batchSize();
+
+    /**
+     * The number of shards the output should be split into.
+     *
+     * <p>This value is a hint to the pipeline runner on the level of parallelism, and should be
+     * significantly greater than the number of threads working on this transformation (see next
+     * paragraph for more information). On the other hand, it should not be too large to the point
+     * that the number of elements per shard is lower than {@link #batchSize()}. As a rule of thumb,
+     * the following constraint should hold: {@code shards * batchSize * nThreads <=
+     * inputElementCount}. Although it is not always possible to determine the number of threads
+     * working on this transform, when the pipeline run is IO-bound, it most likely is close to the
+     * total number of threads in the pipeline, which is explained below.
+     *
+     * <p>With Cloud Dataflow runner, the total number of worker threads in a batch pipeline (which
+     * includes all existing Registry pipelines) is the number of vCPUs used by the pipeline, and
+     * can be set by the {@code --maxNumWorkers} and {@code --workerMachineType} parameters. The
+     * number of worker threads in a streaming pipeline can be set by the {@code --maxNumWorkers}
+     * and {@code --numberOfWorkerHarnessThreads} parameters.
+     *
+     * <p>Note that connections on the database server are a limited resource, therefore the number
+     * of threads that interact with the database should be set to an appropriate limit. Again, we
+     * cannot control this number, but can influence it by controlling the total number of threads.
+     */
+    public abstract int shards();
+
+    public abstract SerializableFunction<T, Object> jpaConverter();
+
+    public Write<T> withName(String name) {
+      return toBuilder().name(name).build();
+    }
+
+    public Write<T> withBatchSize(int batchSize) {
+      return toBuilder().batchSize(batchSize).build();
+    }
+
+    public Write<T> withShards(int shards) {
+      return toBuilder().shards(shards).build();
+    }
+
+    /**
+     * An optional function that converts the input entities to a form that can be written into the
+     * database.
+     */
+    public Write<T> withJpaConverter(SerializableFunction<T, Object> jpaConverter) {
+      return toBuilder().jpaConverter(jpaConverter).build();
+    }
+
+    abstract Builder<T> toBuilder();
+
+    @Override
+    public PCollection<Void> expand(PCollection<T> input) {
+      return input
+          .apply(
+              "Shard data " + name(),
+              WithKeys.<Integer, T>of(e -> ThreadLocalRandom.current().nextInt(shards()))
+                  .withKeyType(integers()))
+          // The call to withShardedKey() is performance critical. The resulting transform ensures
+          // that data is spread evenly across all worker threads.
+          .apply(
+              "Group into batches " + name(),
+              GroupIntoBatches.<Integer, T>ofSize(batchSize()).withShardedKey())
+          .apply(
+              "Write in batch for " + name(),
+              ParDo.of(new SqlBatchWriter<>(name(), jpaConverter())));
+    }
+
+    static <T> Builder<T> builder() {
+      return new AutoValue_RegistryJpaIO_Write.Builder<T>()
+          .name(DEFAULT_NAME)
+          .batchSize(DEFAULT_BATCH_SIZE)
+          .shards(DEFAULT_SHARDS)
+          .jpaConverter(x -> x);
+    }
+
+    @AutoValue.Builder
+    abstract static class Builder<T> {
+
+      abstract Builder<T> name(String name);
+
+      abstract Builder<T> batchSize(int batchSize);
+
+      abstract Builder<T> shards(int jdbcNumConnsHint);
+
+      abstract Builder<T> jpaConverter(SerializableFunction<T, Object> jpaConverter);
+
+      abstract Write<T> build();
+    }
+  }
+
+  /** Writes a batch of entities to a SQL database through a {@link JpaTransactionManager}. */
+  private static class SqlBatchWriter<T> extends DoFn<KV<ShardedKey<Integer>, Iterable<T>>, Void> {
+    private final Counter counter;
+    private final SerializableFunction<T, Object> jpaConverter;
+
+    SqlBatchWriter(String type, SerializableFunction<T, Object> jpaConverter) {
+      counter = Metrics.counter("SQL_WRITE", type);
+      this.jpaConverter = jpaConverter;
+    }
+
+    @Setup
+    public void setup() {
+      // Below is needed as long as Objectify keys are still involved in the handling of SQL
+      // entities (e.g., in VKeys).
+      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+        ObjectifyService.initOfy();
+      }
+    }
+
+    @ProcessElement
+    public void processElement(@Element KV<ShardedKey<Integer>, Iterable<T>> kv) {
+      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+        ImmutableList<Object> ofyEntities =
+            Streams.stream(kv.getValue())
+                .map(this.jpaConverter::apply)
+                // TODO(b/177340730): post migration delete the line below.
+                .filter(Objects::nonNull)
+                .collect(ImmutableList.toImmutableList());
+        try {
+          jpaTm().transact(() -> jpaTm().putAll(ofyEntities));
+          counter.inc(ofyEntities.size());
+        } catch (RuntimeException e) {
+          processSingly(ofyEntities);
+        }
+      }
+    }
+
+    /**
+     * Writes entities in a failed batch one by one to identify the first bad entity and throws a
+     * {@link RuntimeException} on it.
+     */
+    private void processSingly(ImmutableList<Object> ofyEntities) {
+      for (Object ofyEntity : ofyEntities) {
+        try {
+          jpaTm().transact(() -> jpaTm().put(ofyEntity));
+          counter.inc();
+        } catch (RuntimeException e) {
+          throw new RuntimeException(toOfyKey(ofyEntity).toString(), e);
+        }
+      }
+    }
+
+    private com.googlecode.objectify.Key<?> toOfyKey(Object ofyEntity) {
+      return com.googlecode.objectify.Key.create(ofyEntity);
+    }
+  }
+}
@@ -14,6 +14,7 @@

 package google.registry.beam.common;

+import dagger.BindsInstance;
 import dagger.Component;
 import dagger.Lazy;
 import google.registry.config.CredentialModule;
@@ -21,9 +22,11 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.persistence.PersistenceModule;
 import google.registry.persistence.PersistenceModule.BeamJpaTm;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.privileges.secretmanager.SecretManagerModule;
 import google.registry.util.UtilsModule;
+import javax.annotation.Nullable;
 import javax.inject.Singleton;

 /** Component that provides everything needed on a Pipeline worker. */
@@ -44,4 +47,18 @@ public interface RegistryPipelineComponent {

  @BeamJpaTm
  Lazy<JpaTransactionManager> getJpaTransactionManager();
+
+  @Component.Builder
+  interface Builder {
+
+    /**
+     * Optionally overrides the default transaction isolation level. This applies to ALL
+     * transactions executed in the pipeline.
+     */
+    @BindsInstance
+    Builder isolationOverride(
+        @Nullable @Config("beamIsolationOverride") TransactionIsolationLevel isolationOverride);
+
+    RegistryPipelineComponent build();
+  }
 }
@@ -14,13 +14,23 @@

 package google.registry.beam.common;

+import google.registry.beam.common.RegistryJpaIO.Write;
 import google.registry.config.RegistryEnvironment;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import java.util.Objects;
 import javax.annotation.Nullable;
 import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
+import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.Description;

-/** Defines Nomulus-specific pipeline options. */
+/**
+ * Defines Nomulus-specific pipeline options, e.g. JPA configurations.
+ *
+ * <p>When using the Cloud Dataflow runner, users are recommended to set an upper bound on active
+ * database connections by setting the pipeline worker options including {@code --maxNumWorkers},
+ * {@code workerMachineType}, and {@code numberOfWorkerHarnessThreads}. Please refer to {@link
+ * Write#shards()} for more information.
+ */
 public interface RegistryPipelineOptions extends GcpOptions {

  @Description("The Registry environment.")
@@ -29,6 +39,32 @@ public interface RegistryPipelineOptions extends GcpOptions {

  void setRegistryEnvironment(RegistryEnvironment environment);

+  @Description("The desired SQL transaction isolation level.")
+  @Nullable
+  TransactionIsolationLevel getIsolationOverride();
+
+  void setIsolationOverride(TransactionIsolationLevel isolationOverride);
+
+  @Description("The number of entities to write to the SQL database in one operation.")
+  @Default.Integer(20)
+  int getSqlWriteBatchSize();
+
+  void setSqlWriteBatchSize(int sqlWriteBatchSize);
+
+  @Description(
+      "Number of shards to create out of the data before writing to the SQL database. Please refer "
+          + "to the Javadoc of RegistryJpaIO.Write.shards() for how to choose this value.")
+  @Default.Integer(100)
+  int getSqlWriteShards();
+
+  void setSqlWriteShards(int maxConcurrentSqlWriters);
+
+  static RegistryPipelineComponent toRegistryPipelineComponent(RegistryPipelineOptions options) {
+    return DaggerRegistryPipelineComponent.builder()
+        .isolationOverride(options.getIsolationOverride())
+        .build();
+  }
+
  /**
   * Validates the GCP project and Registry environment settings in {@code option}. If project is
   * undefined, it is set according to the Registry environment; if project is defined but
@@ -38,18 +74,18 @@ public interface RegistryPipelineOptions extends GcpOptions {
   * in {@link RegistryEnvironment}). Tests calling this method must restore the original
   * environment on completion.
   */
-  static void validateRegistryPipelineOptions(RegistryPipelineOptions option) {
-    RegistryEnvironment environment = option.getRegistryEnvironment();
+  static void validateRegistryPipelineOptions(RegistryPipelineOptions options) {
+    RegistryEnvironment environment = options.getRegistryEnvironment();
    if (environment == null) {
      return;
    }
    environment.setup();
-    String projectByEnv = DaggerRegistryPipelineComponent.create().getProjectId();
-    if (Objects.equals(option.getProject(), projectByEnv)) {
+    String projectByEnv = toRegistryPipelineComponent(options).getProjectId();
+    if (Objects.equals(options.getProject(), projectByEnv)) {
      return;
    }
-    if (option.getProject() == null) {
-      option.setProject(projectByEnv);
+    if (options.getProject() == null) {
+      options.setProject(projectByEnv);
      return;
    }
    throw new IllegalArgumentException(
@@ -14,6 +14,8 @@

 package google.registry.beam.common;

+import static google.registry.beam.common.RegistryPipelineOptions.toRegistryPipelineComponent;
+
 import com.google.auto.service.AutoService;
 import com.google.common.flogger.FluentLogger;
 import dagger.Lazy;
@@ -24,7 +26,8 @@ import org.apache.beam.sdk.harness.JvmInitializer;
 import org.apache.beam.sdk.options.PipelineOptions;

 /**
- * Sets up Nomulus environment and initializes JPA on each pipeline worker.
+ * Sets up Nomulus environment and initializes JPA on each pipeline worker. It is assumed that the
+ * pipeline only works with one SQL database.
 *
 * <p>This class only takes effect in portable beam pipeline runners (including the Cloud Dataflow
 * runner). It is not invoked in test pipelines.
@@ -35,15 +38,15 @@ public class RegistryPipelineWorkerInitializer implements JvmInitializer {

  @Override
  public void beforeProcessing(PipelineOptions options) {
-    RegistryEnvironment environment =
-        options.as(RegistryPipelineOptions.class).getRegistryEnvironment();
+    RegistryPipelineOptions registryOptions = options.as(RegistryPipelineOptions.class);
+    RegistryEnvironment environment = registryOptions.getRegistryEnvironment();
    if (environment == null || environment.equals(RegistryEnvironment.UNITTEST)) {
      return;
    }
    logger.atInfo().log("Setting up RegistryEnvironment: %s", environment);
    environment.setup();
    Lazy<JpaTransactionManager> transactionManagerLazy =
-        DaggerRegistryPipelineComponent.create().getJpaTransactionManager();
+        toRegistryPipelineComponent(registryOptions).getJpaTransactionManager();
    TransactionManagerFactory.setJpaTmOnBeamWorker(transactionManagerLazy::get);
  }
 }
@@ -78,7 +78,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.
 */
-public class BulkDeletePipeline {
+public class BulkDeleteDatastorePipeline {
  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

  // This tool is not for use in our critical projects.
@@ -89,7 +89,7 @@ public class BulkDeletePipeline {

  private final Pipeline pipeline;

-  BulkDeletePipeline(BulkDeletePipelineOptions options) {
+  BulkDeleteDatastorePipeline(BulkDeletePipelineOptions options) {
    this.options = options;
    pipeline = Pipeline.create(options);
  }
@@ -303,7 +303,7 @@ public class BulkDeletePipeline {
  public static void main(String[] args) {
    BulkDeletePipelineOptions options =
        PipelineOptionsFactory.fromArgs(args).withValidation().as(BulkDeletePipelineOptions.class);
-    BulkDeletePipeline pipeline = new BulkDeletePipeline(options);
+    BulkDeleteDatastorePipeline pipeline = new BulkDeleteDatastorePipeline(options);
    pipeline.run();
    System.exit(0);
  }
@@ -505,7 +505,7 @@ public class DatastoreV1 {
      }

      @StartBundle
-      public void startBundle(StartBundleContext c) throws Exception {
+      public void startBundle(StartBundleContext c) {
        datastore =
            datastoreFactory.getDatastore(
                c.getPipelineOptions(), v1Options.getProjectId(), v1Options.getLocalhost());
@@ -548,7 +548,7 @@ public class DatastoreV1 {
      }

      @StartBundle
-      public void startBundle(StartBundleContext c) throws Exception {
+      public void startBundle(StartBundleContext c) {
        datastore =
            datastoreFactory.getDatastore(
                c.getPipelineOptions(), options.getProjectId(), options.getLocalhost());
@@ -556,7 +556,7 @@ public class DatastoreV1 {
      }

      @ProcessElement
-      public void processElement(ProcessContext c) throws Exception {
+      public void processElement(ProcessContext c) {
        Query query = c.element();

        // If query has a user set limit, then do not split.
@@ -626,7 +626,7 @@ public class DatastoreV1 {
      }

      @StartBundle
-      public void startBundle(StartBundleContext c) throws Exception {
+      public void startBundle(StartBundleContext c) {
        datastore =
            datastoreFactory.getDatastore(
                c.getPipelineOptions(), options.getProjectId(), options.getLocalhost());
@@ -93,7 +93,7 @@ public final class BackupPaths {
    checkArgument(!isNullOrEmpty(exportDir), "Null or empty exportDir.");
    checkArgument(!isNullOrEmpty(kind), "Null or empty kind.");
    checkArgument(shard >= 0, "Negative shard %s not allowed.", shard);
-    return String.format(EXPORT_PATTERN_TEMPLATE, exportDir, kind, Integer.toString(shard));
+    return String.format(EXPORT_PATTERN_TEMPLATE, exportDir, kind, shard);
  }

  /** Returns an {@link ImmutableList} of regex patterns that match all CommitLog files. */
@@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.backup.AppEngineEnvironment;
 import google.registry.backup.VersionedEntity;
-import google.registry.beam.initsql.BeamJpaModule.JpaTransactionManagerComponent;
+import google.registry.beam.common.RegistryJpaIO;
 import google.registry.beam.initsql.Transforms.RemoveDomainBaseForeignKeys;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.contact.ContactResource;
@@ -35,7 +35,6 @@ import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
-import google.registry.persistence.transaction.JpaTransactionManager;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Optional;
@@ -43,7 +42,6 @@ import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.ParDo;
-import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.transforms.Wait;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionTuple;
@@ -124,20 +122,15 @@ public class InitSqlPipeline implements Serializable {

  private final Pipeline pipeline;

-  private final SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager>
-      jpaGetter;
-
  InitSqlPipeline(InitSqlPipelineOptions options) {
    this.options = options;
    pipeline = Pipeline.create(options);
-    jpaGetter = JpaTransactionManagerComponent::cloudSqlJpaTransactionManager;
  }

  @VisibleForTesting
  InitSqlPipeline(InitSqlPipelineOptions options, Pipeline pipeline) {
    this.options = options;
    this.pipeline = pipeline;
-    jpaGetter = JpaTransactionManagerComponent::localDbJpaTransactionManager;
  }

  public PipelineResult run() {
@@ -147,6 +140,7 @@ public class InitSqlPipeline implements Serializable {

  @VisibleForTesting
  void setupPipeline() {
+    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_READ_UNCOMMITTED);
    PCollectionTuple datastoreSnapshot =
        pipeline.apply(
            "Load Datastore snapshot",
@@ -223,22 +217,13 @@ public class InitSqlPipeline implements Serializable {
  }

  private PCollection<Void> writeToSql(String transformId, PCollection<VersionedEntity> data) {
-    String credentialFileUrl =
-        options.getSqlCredentialUrlOverride() != null
-            ? options.getSqlCredentialUrlOverride()
-            : BackupPaths.getCloudSQLCredentialFilePatterns(options.getEnvironment()).get(0);
-
    return data.apply(
-        "Write to sql: " + transformId,
-        Transforms.writeToSql(
-            transformId,
-            options.getMaxConcurrentSqlWriters(),
-            options.getSqlWriteBatchSize(),
-            new JpaSupplierFactory(
-                credentialFileUrl,
-                options.getCloudKmsProjectId(),
-                jpaGetter,
-                TransactionIsolationLevel.TRANSACTION_READ_UNCOMMITTED)));
+        "Write to Sql: " + transformId,
+        RegistryJpaIO.<VersionedEntity>write()
+            .withName(transformId)
+            .withBatchSize(options.getSqlWriteBatchSize())
+            .withShards(options.getSqlWriteShards())
+            .withJpaConverter(Transforms::convertVersionedEntityToSqlEntity));
  }

  private static ImmutableList<String> toKindStrings(Collection<Class<?>> entityClasses) {
@@ -14,21 +14,12 @@

 package google.registry.beam.initsql;

-import javax.annotation.Nullable;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
-import org.apache.beam.sdk.options.Default;
+import google.registry.beam.common.RegistryPipelineOptions;
 import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.Validation;

 /** Pipeline options for {@link InitSqlPipeline} */
-public interface InitSqlPipelineOptions extends GcpOptions {
-
-  @Description(
-      "Overrides the URL to the SQL credential file. " + "Required if environment is not provided.")
-  @Nullable
-  String getSqlCredentialUrlOverride();
-
-  void setSqlCredentialUrlOverride(String credentialUrlOverride);
+public interface InitSqlPipelineOptions extends RegistryPipelineOptions {

  @Description("The root directory of the export to load.")
  String getDatastoreExportDir();
@@ -51,41 +42,4 @@ public interface InitSqlPipelineOptions extends GcpOptions {
  String getCommitLogEndTimestamp();

  void setCommitLogEndTimestamp(String commitLogEndTimestamp);
-
-  @Description(
-      "The deployed environment, alpha, crash, sandbox, or production. "
-          + "Not required only if sqlCredentialUrlOverride is provided.")
-  @Nullable
-  String getEnvironment();
-
-  void setEnvironment(String environment);
-
-  @Description(
-      "The GCP project that contains the keyring used for decrypting the " + "SQL credential file.")
-  @Nullable
-  String getCloudKmsProjectId();
-
-  void setCloudKmsProjectId(String cloudKmsProjectId);
-
-  @Description(
-      "The maximum JDBC connection pool size on a VM. "
-          + "This value should be equal to or greater than the number of cores on the VM.")
-  @Default.Integer(4)
-  int getJdbcMaxPoolSize();
-
-  void setJdbcMaxPoolSize(int jdbcMaxPoolSize);
-
-  @Description(
-      "A hint to the pipeline runner of the maximum number of concurrent SQL writers to create. "
-          + "Note that multiple writers may run on the same VM and share the connection pool.")
-  @Default.Integer(4)
-  int getMaxConcurrentSqlWriters();
-
-  void setMaxConcurrentSqlWriters(int maxConcurrentSqlWriters);
-
-  @Description("The number of entities to be written to the SQL database in one transaction.")
-  @Default.Integer(20)
-  int getSqlWriteBatchSize();
-
-  void setSqlWriteBatchSize(int sqlWriteBatchSize);
 }
@@ -368,7 +368,7 @@ public final class Transforms {
   *     to make Optional work with BEAM)
   */
  @Nullable
-  private static Object convertVersionedEntityToSqlEntity(VersionedEntity dsEntity) {
+  public static Object convertVersionedEntityToSqlEntity(VersionedEntity dsEntity) {
    return dsEntity
        .getEntity()
        .filter(Transforms::isMigratable)
@@ -300,10 +300,9 @@ public class BigqueryConnection implements AutoCloseable {
   * Initializes the BigqueryConnection object by setting up the API client and creating the default
   * dataset if it doesn't exist.
   */
-  private BigqueryConnection initialize() throws Exception {
+  private void initialize() throws Exception {
    createDatasetIfNeeded(datasetId);
    createDatasetIfNeeded(TEMP_DATASET_NAME);
-    return this;
  }

  /**
@@ -378,13 +377,11 @@ public class BigqueryConnection implements AutoCloseable {

  /**
   * Starts an asynchronous load job to populate the specified destination table with the given
-   * source URIs and source format.  Returns a ListenableFuture that holds the same destination
-   * table object on success.
+   * source URIs and source format. Returns a ListenableFuture that holds the same destination table
+   * object on success.
   */
-  public ListenableFuture<DestinationTable> load(
-      DestinationTable dest,
-      SourceFormat sourceFormat,
-      Iterable<String> sourceUris) {
+  public ListenableFuture<DestinationTable> startLoad(
+      DestinationTable dest, SourceFormat sourceFormat, Iterable<String> sourceUris) {
    Job job = new Job()
        .setConfiguration(new JobConfiguration()
            .setLoad(new JobConfigurationLoad()
@@ -400,9 +397,7 @@ public class BigqueryConnection implements AutoCloseable {
   * of the specified query, or if the table is a view, to update the view to reflect that query.
   * Returns a ListenableFuture that holds the same destination table object on success.
   */
-  public ListenableFuture<DestinationTable> query(
-      String querySql,
-      DestinationTable dest) {
+  public ListenableFuture<DestinationTable> startQuery(String querySql, DestinationTable dest) {
    if (dest.type == TableType.VIEW) {
      // Use Futures.transform() rather than calling apply() directly so that any exceptions thrown
      // by calling updateTable will be propagated on the get() call, not from here.
@@ -562,20 +557,18 @@ public class BigqueryConnection implements AutoCloseable {
    // Tracking bug for query-to-GCS support is b/13777340.
    DestinationTable tempTable = buildTemporaryTable().build();
    return transformAsync(
-        query(querySql, tempTable),
+        startQuery(querySql, tempTable),
        tempTable1 -> extractTable(tempTable1, destinationUri, destinationFormat, printHeader),
        directExecutor());
  }

  /** @see #runJob(Job, AbstractInputStreamContent) */
-  public Job runJob(Job job) {
+  private Job runJob(Job job) {
    return runJob(job, null);
  }

-  /**
-   * Launch a job, wait for it to complete, but <i>do not</i> check for errors.
-   */
-  public Job runJob(Job job, @Nullable AbstractInputStreamContent data) {
+  /** Launch a job, wait for it to complete, but <i>do not</i> check for errors. */
+  private Job runJob(Job job, @Nullable AbstractInputStreamContent data) {
    return checkJob(waitForJob(launchJob(job, data)));
  }

@@ -403,12 +403,6 @@ public final class RegistryConfig {
      return config.cloudSql.jdbcUrl;
    }

-    @Provides
-    @Config("cloudSqlUsername")
-    public static String providesCloudSqlUsername(RegistryConfigSettings config) {
-      return config.cloudSql.username;
-    }
-
    @Provides
    @Config("cloudSqlInstanceConnectionName")
    public static String providesCloudSqlInstanceConnectionName(RegistryConfigSettings config) {
@@ -652,6 +646,13 @@ public final class RegistryConfig {
      return config.beam.defaultJobZone;
    }

+    /** Returns the GCS bucket URL with all staged BEAM flex templates. */
+    @Provides
+    @Config("beamStagingBucketUrl")
+    public static String provideBeamStagingBucketUrl(RegistryConfigSettings config) {
+      return config.beam.stagingBucketUrl;
+    }
+
    /**
     * Returns the URL of the GCS location we store jar dependencies for beam pipelines.
     *
@@ -1335,12 +1336,6 @@ public final class RegistryConfig {
      return config.registryTool.clientSecret;
    }

-    @Provides
-    @Config("toolsCloudSqlUsername")
-    public static String providesToolsCloudSqlUsername(RegistryConfigSettings config) {
-      return config.registryTool.username;
-    }
-
    @Provides
    @Config("rdapTos")
    public static ImmutableList<String> provideRdapTos(RegistryConfigSettings config) {
@@ -123,6 +123,7 @@ public class RegistryConfigSettings {
  /** Configuration for Cloud SQL. */
  public static class CloudSql {
    public String jdbcUrl;
+    // TODO(05012021): remove username field after it is removed from all yaml files.
    public String username;
    public String instanceConnectionName;
    public boolean replicateTransactions;
@@ -133,6 +134,7 @@ public class RegistryConfigSettings {
  public static class Beam {
    public String defaultJobRegion;
    public String defaultJobZone;
+    public String stagingBucketUrl;
  }

  /** Configuration for Cloud DNS. */
@@ -220,6 +222,7 @@ public class RegistryConfigSettings {
  public static class RegistryTool {
    public String clientId;
    public String clientSecret;
+    // TODO(05012021): remove username field after it is removed from all yaml files.
    public String username;
  }

@@ -207,27 +207,24 @@ hibernate:

  # Connection pool configurations.
  hikariConnectionTimeout: 20000
-  # We occasionally received "Connection is not available, request timed out"
-  # exception when setting minimumIdle to 0 and it turned out it is a bug (See
-  # https://github.com/brettwooldridge/HikariCP/issues/1212) in HikariCP.
-  #
-  # We tried to use a fixed size pool but ran into an issue(See b/155383029),
-  # so we need further investigation to figure out the proper size of the pool.
-  #
-  # HikariCP also recommends not setting minimumIdle for maximum performance
-  # and responsiveness to spike demands (See
-  # https://github.com/brettwooldridge/HikariCP).
-  #
-  # TODO(b/154720215): Investigate the long term fix.
+  # Cloud SQL connections are a relatively scarce resource (maximum is 1000 as
+  # of March 2021). The minimumIdle should be a small value so that machines may
+  # release connections after a demand spike. The maximumPoolSize is set to 10
+  # because that is the maximum number of concurrent requests a Nomulus server
+  # instance can handle (as limited by AppEngine for basic/manual scaling). Note
+  # that BEAM pipelines are not subject to the maximumPoolSize value defined
+  # here. See PersistenceModule.java for more information.
  hikariMinimumIdle: 1
  hikariMaximumPoolSize: 10
  hikariIdleTimeout: 300000

 cloudSql:
  # jdbc url for the Cloud SQL database.
+  # TODO(b/181693544): change the database name when upgrading postgres version
+  # Using the default 'postgres' is bad practice. See bug for more information.
+  # If jdbcUrl in this file is moved elsewhere, be sure to move this notice
+  # with it until the change is applied.
  jdbcUrl: jdbc:postgresql://localhost
-  # Username for the database user.
-  username: username
  # This name is used by Cloud SQL when connecting to the database.
  instanceConnectionName: project-id:region:instance-id
  # Set this to true to replicate cloud SQL transactions to datastore in the
@@ -426,6 +423,7 @@ beam:
  # The default zone to run Apache Beam (Cloud Dataflow) jobs in.
  # TODO(weiminyu): consider dropping zone config. No obvious needs for this.
  defaultJobZone: us-east1-c
+  stagingBucketUrl: gcs-bucket-with-staged-templates

 keyring:
  # The name of the active keyring, either "KMS" or "Dummy".
@@ -447,7 +445,6 @@ registryTool:
  clientId: YOUR_CLIENT_ID
  # OAuth client secret used by the tool.
  clientSecret: YOUR_CLIENT_SECRET
-  username: toolusername

 # Configuration options for checking SSL certificates.
 sslCertificateValidation:
@@ -142,6 +142,16 @@
    <target>backend</target>
  </cron>

+  <cron>
+    <url><![CDATA[/_dr/task/deleteExpiredDomains]]></url>
+    <description>
+      This job runs an action that deletes domains that are past their
+      autorenew end date.
+    </description>
+    <schedule>every day 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/backupDatastore&runInEmpty]]></url>
    <description>
@@ -379,6 +379,18 @@
    <url-pattern>/_dr/task/relockDomain</url-pattern>
  </servlet-mapping>

+  <!-- Action to wipeout Cloud SQL data -->
+  <servlet-mapping>
+    <servlet-name>backend-servlet</servlet-name>
+    <url-pattern>/_dr/task/wipeOutCloudSql</url-pattern>
+  </servlet-mapping>
+
+  <!-- Action to wipeout Cloud Datastore data -->
+  <servlet-mapping>
+    <servlet-name>backend-servlet</servlet-name>
+    <url-pattern>/_dr/task/wipeOutDatastore</url-pattern>
+  </servlet-mapping>
+
  <!-- Security config -->
  <security-constraint>
    <web-resource-collection>
@@ -190,4 +190,14 @@
    <target>backend</target>
  </cron>

+  <cron>
+    <url><![CDATA[/_dr/task/deleteExpiredDomains]]></url>
+    <description>
+      This job runs an action that deletes domains that are past their
+      autorenew end date.
+    </description>
+    <schedule>every day 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
 </cronentries>
@@ -183,6 +183,16 @@
    <target>backend</target>
  </cron>

+  <cron>
+    <url><![CDATA[/_dr/task/deleteExpiredDomains]]></url>
+    <description>
+      This job runs an action that deletes domains that are past their
+      autorenew end date.
+    </description>
+    <schedule>every day 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/backupDatastore&runInEmpty]]></url>
    <description>
@@ -72,4 +72,32 @@
    <target>backend</target>
  </cron>

+  <cron>
+    <url><![CDATA[/_dr/task/deleteExpiredDomains]]></url>
+    <description>
+      This job runs an action that deletes domains that are past their
+      autorenew end date.
+    </description>
+    <schedule>every day 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
+  <cron>
+    <url><![CDATA[/_dr/task/wipeOutCloudSql]]></url>
+    <description>
+      This job runs an action that deletes all data in Cloud SQL.
+    </description>
+    <schedule>every saturday 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
+  <cron>
+    <url><![CDATA[/_dr/task/wipeOutDatastore]]></url>
+    <description>
+      This job runs an action that deletes all data in Cloud Datastore.
+    </description>
+    <schedule>every saturday 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
 </cronentries>
@@ -158,6 +158,16 @@
    <target>backend</target>
  </cron>

+  <cron>
+    <url><![CDATA[/_dr/task/deleteExpiredDomains]]></url>
+    <description>
+      This job runs an action that deletes domains that are past their
+      autorenew end date.
+    </description>
+    <schedule>every day 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/backupDatastore&runInEmpty]]></url>
    <description>
@@ -21,12 +21,13 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
 import com.googlecode.objectify.Key;
 import google.registry.model.EntityClasses;
+import google.registry.model.annotations.InCrossTld;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.annotations.VirtualEntity;

 /** Constants related to export code. */
-public final class ExportConstants {
+public final class AnnotatedEntities {

  /** Returns the names of kinds to include in Datastore backups. */
  public static ImmutableSet<String> getBackupKinds() {
@@ -49,4 +50,13 @@ public final class ExportConstants {
        .map(Key::getKind)
        .collect(toImmutableSortedSet(Ordering.natural()));
  }
+
+  /** Returns the names of kinds that are in the cross-TLD entity group. */
+  public static ImmutableSet<String> getCrossTldKinds() {
+    return EntityClasses.ALL_CLASSES.stream()
+        .filter(hasAnnotation(InCrossTld.class))
+        .filter(hasAnnotation(VirtualEntity.class).negate())
+        .map(Key::getKind)
+        .collect(toImmutableSortedSet(Ordering.natural()));
+  }
 }
@@ -66,12 +66,13 @@ public class BackupDatastoreAction implements Runnable {
    try {
      Operation backup =
          datastoreAdmin
-              .export(RegistryConfig.getDatastoreBackupsBucket(), ExportConstants.getBackupKinds())
+              .export(
+                  RegistryConfig.getDatastoreBackupsBucket(), AnnotatedEntities.getBackupKinds())
              .execute();

      String backupName = backup.getName();
      // Enqueue a poll task to monitor the backup and load REPORTING-related kinds into bigquery.
-      enqueuePollTask(backupName, ExportConstants.getReportingKinds());
+      enqueuePollTask(backupName, AnnotatedEntities.getReportingKinds());
      String message =
          String.format(
              "Datastore backup started with name: %s\nSaving to %s",
@@ -16,7 +16,6 @@ package google.registry.export;

 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
 import static google.registry.util.CollectionUtils.nullToEmpty;
@@ -164,7 +163,7 @@ public final class SyncGroupMembersAction implements Runnable {
        registrarsToSave.add(result.getKey().asBuilder().setContactsRequireSyncing(false).build());
      }
    }
-    tm().transactNew(() -> ofy().save().entities(registrarsToSave.build()));
+    tm().transactNew(() -> tm().updateAll(registrarsToSave.build()));
    return errors;
  }

@@ -17,7 +17,6 @@ package google.registry.export.sheet;
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static google.registry.model.common.Cursor.CursorType.SYNC_REGISTRAR_SHEET;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.registrar.RegistrarContact.Type.ABUSE;
 import static google.registry.model.registrar.RegistrarContact.Type.ADMIN;
 import static google.registry.model.registrar.RegistrarContact.Type.BILLING;
@@ -25,8 +24,8 @@ import static google.registry.model.registrar.RegistrarContact.Type.LEGAL;
 import static google.registry.model.registrar.RegistrarContact.Type.MARKETING;
 import static google.registry.model.registrar.RegistrarContact.Type.TECH;
 import static google.registry.model.registrar.RegistrarContact.Type.WHOIS;
-import static google.registry.schema.cursor.Cursor.GLOBAL;
-import static google.registry.schema.cursor.CursorDao.loadAndCompare;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;

 import com.google.common.base.Joiner;
@@ -38,10 +37,10 @@ import google.registry.model.common.Cursor;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarAddress;
 import google.registry.model.registrar.RegistrarContact;
-import google.registry.schema.cursor.CursorDao;
 import google.registry.util.Clock;
 import google.registry.util.DateTimeUtils;
 import java.io.IOException;
+import java.util.Optional;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -63,9 +62,10 @@ class SyncRegistrarsSheet {
   * successfully completed, as measured by a cursor.
   */
  boolean wereRegistrarsModified() {
-    Cursor cursor = ofy().load().key(Cursor.createGlobalKey(SYNC_REGISTRAR_SHEET)).now();
-    loadAndCompare(cursor, GLOBAL);
-    DateTime lastUpdateTime = (cursor == null) ? START_OF_TIME : cursor.getCursorTime();
+    Optional<Cursor> cursor =
+        transactIfJpaTm(
+            () -> tm().loadByKeyIfPresent(Cursor.createGlobalVKey(SYNC_REGISTRAR_SHEET)));
+    DateTime lastUpdateTime = !cursor.isPresent() ? START_OF_TIME : cursor.get().getCursorTime();
    for (Registrar registrar : Registrar.loadAllCached()) {
      if (DateTimeUtils.isAtOrAfter(registrar.getLastUpdateTime(), lastUpdateTime)) {
        return true;
@@ -155,9 +155,7 @@ class SyncRegistrarsSheet {
                  return builder.build();
                })
            .collect(toImmutableList()));
-    CursorDao.saveCursor(
-        Cursor.createGlobal(SYNC_REGISTRAR_SHEET, executionTime),
-        google.registry.schema.cursor.Cursor.GLOBAL);
+    tm().transact(() -> tm().put(Cursor.createGlobal(SYNC_REGISTRAR_SHEET, executionTime)));
  }

  private static String convertContacts(
@@ -15,7 +15,7 @@
 package google.registry.flows;

 import static com.google.common.base.Preconditions.checkState;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.xml.ValidationMode.LENIENT;
 import static google.registry.xml.ValidationMode.STRICT;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -51,8 +51,8 @@ public final class FlowUtils {

  /** Persists the saves and deletes in an {@link EntityChanges} to Datastore. */
  public static void persistEntityChanges(EntityChanges entityChanges) {
-    ofy().save().entities(entityChanges.getSaves());
-    ofy().delete().keys(entityChanges.getDeletes());
+    tm().putAll(entityChanges.getSaves());
+    tm().delete(entityChanges.getDeletes());
  }

  /**
@@ -18,12 +18,11 @@ import static com.google.common.collect.Sets.intersection;
 import static google.registry.model.EppResourceUtils.getLinkedDomainKeys;
 import static google.registry.model.EppResourceUtils.loadByForeignKey;
 import static google.registry.model.index.ForeignKeyIndex.loadAndGetKey;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;

 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException.AuthorizationErrorException;
 import google.registry.flows.EppException.InvalidAuthorizationInformationErrorException;
 import google.registry.flows.EppException.ObjectDoesNotExistException;
@@ -185,16 +184,15 @@ public final class ResourceFlowUtils {
      return;
    }
    // The roid should match one of the contacts.
-    Optional<Key<ContactResource>> foundContact =
+    Optional<VKey<ContactResource>> foundContact =
        domain.getReferencedContacts().stream()
-            .map(VKey::getOfyKey)
-            .filter(key -> key.getName().equals(authRepoId))
+            .filter(key -> key.getOfyKey().getName().equals(authRepoId))
            .findFirst();
    if (!foundContact.isPresent()) {
      throw new BadAuthInfoForResourceException();
    }
    // Check the authInfo against the contact.
-    verifyAuthInfo(authInfo, ofy().load().key(foundContact.get()).now());
+    verifyAuthInfo(authInfo, transactIfJpaTm(() -> tm().loadByKey(foundContact.get())));
  }

  /** Check that the given {@link AuthInfo} is valid for the given contact. */
@@ -16,8 +16,8 @@ package google.registry.flows.custom;

 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.model.ImmutableObject;
+import google.registry.persistence.VKey;

 /** A wrapper class that encapsulates Datastore entities to both save and delete. */
@AutoValue
@@ -25,7 +25,7 @@ public abstract class EntityChanges {

  public abstract ImmutableSet<ImmutableObject> getSaves();

-  public abstract ImmutableSet<Key<ImmutableObject>> getDeletes();
+  public abstract ImmutableSet<VKey<ImmutableObject>> getDeletes();

  public static Builder newBuilder() {
    // Default both entities to save and entities to delete to empty sets, so that the build()
@@ -48,11 +48,11 @@ public abstract class EntityChanges {
      return this;
    }

-    public abstract Builder setDeletes(ImmutableSet<Key<ImmutableObject>> entitiesToDelete);
+    public abstract Builder setDeletes(ImmutableSet<VKey<ImmutableObject>> entitiesToDelete);

-    public abstract ImmutableSet.Builder<Key<ImmutableObject>> deletesBuilder();
+    public abstract ImmutableSet.Builder<VKey<ImmutableObject>> deletesBuilder();

-    public Builder addDelete(Key<ImmutableObject> entityToDelete) {
+    public Builder addDelete(VKey<ImmutableObject> entityToDelete) {
      deletesBuilder().add(entityToDelete);
      return this;
    }
@@ -45,7 +45,7 @@ import google.registry.model.eppinput.ResourceCommand;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import google.registry.model.tmch.ClaimsListShard;
+import google.registry.model.tmch.ClaimsListDualDatabaseDao;
 import google.registry.util.Clock;
 import java.util.HashSet;
 import java.util.Optional;
@@ -104,7 +104,8 @@ public final class DomainClaimsCheckFlow implements Flow {
          verifyClaimsPeriodNotEnded(registry, now);
        }
      }
-      Optional<String> claimKey = ClaimsListShard.get().getClaimKey(parsedDomain.parts().get(0));
+      Optional<String> claimKey =
+          ClaimsListDualDatabaseDao.get().getClaimKey(parsedDomain.parts().get(0));
      launchChecksBuilder.add(
          LaunchCheck.create(
              LaunchCheckName.create(claimKey.isPresent(), domainName), claimKey.orElse(null)));
@@ -25,6 +25,9 @@ import static com.google.common.collect.Iterables.any;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.collect.Sets.intersection;
 import static com.google.common.collect.Sets.union;
+import static google.registry.model.DatabaseMigrationUtils.getPrimaryDatabase;
+import static google.registry.model.common.DatabaseTransitionSchedule.PrimaryDatabase.DATASTORE;
+import static google.registry.model.common.DatabaseTransitionSchedule.TransitionId.REPLAYED_ENTITIES;
 import static google.registry.model.domain.DomainBase.MAX_REGISTRATION_YEARS;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.registry.Registries.findTldForName;
@@ -38,6 +41,7 @@ import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED
 import static google.registry.model.registry.label.ReservationType.NAME_COLLISION;
 import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT;
 import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_SPECIFIC_USE;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.pricing.PricingEngineProxy.isDomainPremium;
 import static google.registry.util.CollectionUtils.nullToEmpty;
@@ -88,6 +92,7 @@ import google.registry.model.domain.DomainCommand.Create;
 import google.registry.model.domain.DomainCommand.CreateOrUpdate;
 import google.registry.model.domain.DomainCommand.InvalidReferencesException;
 import google.registry.model.domain.DomainCommand.Update;
+import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.ForeignKeyedDesignatedContact;
 import google.registry.model.domain.Period;
 import google.registry.model.domain.fee.BaseFee;
@@ -124,7 +129,7 @@ import google.registry.model.registry.label.ReservedList;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.tmch.ClaimsListShard;
+import google.registry.model.tmch.ClaimsListDualDatabaseDao;
 import google.registry.persistence.VKey;
 import google.registry.tldconfig.idn.IdnLabelValidator;
 import google.registry.util.Idn;
@@ -355,22 +360,23 @@ public class DomainFlowUtils {

  static void validateNoDuplicateContacts(Set<DesignatedContact> contacts)
      throws ParameterValuePolicyErrorException {
-    ImmutableMultimap<Type, Key<ContactResource>> contactsByType =
+    ImmutableMultimap<Type, VKey<ContactResource>> contactsByType =
        contacts.stream()
            .collect(
                toImmutableSetMultimap(
-                    DesignatedContact::getType, contact -> contact.getContactKey().getOfyKey()));
+                    DesignatedContact::getType, contact -> contact.getContactKey()));

    // If any contact type has multiple contacts:
    if (contactsByType.asMap().values().stream().anyMatch(v -> v.size() > 1)) {
      // Find the duplicates.
-      Map<Type, Collection<Key<ContactResource>>> dupeKeysMap =
+      Map<Type, Collection<VKey<ContactResource>>> dupeKeysMap =
          Maps.filterEntries(contactsByType.asMap(), e -> e.getValue().size() > 1);
-      ImmutableList<Key<ContactResource>> dupeKeys =
+      ImmutableList<VKey<ContactResource>> dupeKeys =
          dupeKeysMap.values().stream().flatMap(Collection::stream).collect(toImmutableList());
      // Load the duplicates in one batch.
-      Map<Key<ContactResource>, ContactResource> dupeContacts = ofy().load().keys(dupeKeys);
-      ImmutableMultimap.Builder<Type, Key<ContactResource>> typesMap =
+      Map<VKey<? extends ContactResource>, ContactResource> dupeContacts =
+          tm().loadByKeys(dupeKeys);
+      ImmutableMultimap.Builder<Type, VKey<ContactResource>> typesMap =
          new ImmutableMultimap.Builder<>();
      dupeKeysMap.forEach(typesMap::putAll);
      // Create an error message showing the type and contact IDs of the duplicates.
@@ -537,13 +543,13 @@ public class DomainFlowUtils {
    // If the resultant autorenew poll message would have no poll messages to deliver, then just
    // delete it. Otherwise save it with the new end time.
    if (isAtOrAfter(updatedAutorenewPollMessage.getEventTime(), newEndTime)) {
-      autorenewPollMessage.ifPresent(autorenew -> ofy().delete().entity(autorenew));
+      autorenewPollMessage.ifPresent(autorenew -> tm().delete(autorenew));
    } else {
-      ofy().save().entity(updatedAutorenewPollMessage);
+      tm().put(updatedAutorenewPollMessage);
    }

    Recurring recurring = tm().loadByKey(domain.getAutorenewBillingEvent());
-    ofy().save().entity(recurring.asBuilder().setRecurrenceEndTime(newEndTime).build());
+    tm().put(recurring.asBuilder().setRecurrenceEndTime(newEndTime).build());
  }

  /**
@@ -988,7 +994,7 @@ public class DomainFlowUtils {
      InternetDomainName domainName, boolean hasSignedMarks, boolean hasClaimsNotice)
      throws EppException {
    boolean isInClaimsList =
-        ClaimsListShard.get().getClaimKey(domainName.parts().get(0)).isPresent();
+        ClaimsListDualDatabaseDao.get().getClaimKey(domainName.parts().get(0)).isPresent();
    if (hasClaimsNotice && !isInClaimsList) {
      throw new UnexpectedClaimsNoticeException(domainName.toString());
    }
@@ -1045,18 +1051,11 @@ public class DomainFlowUtils {
      Duration maxSearchPeriod,
      final ImmutableSet<TransactionReportField> cancelableFields) {

-    List<HistoryEntry> recentHistoryEntries =
-        ofy()
-            .load()
-            .type(HistoryEntry.class)
-            .ancestor(domainBase)
-            .filter("modificationTime >=", now.minus(maxSearchPeriod))
-            .order("modificationTime")
-            .list();
-    Optional<HistoryEntry> entryToCancel =
+    List<? extends HistoryEntry> recentHistoryEntries =
+        findRecentHistoryEntries(domainBase, now, maxSearchPeriod);
+    Optional<? extends HistoryEntry> entryToCancel =
        Streams.findLast(
-            recentHistoryEntries
-                .stream()
+            recentHistoryEntries.stream()
                .filter(
                    historyEntry -> {
                      // Look for add and renew transaction records that have yet to be reported
@@ -1082,6 +1081,27 @@ public class DomainFlowUtils {
    return recordsBuilder.build();
  }

+  private static List<? extends HistoryEntry> findRecentHistoryEntries(
+      DomainBase domainBase, DateTime now, Duration maxSearchPeriod) {
+    if (getPrimaryDatabase(REPLAYED_ENTITIES).equals(DATASTORE)) {
+      return ofy()
+          .load()
+          .type(HistoryEntry.class)
+          .ancestor(domainBase)
+          .filter("modificationTime >=", now.minus(maxSearchPeriod))
+          .order("modificationTime")
+          .list();
+    } else {
+      return jpaTm()
+          .query(
+              "FROM DomainHistory WHERE modificationTime >= :beginning "
+                  + "ORDER BY modificationTime ASC",
+              DomainHistory.class)
+          .setParameter("beginning", now.minus(maxSearchPeriod))
+          .getResultList();
+    }
+  }
+
  /** Resource linked to this domain does not exist. */
  static class LinkedResourcesDoNotExistException extends ObjectDoesNotExistException {
    public LinkedResourcesDoNotExistException(Class<?> type, ImmutableSet<String> resourceIds) {
@@ -22,6 +22,7 @@ import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest;
 import static google.registry.flows.domain.DomainFlowUtils.loadForeignKeyedDesignatedContacts;
 import static google.registry.model.EppResourceUtils.loadByForeignKey;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -100,9 +101,11 @@ public final class DomainInfoFlow implements Flow {
    verifyOptionalAuthInfo(authInfo, domain);
    flowCustomLogic.afterValidation(
        AfterValidationParameters.newBuilder().setDomain(domain).build());
-    // Prefetch all referenced resources. Calling values() blocks until loading is done.
-    tm().loadByKeys(domain.getNameservers());
-    tm().loadByKeys(domain.getReferencedContacts());
+    // In ofy, refetch all referenced resources.
+    if (tm().isOfy()) {
+      tm().loadByKeys(domain.getNameservers());
+      tm().loadByKeys(domain.getReferencedContacts());
+    }
    // Registrars can only see a few fields on unauthorized domains.
    // This is a policy decision that is left up to us by the rfcs.
    DomainInfoData.Builder infoBuilder =
@@ -110,14 +113,16 @@ public final class DomainInfoFlow implements Flow {
            .setFullyQualifiedDomainName(domain.getDomainName())
            .setRepoId(domain.getRepoId())
            .setCurrentSponsorClientId(domain.getCurrentSponsorClientId())
-            .setRegistrant(tm().loadByKey(domain.getRegistrant()).getContactId());
+            .setRegistrant(
+                transactIfJpaTm(() -> tm().loadByKey(domain.getRegistrant())).getContactId());
    // If authInfo is non-null, then the caller is authorized to see the full information since we
    // will have already verified the authInfo is valid.
    if (clientId.equals(domain.getCurrentSponsorClientId()) || authInfo.isPresent()) {
      HostsRequest hostsRequest = ((Info) resourceCommand).getHostsRequest();
      infoBuilder
          .setStatusValues(domain.getStatusValues())
-          .setContacts(loadForeignKeyedDesignatedContacts(domain.getContacts()))
+          .setContacts(
+              transactIfJpaTm(() -> loadForeignKeyedDesignatedContacts(domain.getContacts())))
          .setNameservers(hostsRequest.requestDelegated() ? domain.loadNameserverHostNames() : null)
          .setSubordinateHosts(
              hostsRequest.requestSubordinate() ? domain.getSubordinateHosts() : null)
@@ -233,6 +233,9 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow  {
        .setDeletePollMessage(null)
        .setAutorenewBillingEvent(autorenewEvent.createVKey())
        .setAutorenewPollMessage(autorenewPollMessage.createVKey())
+        // Clear the autorenew end time so if it had expired but is now explicitly being restored,
+        // it won't immediately be deleted again.
+        .setAutorenewEndTime(Optional.empty())
        .setLastEppUpdateTime(now)
        .setLastEppUpdateClientId(clientId)
        .build();
@@ -27,13 +27,13 @@ import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurr
 import static google.registry.flows.domain.DomainTransferUtils.createGainingTransferPollMessage;
 import static google.registry.flows.domain.DomainTransferUtils.createTransferResponse;
 import static google.registry.model.ResourceTransferUtils.approvePendingTransfer;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.pricing.PricingEngineProxy.getDomainRenewCost;
 import static google.registry.util.CollectionUtils.union;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;

+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
@@ -132,6 +132,8 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
                    .setBillingTime(now.plus(Registry.get(tld).getTransferGracePeriodLength()))
                    .setParent(historyEntry)
                    .build());
+    ImmutableList.Builder<ImmutableObject> entitiesToSave = new ImmutableList.Builder<>();
+    entitiesToSave.add(historyEntry);
    // If we are within an autorenew grace period, cancel the autorenew billing event and don't
    // increase the registration time, since the transfer subsumes the autorenew's extra year.
    GracePeriod autorenewGrace =
@@ -143,7 +145,7 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
      // then the gaining registrar is not charged for the one year renewal and the losing registrar
      // still needs to be charged for the auto-renew.
      if (billingEvent.isPresent()) {
-        ofy().save().entity(
+        entitiesToSave.add(
            BillingEvent.Cancellation.forGracePeriod(autorenewGrace, historyEntry, targetId));
      }
    }
@@ -190,31 +192,26 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
            .setAutorenewPollMessage(gainingClientAutorenewPollMessage.createVKey())
            // Remove all the old grace periods and add a new one for the transfer.
            .setGracePeriods(
-                billingEvent.isPresent()
-                    ? ImmutableSet.of(
-                        GracePeriod.forBillingEvent(
-                            GracePeriodStatus.TRANSFER,
-                            existingDomain.getRepoId(),
-                            billingEvent.get()))
-                    : ImmutableSet.of())
+                billingEvent
+                    .map(
+                        oneTime ->
+                            ImmutableSet.of(
+                                GracePeriod.forBillingEvent(
+                                    GracePeriodStatus.TRANSFER,
+                                    existingDomain.getRepoId(),
+                                    oneTime)))
+                    .orElseGet(ImmutableSet::of))
            .setLastEppUpdateTime(now)
            .setLastEppUpdateClientId(clientId)
            .build();
    // Create a poll message for the gaining client.
-    PollMessage gainingClientPollMessage = createGainingTransferPollMessage(
-        targetId,
-        newDomain.getTransferData(),
-        newExpirationTime,
-        historyEntry);
-    ImmutableSet.Builder<ImmutableObject> entitiesToSave = new ImmutableSet.Builder<>();
-    entitiesToSave.add(
-        newDomain,
-        historyEntry,
-        autorenewEvent,
-        gainingClientPollMessage,
-        gainingClientAutorenewPollMessage);
+    PollMessage gainingClientPollMessage =
+        createGainingTransferPollMessage(
+            targetId, newDomain.getTransferData(), newExpirationTime, historyEntry);
    billingEvent.ifPresent(entitiesToSave::add);
-    ofy().save().entities(entitiesToSave.build());
+    entitiesToSave.add(
+        autorenewEvent, gainingClientPollMessage, gainingClientAutorenewPollMessage, newDomain);
+    tm().putAll(entitiesToSave.build());
    // Delete the billing event and poll messages that were written in case the transfer would have
    // been implicitly server approved.
    tm().delete(existingDomain.getTransferData().getServerApproveEntities());
@@ -25,7 +25,6 @@ import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurr
 import static google.registry.flows.domain.DomainTransferUtils.createLosingTransferPollMessage;
 import static google.registry.flows.domain.DomainTransferUtils.createTransferResponse;
 import static google.registry.model.ResourceTransferUtils.denyPendingTransfer;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
@@ -39,7 +38,6 @@ import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
 import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
-import google.registry.model.ImmutableObject;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.eppcommon.AuthInfo;
@@ -100,11 +98,11 @@ public final class DomainTransferCancelFlow implements TransactionalFlow {
    HistoryEntry historyEntry = buildHistoryEntry(existingDomain, registry, now);
    DomainBase newDomain =
        denyPendingTransfer(existingDomain, TransferStatus.CLIENT_CANCELLED, now, clientId);
-    ofy().save().<ImmutableObject>entities(
-        newDomain,
-        historyEntry,
-        createLosingTransferPollMessage(
-            targetId, newDomain.getTransferData(), null, historyEntry));
+    tm().putAll(
+            newDomain,
+            historyEntry,
+            createLosingTransferPollMessage(
+                targetId, newDomain.getTransferData(), null, historyEntry));
    // Reopen the autorenew event and poll message that we closed for the implicit transfer. This
    // may recreate the autorenew poll message if it was deleted when the transfer request was made.
    updateAutorenewRecurrenceEndTime(existingDomain, END_OF_TIME);
@@ -25,7 +25,6 @@ import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurr
 import static google.registry.flows.domain.DomainTransferUtils.createGainingTransferPollMessage;
 import static google.registry.flows.domain.DomainTransferUtils.createTransferResponse;
 import static google.registry.model.ResourceTransferUtils.denyPendingTransfer;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_NACKED;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -41,7 +40,6 @@ import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
 import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
-import google.registry.model.ImmutableObject;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.eppcommon.AuthInfo;
@@ -102,11 +100,11 @@ public final class DomainTransferRejectFlow implements TransactionalFlow {
    }
    DomainBase newDomain =
        denyPendingTransfer(existingDomain, TransferStatus.CLIENT_REJECTED, now, clientId);
-    ofy().save().<ImmutableObject>entities(
-        newDomain,
-        historyEntry,
-        createGainingTransferPollMessage(
-            targetId, newDomain.getTransferData(), null, historyEntry));
+    tm().putAll(
+            newDomain,
+            historyEntry,
+            createGainingTransferPollMessage(
+                targetId, newDomain.getTransferData(), null, historyEntry));
    // Reopen the autorenew event and poll message that we closed for the implicit transfer. This
    // may end up recreating the poll message if it was deleted upon the transfer request.
    updateAutorenewRecurrenceEndTime(existingDomain, END_OF_TIME);
@@ -31,7 +31,6 @@ import static google.registry.flows.domain.DomainTransferUtils.createPendingTran
 import static google.registry.flows.domain.DomainTransferUtils.createTransferResponse;
 import static google.registry.flows.domain.DomainTransferUtils.createTransferServerApproveEntities;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_ACTION_PENDING;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;

 import com.google.common.collect.ImmutableList;
@@ -227,12 +226,11 @@ public final class DomainTransferRequestFlow implements TransactionalFlow {
            .setLastEppUpdateClientId(gainingClientId)
            .build();
    asyncTaskEnqueuer.enqueueAsyncResave(newDomain, now, automaticTransferTime);
-    ofy().save()
-        .entities(new ImmutableSet.Builder<>()
-            .add(newDomain, historyEntry, requestPollMessage)
-            .addAll(serverApproveEntities)
-            .build())
-        .now();
+    tm().putAll(
+            new ImmutableSet.Builder<>()
+                .add(newDomain, historyEntry, requestPollMessage)
+                .addAll(serverApproveEntities)
+                .build());
    return responseBuilder
        .setResultFromCode(SUCCESS_WITH_ACTION_PENDING)
        .setResData(createResponse(period, existingDomain, newDomain, now))
@@ -16,15 +16,13 @@ package google.registry.flows.poll;

 import static google.registry.flows.FlowUtils.validateClientIsLoggedIn;
 import static google.registry.flows.poll.PollFlowUtils.ackPollMessage;
-import static google.registry.flows.poll.PollFlowUtils.getPollMessagesQuery;
+import static google.registry.flows.poll.PollFlowUtils.getPollMessageCount;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_NO_MESSAGES;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.makePollMessageExternalId;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.parsePollMessageExternalId;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;

-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.AuthorizationErrorException;
 import google.registry.flows.EppException.ObjectDoesNotExistException;
@@ -39,6 +37,8 @@ import google.registry.model.poll.MessageQueueInfo;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.poll.PollMessageExternalKeyConverter;
 import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException;
+import google.registry.persistence.VKey;
+import java.util.Optional;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

@@ -71,7 +71,7 @@ public class PollAckFlow implements TransactionalFlow {
      throw new MissingMessageIdException();
    }

-    Key<PollMessage> pollMessageKey;
+    VKey<PollMessage> pollMessageKey;
    // Try parsing the messageId, and throw an exception if it's invalid.
    try {
      pollMessageKey = parsePollMessageExternalId(messageId);
@@ -84,12 +84,13 @@ public class PollAckFlow implements TransactionalFlow {
    // Load the message to be acked. If a message is queued to be delivered in the future, we treat
    // it as if it doesn't exist yet. Same for if the message ID year isn't the same as the actual
    // poll message's event time (that means they're passing in an old already-acked ID).
-    PollMessage pollMessage = ofy().load().key(pollMessageKey).now();
-    if (pollMessage == null
-        || !isBeforeOrAt(pollMessage.getEventTime(), now)
-        || !makePollMessageExternalId(pollMessage).equals(messageId)) {
+    Optional<PollMessage> maybePollMessage = tm().loadByKeyIfPresent(pollMessageKey);
+    if (!maybePollMessage.isPresent()
+        || !isBeforeOrAt(maybePollMessage.get().getEventTime(), now)
+        || !makePollMessageExternalId(maybePollMessage.get()).equals(messageId)) {
      throw new MessageDoesNotExistException(messageId);
    }
+    PollMessage pollMessage = maybePollMessage.get();

    // Make sure this client is authorized to ack this message. It could be that the message is
    // supposed to go to a different registrar.
@@ -106,8 +107,11 @@ public class PollAckFlow implements TransactionalFlow {
    // acked, then we return a special status code indicating that. Note that the query will
    // include the message being acked.

-    int messageCount = tm().doTransactionless(() -> getPollMessagesQuery(clientId, now).count());
-    if (!includeAckedMessageInCount) {
+    int messageCount = tm().doTransactionless(() -> getPollMessageCount(clientId, now));
+    // Within the same transaction, Datastore will not reflect the updated count (potentially
+    // reduced by one thanks to the acked poll message). SQL will, however, so we shouldn't reduce
+    // the count in the SQL case.
+    if (!includeAckedMessageInCount && tm().isOfy()) {
      messageCount--;
    }
    if (messageCount <= 0) {
@@ -16,25 +16,56 @@ package google.registry.flows.poll;

 import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;

 import com.googlecode.objectify.cmd.Query;
 import google.registry.model.poll.PollMessage;
+import java.util.Optional;
 import org.joda.time.DateTime;

 /** Static utility functions for poll flows. */
 public final class PollFlowUtils {

-  private PollFlowUtils() {}
+  public static final String SQL_POLL_MESSAGE_QUERY =
+      "FROM PollMessage WHERE clientId = :registrarId AND eventTime <= :now ORDER BY eventTime ASC";
+  private static final String SQL_POLL_MESSAGE_COUNT_QUERY =
+      "SELECT COUNT(*) FROM PollMessage WHERE clientId = :registrarId AND eventTime <= :now";

-  /** Returns a query for poll messages for the logged in registrar which are not in the future. */
-  public static Query<PollMessage> getPollMessagesQuery(String clientId, DateTime now) {
-    return ofy().load()
-        .type(PollMessage.class)
-        .filter("clientId", clientId)
-        .filter("eventTime <=", now.toDate())
-        .order("eventTime");
+  /** Returns the number of poll messages for the given registrar that are not in the future. */
+  public static int getPollMessageCount(String registrarId, DateTime now) {
+    if (tm().isOfy()) {
+      return datastorePollMessageQuery(registrarId, now).count();
+    } else {
+      return jpaTm()
+          .transact(
+              () ->
+                  jpaTm()
+                      .query(SQL_POLL_MESSAGE_COUNT_QUERY, Long.class)
+                      .setParameter("registrarId", registrarId)
+                      .setParameter("now", now)
+                      .getSingleResult()
+                      .intValue());
+    }
+  }
+
+  /** Returns the first (by event time) poll message not in the future for this registrar. */
+  public static Optional<PollMessage> getFirstPollMessage(String registrarId, DateTime now) {
+    if (tm().isOfy()) {
+      return Optional.ofNullable(datastorePollMessageQuery(registrarId, now).first().now());
+    } else {
+      return jpaTm()
+          .transact(
+              () ->
+                  jpaTm()
+                      .query(SQL_POLL_MESSAGE_QUERY, PollMessage.class)
+                      .setParameter("registrarId", registrarId)
+                      .setParameter("now", now)
+                      .setMaxResults(1)
+                      .getResultStream()
+                      .findFirst());
+    }
  }

  /**
@@ -74,4 +105,16 @@ public final class PollFlowUtils {
    }
    return includeAckedMessageInCount;
  }
+
+  /** A Datastore query for poll messages from the given registrar that are not in the future. */
+  public static Query<PollMessage> datastorePollMessageQuery(String registrarId, DateTime now) {
+    return ofy()
+        .load()
+        .type(PollMessage.class)
+        .filter("clientId", registrarId)
+        .filter("eventTime <=", now.toDate())
+        .order("eventTime");
+  }
+
+  private PollFlowUtils() {}
 }
@@ -15,7 +15,8 @@
 package google.registry.flows.poll;

 import static google.registry.flows.FlowUtils.validateClientIsLoggedIn;
-import static google.registry.flows.poll.PollFlowUtils.getPollMessagesQuery;
+import static google.registry.flows.poll.PollFlowUtils.getFirstPollMessage;
+import static google.registry.flows.poll.PollFlowUtils.getPollMessageCount;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_ACK_MESSAGE;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_NO_MESSAGES;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.makePollMessageExternalId;
@@ -31,6 +32,7 @@ import google.registry.model.poll.MessageQueueInfo;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.poll.PollMessageExternalKeyConverter;
 import google.registry.util.Clock;
+import java.util.Optional;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

@@ -63,18 +65,20 @@ public class PollRequestFlow implements Flow {
    }
    // Return the oldest message from the queue.
    DateTime now = clock.nowUtc();
-    PollMessage pollMessage = getPollMessagesQuery(clientId, now).first().now();
-    if (pollMessage == null) {
+    Optional<PollMessage> maybePollMessage = getFirstPollMessage(clientId, now);
+    if (!maybePollMessage.isPresent()) {
      return responseBuilder.setResultFromCode(SUCCESS_WITH_NO_MESSAGES).build();
    }
+    PollMessage pollMessage = maybePollMessage.get();
    return responseBuilder
        .setResultFromCode(SUCCESS_WITH_ACK_MESSAGE)
-        .setMessageQueueInfo(new MessageQueueInfo.Builder()
-            .setQueueDate(pollMessage.getEventTime())
-            .setMsg(pollMessage.getMsg())
-            .setQueueLength(getPollMessagesQuery(clientId, now).count())
-            .setMessageId(makePollMessageExternalId(pollMessage))
-            .build())
+        .setMessageQueueInfo(
+            new MessageQueueInfo.Builder()
+                .setQueueDate(pollMessage.getEventTime())
+                .setMsg(pollMessage.getMsg())
+                .setQueueLength(getPollMessageCount(clientId, now))
+                .setMessageId(makePollMessageExternalId(pollMessage))
+                .build())
        .setMultipleResData(pollMessage.getResponseData())
        .build();
  }
@@ -39,8 +39,6 @@ public final class InMemoryKeyring implements Keyring {
  private final String marksdbLordnPassword;
  private final String marksdbSmdrlLoginAndPassword;
  private final String jsonCredential;
-  private final String cloudSqlPassword;
-  private final String toolsCloudSqlPassword;

  public InMemoryKeyring(
      PGPKeyPair rdeStagingKey,
@@ -83,8 +81,6 @@ public final class InMemoryKeyring implements Keyring {
    this.marksdbSmdrlLoginAndPassword =
        checkNotNull(marksdbSmdrlLoginAndPassword, "marksdbSmdrlLoginAndPassword");
    this.jsonCredential = checkNotNull(jsonCredential, "jsonCredential");
-    this.cloudSqlPassword = checkNotNull(cloudSqlPassword, "cloudSqlPassword");
-    this.toolsCloudSqlPassword = checkNotNull(toolsCloudSqlPassword, "toolsCloudSqlPassword");
  }

  @Override
@@ -157,16 +153,6 @@ public final class InMemoryKeyring implements Keyring {
    return jsonCredential;
  }

-  @Override
-  public String getCloudSqlPassword() {
-    return cloudSqlPassword;
-  }
-
-  @Override
-  public String getToolsCloudSqlPassword() {
-    return toolsCloudSqlPassword;
-  }
-
  /** Does nothing. */
  @Override
  public void close() {}
@@ -36,18 +36,6 @@ public final class KeyModule {
    String value();
  }

-  @Provides
-  @Key("cloudSqlPassword")
-  static String providesCloudSqlPassword(Keyring keyring) {
-    return keyring.getCloudSqlPassword();
-  }
-
-  @Provides
-  @Key("toolsCloudSqlPassword")
-  static String providesToolsCloudSqlPassword(Keyring keyring) {
-    return keyring.getToolsCloudSqlPassword();
-  }
-
  @Provides
  @Key("brdaReceiverKey")
  static PGPPublicKey provideBrdaReceiverKey(Keyring keyring) {
@@ -28,12 +28,6 @@ import org.bouncycastle.openpgp.PGPPublicKey;
@ThreadSafe
 public interface Keyring extends AutoCloseable {

-  /** Returns the password which is used by App Engine to connect to the Cloud SQL database. */
-  String getCloudSqlPassword();
-
-  /** Returns the password which is used by nomulus tool to connect to the Cloud SQL database. */
-  String getToolsCloudSqlPassword();
-
  /**
   * Returns the key which should be used to sign RDE deposits being uploaded to a third-party.
   *
@@ -19,6 +19,7 @@ import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
 import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;

 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
@@ -26,7 +27,10 @@ import google.registry.keyring.api.KeySerializer;
 import google.registry.keyring.api.Keyring;
 import google.registry.keyring.api.KeyringException;
 import google.registry.model.server.KmsSecret;
+import google.registry.model.server.KmsSecretRevision;
+import google.registry.model.server.KmsSecretRevisionSqlDao;
 import java.io.IOException;
+import java.util.Optional;
 import javax.inject.Inject;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPKeyPair;
@@ -68,7 +72,6 @@ public class KmsKeyring implements Keyring {

  /** Key labels for string secrets. */
  enum StringKeyLabel {
-    CLOUD_SQL_PASSWORD_STRING,
    SAFE_BROWSING_API_KEY,
    ICANN_REPORTING_PASSWORD_STRING,
    JSON_CREDENTIAL_STRING,
@@ -76,8 +79,7 @@ public class KmsKeyring implements Keyring {
    MARKSDB_LORDN_PASSWORD_STRING,
    MARKSDB_SMDRL_LOGIN_STRING,
    RDE_SSH_CLIENT_PRIVATE_STRING,
-    RDE_SSH_CLIENT_PUBLIC_STRING,
-    TOOLS_CLOUD_SQL_PASSWORD_STRING;
+    RDE_SSH_CLIENT_PUBLIC_STRING;

    String getLabel() {
      return UPPER_UNDERSCORE.to(LOWER_HYPHEN, name());
@@ -91,16 +93,6 @@ public class KmsKeyring implements Keyring {
    this.kmsConnection = kmsConnection;
  }

-  @Override
-  public String getCloudSqlPassword() {
-    return getString(StringKeyLabel.CLOUD_SQL_PASSWORD_STRING);
-  }
-
-  @Override
-  public String getToolsCloudSqlPassword() {
-    return getString(StringKeyLabel.TOOLS_CLOUD_SQL_PASSWORD_STRING);
-  }
-
  @Override
  public PGPKeyPair getRdeSigningKey() {
    return getKeyPair(PrivateKeyLabel.RDE_SIGNING_PRIVATE);
@@ -201,13 +193,21 @@ public class KmsKeyring implements Keyring {
  }

  private byte[] getDecryptedData(String keyName) {
-    KmsSecret secret =
-        ofy().load().key(Key.create(getCrossTldKey(), KmsSecret.class, keyName)).now();
-    checkState(secret != null, "Requested secret '%s' does not exist.", keyName);
-    String encryptedData = ofy().load().key(secret.getLatestRevision()).now().getEncryptedValue();
+    String encryptedData;
+    if (tm().isOfy()) {
+      KmsSecret secret =
+          ofy().load().key(Key.create(getCrossTldKey(), KmsSecret.class, keyName)).now();
+      checkState(secret != null, "Requested secret '%s' does not exist.", keyName);
+      encryptedData = ofy().load().key(secret.getLatestRevision()).now().getEncryptedValue();
+    } else {
+      Optional<KmsSecretRevision> revision =
+          tm().transact(() -> KmsSecretRevisionSqlDao.getLatestRevision(keyName));
+      checkState(revision.isPresent(), "Requested secret '%s' does not exist.", keyName);
+      encryptedData = revision.get().getEncryptedValue();
+    }

    try {
-      return kmsConnection.decrypt(secret.getName(), encryptedData);
+      return kmsConnection.decrypt(keyName, encryptedData);
    } catch (Exception e) {
      throw new KeyringException(
          String.format("CloudKMS decrypt operation failed for secret %s", keyName), e);
@@ -24,7 +24,6 @@ import static google.registry.keyring.kms.KmsKeyring.PublicKeyLabel.BRDA_SIGNING
 import static google.registry.keyring.kms.KmsKeyring.PublicKeyLabel.RDE_RECEIVER_PUBLIC;
 import static google.registry.keyring.kms.KmsKeyring.PublicKeyLabel.RDE_SIGNING_PUBLIC;
 import static google.registry.keyring.kms.KmsKeyring.PublicKeyLabel.RDE_STAGING_PUBLIC;
-import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.CLOUD_SQL_PASSWORD_STRING;
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.ICANN_REPORTING_PASSWORD_STRING;
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.JSON_CREDENTIAL_STRING;
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.MARKSDB_DNL_LOGIN_STRING;
@@ -33,8 +32,6 @@ import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.MARKSDB_SMDR
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.RDE_SSH_CLIENT_PRIVATE_STRING;
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.RDE_SSH_CLIENT_PUBLIC_STRING;
 import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.SAFE_BROWSING_API_KEY;
-import static google.registry.keyring.kms.KmsKeyring.StringKeyLabel.TOOLS_CLOUD_SQL_PASSWORD_STRING;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;

@@ -72,10 +69,6 @@ public final class KmsUpdater {
    this.secretValues = new LinkedHashMap<>();
  }

-  public KmsUpdater setCloudSqlPassword(String password) {
-    return setString(password, CLOUD_SQL_PASSWORD_STRING);
-  }
-
  public KmsUpdater setRdeSigningKey(PGPKeyPair keyPair) throws IOException, PGPException {
    return setKeyPair(keyPair, RDE_SIGNING_PRIVATE, RDE_SIGNING_PUBLIC);
  }
@@ -108,10 +101,6 @@ public final class KmsUpdater {
    return setString(apiKey, SAFE_BROWSING_API_KEY);
  }

-  public KmsUpdater setToolsCloudSqlPassword(String password) {
-    return setString(password, TOOLS_CLOUD_SQL_PASSWORD_STRING);
-  }
-
  public KmsUpdater setIcannReportingPassword(String password) {
    return setString(password, ICANN_REPORTING_PASSWORD_STRING);
  }
@@ -194,8 +183,7 @@ public final class KmsUpdater {
   */
  private static void persistEncryptedValues(
      final ImmutableMap<String, EncryptResponse> encryptedValues) {
-    tm()
-        .transact(
+    tm().transact(
            () -> {
              for (Map.Entry<String, EncryptResponse> entry : encryptedValues.entrySet()) {
                String secretName = entry.getKey();
@@ -207,7 +195,7 @@ public final class KmsUpdater {
                        .setKmsCryptoKeyVersionName(revisionData.cryptoKeyVersionName())
                        .setParent(secretName)
                        .build();
-                ofy().save().entities(secretRevision, KmsSecret.create(secretName, secretRevision));
+                tm().putAll(secretRevision, KmsSecret.create(secretName, secretRevision));
              }
            });
  }
@@ -58,16 +58,16 @@ class CommitLogManifestReader

  @Override
  public QueryResultIterator<Key<CommitLogManifest>> getQueryIterator(@Nullable Cursor cursor) {
-    return startQueryAt(query(), cursor).keys().iterator();
+    return startQueryAt(createBucketQuery(), cursor).keys().iterator();
  }

  @Override
  public int getTotal() {
-    return query().count();
+    return createBucketQuery().count();
  }

  /** Query for children of this bucket. */
-  Query<CommitLogManifest> query() {
+  Query<CommitLogManifest> createBucketQuery() {
    Query<CommitLogManifest> query = ofy().load().type(CommitLogManifest.class).ancestor(bucketKey);
    if (olderThan != null) {
      query = query.filterKey(
@@ -16,6 +16,8 @@ package google.registry.model;

 import javax.persistence.Access;
 import javax.persistence.AccessType;
+import javax.persistence.AttributeOverride;
+import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.xml.bind.annotation.XmlTransient;

@@ -40,6 +42,7 @@ public abstract class BackupGroupRoot extends ImmutableObject {
  // Prevents subclasses from unexpectedly accessing as property (e.g., HostResource), which would
  // require an unnecessary non-private setter method.
  @Access(AccessType.FIELD)
+  @AttributeOverride(name = "lastUpdateTime", column = @Column(name = "updateTimestamp"))
  UpdateAutoTimestamp updateTimestamp = UpdateAutoTimestamp.create(null);

  /** Get the {@link UpdateAutoTimestamp} for this entity. */
@@ -14,6 +14,8 @@

 package google.registry.model;

+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryEnvironment;
 import google.registry.model.common.DatabaseTransitionSchedule;
@@ -44,5 +46,10 @@ public class DatabaseMigrationUtils {
        .orElse(PrimaryDatabase.DATASTORE);
  }

+  public static boolean isDatastore(TransitionId transitionId) {
+    return tm().transactNew(() -> DatabaseMigrationUtils.getPrimaryDatabase(transitionId))
+        .equals(PrimaryDatabase.DATASTORE);
+  }
+
  private DatabaseMigrationUtils() {}
 }
@@ -194,30 +194,6 @@ public final class EppResourceUtils {
    return ForeignKeyIndex.load(clazz, uniqueIds, now).keySet();
  }

-  /**
-   * Loads resources that match some filter and that have {@link EppResource#deletionTime} that is
-   * not before "now".
-   *
-   * <p>This is an eventually consistent query.
-   *
-   * @param clazz the resource type to load
-   * @param now the logical time of the check
-   * @param filterDefinition the filter to apply when loading resources
-   * @param filterValue the acceptable value for the filter
-   */
-  public static <T extends EppResource> Iterable<T> queryNotDeleted(
-      Class<T> clazz, DateTime now, String filterDefinition, Object filterValue) {
-    return ofy()
-        .load()
-        .type(clazz)
-        .filter(filterDefinition, filterValue)
-        .filter("deletionTime >", now.toDate())
-        .list()
-        .stream()
-        .map(EppResourceUtils.transformAtTime(now))
-        .collect(toImmutableSet());
-  }
-
  /**
   * Returns a Function that transforms an EppResource to the given DateTime, suitable for use with
   * Iterables.transform() over a collection of EppResources.
@@ -418,8 +394,7 @@ public final class EppResourceUtils {
                if (isContactKey) {
                  query =
                      jpaTm()
-                          .getEntityManager()
-                          .createQuery(CONTACT_LINKED_DOMAIN_QUERY, String.class)
+                          .query(CONTACT_LINKED_DOMAIN_QUERY, String.class)
                          .setParameter("fkRepoId", key)
                          .setParameter("now", now);
                } else {
@@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY;
 import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -41,10 +40,10 @@ import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.registry.label.PremiumList;
 import google.registry.model.registry.label.PremiumListDualDao;
+import google.registry.persistence.VKey;
 import google.registry.util.CidrAddressBlock;
 import java.util.Collection;
 import java.util.Optional;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import org.joda.money.CurrencyUnit;
@@ -225,15 +224,14 @@ public final class OteAccountBuilder {
  }

  /**
-   * Persists all the OT&amp;E entities to datastore.
+   * Persists all the OT&amp;E entities to the database.
   *
   * @return map from the new clientIds created to the new TLDs they have access to. Can be used to
   *     go over all the newly created Registrars / Registries / RegistrarContacts if any
   *     post-creation work is needed.
   */
  public ImmutableMap<String, String> buildAndPersist() {
-    // save all the entitiesl in a single transaction
-    tm().transact(this::saveAllEntities);
+    saveAllEntities();
    return clientIdToTld;
  }

@@ -246,30 +244,38 @@ public final class OteAccountBuilder {

  /** Saves all the OT&amp;E entities we created. */
  private void saveAllEntities() {
-    tm().assertInTransaction();
-
    // use ImmutableObject instead of Registry so that the Key generation doesn't break
-    ImmutableList<ImmutableObject> registries = ImmutableList.of(sunriseTld, gaTld, eapTld);
+    ImmutableList<Registry> registries = ImmutableList.of(sunriseTld, gaTld, eapTld);
    ImmutableList<RegistrarContact> contacts = contactsBuilder.build();

-    if (!replaceExisting) {
-      ImmutableList<Key<ImmutableObject>> keys =
-          Streams.concat(registries.stream(), registrars.stream(), contacts.stream())
-              .map(Key::create)
-              .collect(toImmutableList());
-      Set<Key<ImmutableObject>> existingKeys = ofy().load().keys(keys).keySet();
-      checkState(
-          existingKeys.isEmpty(),
-          "Found existing object(s) conflicting with OT&E objects: %s",
-          existingKeys);
-    }
-    // Save the Registries (TLDs) first
-    ofy().save().entities(registries).now();
-    // Now we can set the allowedTlds for the registrars
-    registrars = registrars.stream().map(this::addAllowedTld).collect(toImmutableList());
-    // and we can save the registrars and contacts!
-    ofy().save().entities(registrars);
-    ofy().save().entities(contacts);
+    tm().transact(
+            () -> {
+              if (!replaceExisting) {
+                ImmutableList<VKey<? extends ImmutableObject>> keys =
+                    Streams.concat(
+                            registries.stream()
+                                .map(registry -> Registry.createVKey(registry.getTldStr())),
+                            registrars.stream().map(Registrar::createVKey),
+                            contacts.stream().map(RegistrarContact::createVKey))
+                        .collect(toImmutableList());
+                ImmutableMap<VKey<? extends ImmutableObject>, ImmutableObject> existingObjects =
+                    tm().loadByKeysIfPresent(keys);
+                checkState(
+                    existingObjects.isEmpty(),
+                    "Found existing object(s) conflicting with OT&E objects: %s",
+                    existingObjects.keySet());
+              }
+              // Save the Registries (TLDs) first
+              tm().putAll(registries);
+            });
+    // Now we can set the allowedTlds for the registrars in a new transaction
+    tm().transact(
+            () -> {
+              registrars = registrars.stream().map(this::addAllowedTld).collect(toImmutableList());
+              // and we can save the registrars and contacts!
+              tm().putAll(registrars);
+              tm().putAll(contacts);
+            });
  }

  private Registrar addAllowedTld(Registrar registrar) {
--- a/Show More
+++ b/Show More