Set payload response in happy path of ReplayCommitLogsToSqlAction (#1229)

* Set payload response in happy path of ReplayCommitLogsToSqlAction

I suspect this may be the reason the logs are missing on the happy path (when it
runs successfully), but are visible on the exception paths (which do set the
payload response). I don't think App Engine likes it when a Web request
terminates without a response.

This also adds more logging and error handling.

.gcloudignore

@@ -1,4 +1,5 @@
 python/
+node_modules/
 **/build/
 **/out/
 .*/

.gitignore

@@ -4,6 +4,7 @@
 ######################################################################
 # Java Ignores
 
+gjf.out
 *.class
 
 # Mobile Tools for Java (J2ME)

build.gradle

@@ -24,7 +24,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.0.1'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.4.1'
     classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6.1'
     classpath 'org.sonatype.aether:aether-api:1.13.1'
     classpath 'org.sonatype.aether:aether-impl:1.13.1'
@@ -318,7 +318,7 @@ subprojects {
   // expose to users.
   if (project.name != 'docs') {
     javadocSource << project.sourceSets.main.allJava
-    javadocClasspath << project.sourceSets.main.compileClasspath
+    javadocClasspath << project.sourceSets.main.runtimeClasspath
     javadocClasspath << "${buildDir}/generated/sources/annotationProcessor/java/main"
     javadocDependentTasks << project.tasks.compileJava
   }
@@ -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"
@@ -453,6 +457,8 @@ task javaIncrementalFormatApply {
 task javadoc(type: Javadoc) {
   source javadocSource
   classpath = files(javadocClasspath)
+  // Exclude the misbehaving generated-by-Soy Java files
+  exclude "**/*SoyInfo.java"
   destinationDir = file("${buildDir}/docs/javadoc")
   options.encoding = "UTF-8"
   // In a lot of places we don't write @return so suppress warnings about that.

buildSrc/build.gradle

@@ -72,6 +72,7 @@ dependencies {
   compile deps['com.google.auth:google-auth-library-credentials']
   compile deps['com.google.auth:google-auth-library-oauth2-http']
   compile deps['com.google.auto.value:auto-value-annotations']
+  compile deps['com.google.common.html.types:types']
   compile deps['com.google.cloud:google-cloud-core']
   compile deps['com.google.cloud:google-cloud-storage']
   compile deps['com.google.guava:guava']

buildSrc/gradle/dependency-locks/compile.lockfile

@@ -3,58 +3,61 @@
 # 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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.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
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/compileClasspath.lockfile

@@ -3,58 +3,61 @@
 # 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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.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
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/deploy_jar.lockfile

@@ -3,58 +3,61 @@
 # 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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.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
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/runtime.lockfile

@@ -3,58 +3,61 @@
 # 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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.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
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -3,58 +3,61 @@
 # 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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 commons-codec:commons-codec:1.11
 commons-logging:commons-logging:1.2
-io.grpc:grpc-context:1.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
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/testCompile.lockfile

@@ -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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.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.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+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
@@ -69,9 +70,9 @@ org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.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.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+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
@@ -69,9 +70,9 @@ org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/testRuntime.lockfile

@@ -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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.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.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+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
@@ -69,9 +70,9 @@ org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0

buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -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.common.html.types:types:1.0.4
-com.google.errorprone:error_prone_annotations:2.3.4
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.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.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+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
@@ -69,9 +70,9 @@ org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.7.7
 org.objenesis:objenesis:3.1
 org.opentest4j:opentest4j:1.2.0
-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-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0

buildSrc/src/main/java/google/registry/gradle/plugin/CoverPageGenerator.java

@@ -23,6 +23,7 @@ import static google.registry.gradle.plugin.GcsPluginUtils.toByteArraySupplier;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.html.types.TrustedResourceUrls;
 import com.google.template.soy.SoyFileSet;
 import com.google.template.soy.tofu.SoyTofu;
 import google.registry.gradle.plugin.ProjectData.TaskData;
@@ -118,7 +119,7 @@ final class CoverPageGenerator {
 
     builder.put("projectState", state.toString());
     builder.put("title", title);
-    builder.put("cssFiles", ImmutableSet.of("css/style.css"));
+    builder.put("cssFiles", ImmutableSet.of(TrustedResourceUrls.fromConstant("css/style.css")));
     builder.put("invocation", getInvocation());
     builder.put("tasksByState", getTasksByStateSoyData());
     return builder.build();

buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java

@@ -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();

buildSrc/src/main/resources/google/registry/gradle/plugin/soy/coverpage.soy

@@ -16,7 +16,7 @@
 
 {template .coverPage}
   {@param title: string}
-  {@param cssFiles: list<string>}
+  {@param cssFiles: list<trusted_resource_uri>}
   {@param projectState: string}
   {@param invocation: string}
   {@param tasksByState: map<string, list<[uniqueName: string, description: string, log: string, reports: map<string, string>]>>}

common/gradle/dependency-locks/testCompile.lockfile

@@ -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

common/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -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

common/gradle/dependency-locks/testRuntime.lockfile

@@ -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

common/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -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

common/gradle/dependency-locks/testingCompile.lockfile

@@ -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

common/gradle/dependency-locks/testingCompileClasspath.lockfile

@@ -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

common/gradle/dependency-locks/testingRuntime.lockfile

@@ -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

common/gradle/dependency-locks/testingRuntimeClasspath.lockfile

@@ -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

common/src/testing/java/google/registry/testing/FakeClock.java

@@ -22,6 +22,7 @@ import google.registry.util.Clock;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.concurrent.ThreadSafe;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;
 import org.joda.time.ReadableDuration;
 import org.joda.time.ReadableInstant;
 
@@ -35,6 +36,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 +51,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. */
@@ -65,4 +82,14 @@ public final class FakeClock implements Clock {
   public void setTo(ReadableInstant time) {
     currentTimeMillis.set(time.getMillis());
   }
+
+  /** Invokes {@link #setAutoIncrementStep} with one millisecond-step. */
+  public FakeClock setAutoIncrementByOneMilli() {
+    return setAutoIncrementStep(Duration.millis(1));
+  }
+
+  /** Disables the auto-increment mode. */
+  public FakeClock disableAutoIncrement() {
+    return setAutoIncrementStep(Duration.ZERO);
+  }
 }

common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java

@@ -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()));

config/dependency-license/allowed_licenses.json

@@ -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"
     },
     {

config/nom_build.py

@@ -256,6 +256,7 @@ GRADLE_FLAGS = [
                'Specify a task to be excluded from execution.',
                True),
 ]
+
 def generate_gradle_properties() -> str:
     """Returns the expected contents of gradle.properties."""
     out = io.StringIO()
@@ -270,7 +271,7 @@ def generate_gradle_properties() -> str:
 def get_root() -> str:
     """Returns the root of the nomulus build tree."""
     cur_dir = os.getcwd()
-    if not os.path.exists(os.path.join(cur_dir, '.git')) or \
+    if not os.path.exists(os.path.join(cur_dir, 'buildSrc')) or \
        not os.path.exists(os.path.join(cur_dir, 'core')) or \
        not os.path.exists(os.path.join(cur_dir, 'gradle.properties')):
         raise Exception('You must run this script from the root directory')

config/presubmits.py

@@ -81,7 +81,7 @@ PRESUBMITS = {
             ".git", "/build/", "/generated/", "/generated_tests/",
             "node_modules/", "JUnitBackports.java", "registrar_bin.",
             "registrar_dbg.", "google-java-format-diff.py",
-            "nomulus.golden.sql", "soyutils_usegoog.js"
+            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js"
         }, REQUIRED):
         "File did not include the license header.",
 
@@ -196,21 +196,26 @@ 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",
         # ActivityReportingQueryBuilder deals with Dremel queries
         {"src/test", "ActivityReportingQueryBuilder.java",
+         # This class contains helper method to make queries in Beam.
+         "RegistryJpaIO.java",
          # TODO(b/179158393): Remove everything below, which should be done
          # using Criteria
          "ForeignKeyIndex.java",
          "HistoryEntryDao.java",
+         "JpaTransactionManager.java",
          "JpaTransactionManagerImpl.java",
          # CriteriaQueryBuilder is a false positive
          "CriteriaQueryBuilder.java",
          "RdapDomainSearchAction.java",
+         "RdapNameserverSearchAction.java",
          "RdapSearchActionBase.java",
+         "RegistryQuery",
          },
     ):
         "The first String parameter to EntityManager.create(Native)Query "

core/build.gradle

@@ -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 {
@@ -79,6 +79,9 @@ def fragileTestPatterns = [
     // Changes cache timeouts and for some reason appears to have contention
     // with other tests.
     "google/registry/whois/WhoisCommandFactoryTest.*",
+    // Currently changes a global configuration parameter that for some reason
+    // results in timestamp inversions for other tests.  TODO(mmuller): fix.
+    "google/registry/flows/host/HostInfoFlowTest.*",
 ] + dockerIncompatibleTestPatterns
 
 sourceSets {
@@ -317,6 +320,7 @@ dependencies {
   testCompile deps['com.google.monitoring-client:contrib']
   testCompile deps['com.google.truth:truth']
   testCompile deps['com.google.truth.extensions:truth-java8-extension']
+  testCompile deps['org.checkerframework:checker-qual']
   testCompile deps['org.hamcrest:hamcrest']
   testCompile deps['org.hamcrest:hamcrest-core']
   testCompile deps['org.hamcrest:hamcrest-library']
@@ -423,7 +427,7 @@ task jaxbToJava {
       }
     }
     execInBash(
-        'find . -name *.java -exec sed -i /\\*\\ \\<p\\>\\$/d {} +',
+        "find . -name *.java -exec sed -i -e '/" + /\* <p>$/ + "/d' {} +",
         generatedDir)
   }
 }
@@ -432,12 +436,9 @@ task soyToJava {
   // Relative paths of soy directories.
   def spec11SoyDir = "google/registry/reporting/spec11/soy"
   def toolsSoyDir = "google/registry/tools/soy"
-  def uiSoyDir = "google/registry/ui/soy"
   def registrarSoyDir = "google/registry/ui/soy/registrar"
 
-  def soyRelativeDirs = [
-          spec11SoyDir, toolsSoyDir, uiSoyDir, registrarSoyDir,
-  ]
+  def soyRelativeDirs = [spec11SoyDir, toolsSoyDir, registrarSoyDir]
   soyRelativeDirs.each {
     inputs.dir "${resourcesSourceDir}/${it}"
     outputs.dir "${generatedDir}/${it}"
@@ -451,7 +452,8 @@ task soyToJava {
               "--outputDirectory", "${outputDirectory}",
               "--javaClassNameSource", "filename",
               "--allowExternalCalls", "true",
-              "--srcs", "${soyFiles.join(',')}"
+              "--srcs", "${soyFiles.join(',')}",
+              "--compileTimeGlobalsFile", "${resourcesSourceDir}/google/registry/ui/globals.txt"
     }
   }
 
@@ -468,14 +470,6 @@ task soyToJava {
                     dir: "${resourcesSourceDir}/${registrarSoyDir}",
                     include: ['**/*.soy']))
 
-    soyToJava('google.registry.ui.soy',
-            "${generatedDir}/${uiSoyDir}",
-            files {
-              file("${resourcesSourceDir}/${uiSoyDir}").listFiles()
-            }.filter {
-              it.name.endsWith(".soy")
-            })
-
     soyToJava('google.registry.reporting.spec11.soy',
             "${generatedDir}/${spec11SoyDir}",
             fileTree(
@@ -484,42 +478,24 @@ task soyToJava {
   }
 }
 
-task soyToJS {
-  def rootSoyDirectory = "${resourcesSourceDir}/google/registry/ui/soy"
-  def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy"
+task soyToJS(type: JavaExec) {
+  def rootSoyDirectory = "${resourcesSourceDir}/google/registry/ui/soy/registrar"
+  def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy/registrar"
   inputs.dir rootSoyDirectory
   outputs.dir outputSoyDirectory
 
-  ext.soyToJS = { outputDirectory, soyFiles , deps->
-    javaexec {
-      main = "com.google.template.soy.SoyToJsSrcCompiler"
-      classpath configurations.soy
+  def inputSoyFiles = files {
+    file("${rootSoyDirectory}").listFiles()
+  }.filter {
+    it.name.endsWith(".soy")
+  }
 
-      args "--outputPathFormat", "${outputDirectory}/{INPUT_FILE_NAME}.js",
+  classpath configurations.soy
+  main = "com.google.template.soy.SoyToJsSrcCompiler"
+  args "--outputPathFormat", "${outputSoyDirectory}/{INPUT_FILE_NAME}.js",
           "--allowExternalCalls", "false",
-          "--srcs", "${soyFiles.join(',')}",
-          "--shouldProvideRequireSoyNamespaces", "true",
+          "--srcs", "${inputSoyFiles.join(',')}",
           "--compileTimeGlobalsFile", "${resourcesSourceDir}/google/registry/ui/globals.txt"
-      if (deps != "") {
-        args "--deps", "${deps.join(',')}"
-      }
-    }
-  }
-
-  doLast {
-    def rootSoyFiles =
-      fileTree(
-        dir: "${rootSoyDirectory}",
-        include: ['*.soy'])
-
-    soyToJS("${outputSoyDirectory}", rootSoyFiles, "")
-    soyToJS("${outputSoyDirectory}/registrar",
-      files {
-        file("${rootSoyDirectory}/registrar").listFiles()
-      }.filter {
-        it.name.endsWith(".soy")
-      }, rootSoyFiles)
-  }
 }
 
 task stylesheetsToJavascript {
@@ -602,8 +578,8 @@ task compileProdJS(type: JavaExec) {
   closureArgs << "--generate_exports"
 
   // manually include all the required js files
-  closureArgs << "--js=${nodeModulesDir}/google-closure-library/**.js"
-  closureArgs << "--js=${jsDir}/soyutils_usegoog.js"
+  closureArgs << "--js=${nodeModulesDir}/google-closure-library/**/*.js"
+  closureArgs << "--js=${jsDir}/*.js"
   closureArgs << "--js=${cssSourceDir}/registrar_bin.css.js"
   closureArgs << "--js=${jsSourceDir}/**.js"
   closureArgs << "--js=${externsDir}/json.js"
@@ -630,15 +606,6 @@ compileProdJS.dependsOn processResources
 compileProdJS.dependsOn processTestResources
 compileProdJS.dependsOn soyToJS
 
-task karmaTest(type: Exec) {
-  dependsOn ':npmInstall'
-  workingDir rootProject.projectDir
-  executable 'node_modules/karma/bin/karma'
-  args('start', "${project.projectDir}/karma.conf.js")
-}
-
-test.dependsOn karmaTest
-
 // Make testing artifacts available to be depended up on by other projects.
 // TODO: factor out google.registry.testing to be a separate project.
 task testJar(type: Jar) {
@@ -751,7 +718,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
@@ -782,6 +750,69 @@ 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'
+      ],
+      [
+          mainClass: 'google.registry.beam.spec11.Spec11Pipeline',
+          metaData: 'google/registry/beam/spec11_pipeline_metadata.json'
+      ],
+      [
+          mainClass: 'google.registry.beam.invoicing.InvoicingPipeline',
+          metaData: 'google/registry/beam/invoicing_pipeline_metadata.json'
+      ],
+      [
+          mainClass: 'google.registry.beam.rde.RdePipeline',
+          metaData: 'google/registry/beam/rde_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

core/gradle/dependency-locks/annotationProcessor.lockfile

@@ -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

core/gradle/dependency-locks/closureCompiler.lockfile

@@ -1,15 +1,4 @@
 # 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.
-args4j:args4j:2.0.26
-com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.7
-com.google.errorprone:error_prone_annotations:2.3.1
-com.google.guava:guava:25.1-jre
-com.google.j2objc:j2objc-annotations:1.1
-com.google.javascript:closure-compiler-externs:v20190301
-com.google.javascript:closure-compiler:v20190301
-com.google.jsinterop:jsinterop-annotations:1.0.0
-com.google.protobuf:protobuf-java:3.0.2
-org.checkerframework:checker-qual:2.0.0
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+com.google.javascript:closure-compiler:v20210505

core/gradle/dependency-locks/compile.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +147,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 +172,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 +195,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 +224,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,24 +244,22 @@ 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
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/compileClasspath.lockfile

@@ -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,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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
+com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j: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 +145,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 +168,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 +189,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,24 +237,22 @@ 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
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/default.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +152,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 +180,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 +204,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 +235,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 +255,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
@@ -266,12 +268,12 @@ org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/deploy_jar.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +152,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 +180,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 +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
@@ -230,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
@@ -250,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
@@ -265,12 +267,12 @@ org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/jaxb.lockfile

@@ -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

core/gradle/dependency-locks/nonprodCompile.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +147,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 +172,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 +195,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 +224,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,24 +244,22 @@ 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
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/nonprodCompileClasspath.lockfile

@@ -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,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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
+com.google.template:soy:2021-02-01
 com.googlecode.charts4j:charts4j:1.3
 com.googlecode.json-simple:json-simple:1.1.1
-com.ibm.icu:icu4j: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 +145,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 +168,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 +190,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,24 +238,22 @@ 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
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/nonprodRuntime.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +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
@@ -176,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 +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
@@ -230,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
@@ -250,26 +254,24 @@ 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
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +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
@@ -176,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 +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
@@ -230,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
@@ -250,26 +254,24 @@ 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
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/runtime.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +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
@@ -176,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 +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
@@ -230,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
@@ -250,26 +254,24 @@ 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
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -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,45 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
 com.google.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.template:soy:2018-03-14
+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:2021-02-01
 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 +152,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 +180,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 +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
@@ -230,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
@@ -250,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
@@ -265,12 +267,12 @@ org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/soy.lockfile

@@ -5,25 +5,25 @@ aopalliance:aopalliance:1.0
 args4j:args4j:2.0.23
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.7
-com.google.common.html.types:types:1.0.4
+com.google.common.html.types:types:1.0.6
 com.google.errorprone:error_prone_annotations:2.3.4
+com.google.escapevelocity:escapevelocity:0.9.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.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:5.0.1
 com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
 com.google.protobuf:protobuf-java:3.13.0
-com.google.template:soy:2018-03-14
+com.google.template:soy:2021-02-01
 com.ibm.icu:icu4j:57.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
-javax.validation:validation-api:1.0.0.GA
 org.checkerframework:checker-qual:3.5.0
 org.json:json:20160212
-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.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0

core/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -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

core/gradle/dependency-locks/testCompile.lockfile

@@ -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,14 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
@@ -116,33 +117,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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+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:2021-02-01
+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 +155,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 +180,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 +204,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 +229,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 +241,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 +282,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
@@ -298,14 +301,14 @@ org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:junit-jupiter:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:selenium:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:selenium:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -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,48 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+com.google.protobuf:protobuf-java:3.15.2
+com.google.re2j:re2j:1.6
+com.google.template:soy:2021-02-01
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
 com.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 +153,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 +176,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 +199,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 +224,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 +236,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 +276,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
@@ -292,14 +295,14 @@ org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:junit-jupiter:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:selenium:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:selenium:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/testRuntime.lockfile

@@ -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,14 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
@@ -121,33 +122,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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+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:2021-02-01
+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 +160,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 +189,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 +214,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 +239,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 +252,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 +293,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
@@ -312,14 +314,14 @@ org.seleniumhq.selenium:selenium-support:3.141.59
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:junit-jupiter:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:selenium:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:selenium:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -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,14 @@ 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.common.html.types:types:1.0.6
+com.google.dagger:dagger:2.33
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
 com.google.flogger:flogger-system-backend:0.5.1
 com.google.flogger:flogger:0.5.1
 com.google.flogger:google-extensions:0.5.1
@@ -121,33 +122,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.template:soy:2018-03-14
-com.google.truth.extensions:truth-java8-extension:1.0
-com.google.truth:truth:1.0
+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:2021-02-01
+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 +160,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 +189,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 +214,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 +239,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 +252,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 +293,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
@@ -313,14 +315,14 @@ org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.15.1
-org.testcontainers:jdbc:1.15.1
-org.testcontainers:junit-jupiter:1.15.1
-org.testcontainers:postgresql:1.15.1
-org.testcontainers:selenium:1.15.1
-org.testcontainers:testcontainers:1.15.1
+org.testcontainers:database-commons:1.15.2
+org.testcontainers:jdbc:1.15.2
+org.testcontainers:junit-jupiter:1.15.2
+org.testcontainers:postgresql:1.15.2
+org.testcontainers:selenium:1.15.2
+org.testcontainers:testcontainers:1.15.2
 org.threeten:threetenbp:1.5.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

core/karma.conf.js

@@ -1,75 +0,0 @@
-// Copyright 2019 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.
-
-process.env.CHROME_BIN = require('puppeteer').executablePath()
-
-module.exports = function(config) {
-  config.set({
-    basePath: '..',
-    browsers: ['ChromeHeadlessNoSandbox'],
-    customLaunchers: {
-      ChromeHeadlessNoSandbox: {
-        base: 'ChromeHeadless',
-        flags: ['--no-sandbox']
-      }
-    },
-    frameworks: ['jasmine', 'closure'],
-    singleRun: true,
-    autoWatch: false,
-    files: [
-      'node_modules/google-closure-library/closure/goog/base.js',
-      'core/src/test/javascript/**/*_test.js',
-      {
-        pattern: 'core/src/test/javascript/**/!(*_test).js',
-        included: false
-      },
-      {
-        pattern: 'core/src/main/javascript/**/*.js',
-        included: false
-      },
-      {
-        pattern: 'core/build/generated/sources/custom/java/main/**/*.soy.js',
-        included: false
-      },
-      {
-        pattern: 'node_modules/google-closure-library/closure/goog/deps.js',
-        included: false,
-        served: false
-      },
-      {
-        pattern: 'node_modules/google-closure-library/closure/goog/**/*.js',
-        included: false
-      },
-      {
-        pattern: 'core/build/resources/main/google/registry/ui/assets/images/*.png',
-        included: false
-      },
-      {
-        pattern: 'core/build/resources/main/google/registry/ui/assets/images/icons/svg/*.svg',
-        included: false
-      }
-    ],
-    preprocessors: {
-      'node_modules/google-closure-library/closure/goog/deps.js': ['closure', 'closure-deps'],
-      'node_modules/google-closure-library/closure/goog/base.js': ['closure'],
-      'node_modules/google-closure-library/closure/**/*.js': ['closure'],
-      'core/src/*/javascript/**/*.js': ['closure'],
-      'core/build/generated/sources/custom/java/main/**/*.soy.js': ['closure'],
-    },
-    proxies: {
-      "/assets/": "/base/core/build/resources/main/google/registry/ui/assets/"
-    }
-  });
-};
-

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

@@ -14,7 +14,7 @@
 
 package google.registry.backup;
 
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 
 import com.google.appengine.api.datastore.EntityTranslator;
 import com.google.common.collect.AbstractIterator;
@@ -45,7 +45,7 @@ public class BackupUtils {
    * {@link OutputStream} in delimited protocol buffer format.
    */
   static void serializeEntity(ImmutableObject entity, OutputStream stream) throws IOException {
-    EntityTranslator.convertToPb(ofy().save().toEntity(entity)).writeDelimitedTo(stream);
+    EntityTranslator.convertToPb(auditedOfy().save().toEntity(entity)).writeDelimitedTo(stream);
   }
 
   /**
@@ -56,19 +56,25 @@ public class BackupUtils {
    *
    * <p>The iterator reads from the stream on demand, and as such will fail if the stream is closed.
    */
-  public static Iterator<ImmutableObject> createDeserializingIterator(final InputStream input) {
+  public static Iterator<ImmutableObject> createDeserializingIterator(
+      final InputStream input, boolean withAppIdOverride) {
     return new AbstractIterator<ImmutableObject>() {
       @Override
       protected ImmutableObject computeNext() {
         EntityProto proto = new EntityProto();
-        if (proto.parseDelimitedFrom(input)) {  // False means end of stream; other errors throw.
-          return ofy().load().fromEntity(EntityTranslator.createFromPb(proto));
+        if (proto.parseDelimitedFrom(input)) { // False means end of stream; other errors throw.
+          if (withAppIdOverride) {
+            proto = EntityImports.fixEntity(proto);
+          }
+          return auditedOfy().load().fromEntity(EntityTranslator.createFromPb(proto));
         }
         return endOfData();
-      }};
+      }
+    };
   }
 
   public static ImmutableList<ImmutableObject> deserializeEntities(byte[] bytes) {
-    return ImmutableList.copyOf(createDeserializingIterator(new ByteArrayInputStream(bytes)));
+    return ImmutableList.copyOf(
+        createDeserializingIterator(new ByteArrayInputStream(bytes), false));
   }
 }

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

@@ -18,7 +18,7 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
 import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
 import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 
@@ -64,8 +64,7 @@ public final class CommitLogCheckpointAction implements Runnable {
     final CommitLogCheckpoint checkpoint = strategy.computeCheckpoint();
     logger.atInfo().log(
         "Generated candidate checkpoint for time: %s", checkpoint.getCheckpointTime());
-    tm()
-        .transact(
+    tm().transact(
             () -> {
               DateTime lastWrittenTime = CommitLogCheckpointRoot.loadRoot().getLastWrittenTime();
               if (isBeforeOrAt(checkpoint.getCheckpointTime(), lastWrittenTime)) {
@@ -73,7 +72,7 @@ public final class CommitLogCheckpointAction implements Runnable {
                     "Newer checkpoint already written at time: %s", lastWrittenTime);
                 return;
               }
-              ofy()
+              auditedOfy()
                   .saveWithoutBackup()
                   .entities(
                       checkpoint, CommitLogCheckpointRoot.create(checkpoint.getCheckpointTime()));

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

@@ -59,7 +59,7 @@ public final class CommitLogImports {
       InputStream inputStream) {
     try (AppEngineEnvironment appEngineEnvironment = new AppEngineEnvironment();
         InputStream input = new BufferedInputStream(inputStream)) {
-      Iterator<ImmutableObject> commitLogs = createDeserializingIterator(input);
+      Iterator<ImmutableObject> commitLogs = createDeserializingIterator(input, false);
       checkState(commitLogs.hasNext());
       checkState(commitLogs.next() instanceof CommitLogCheckpoint);
 

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

@@ -17,7 +17,7 @@ package google.registry.backup;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -66,6 +66,8 @@ import org.joda.time.Duration;
     service = Action.Service.BACKEND,
     path = "/_dr/task/deleteOldCommitLogs",
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+// No longer needed in SQL. Subject to future removal.
+@Deprecated
 public final class DeleteOldCommitLogsAction implements Runnable {
 
   private static final int NUM_MAP_SHARDS = 20;
@@ -75,9 +77,17 @@ public final class DeleteOldCommitLogsAction implements Runnable {
   @Inject MapreduceRunner mrRunner;
   @Inject Response response;
   @Inject Clock clock;
-  @Inject @Config("commitLogDatastoreRetention") Duration maxAge;
-  @Inject @Parameter(PARAM_DRY_RUN) boolean isDryRun;
-  @Inject DeleteOldCommitLogsAction() {}
+
+  @Inject
+  @Config("commitLogDatastoreRetention")
+  Duration maxAge;
+
+  @Inject
+  @Parameter(PARAM_DRY_RUN)
+  boolean isDryRun;
+
+  @Inject
+  DeleteOldCommitLogsAction() {}
 
   @Override
   public void run() {
@@ -138,12 +148,12 @@ public final class DeleteOldCommitLogsAction implements Runnable {
       // If it isn't a Key<CommitLogManifest> then it should be an EppResource, which we need to
       // load to emit the revisions.
       //
-      Object object = ofy().load().key(key).now();
+      Object object = auditedOfy().load().key(key).now();
       checkNotNull(object, "Received a key to a missing object. key: %s", key);
       checkState(
           object instanceof EppResource,
           "Received a key to an object that isn't EppResource nor CommitLogManifest."
-          + " Key: %s object type: %s",
+              + " Key: %s object type: %s",
           key,
           object.getClass().getName());
 
@@ -224,8 +234,7 @@ public final class DeleteOldCommitLogsAction implements Runnable {
    * OK to delete this manifestKey. If even one source returns "false" (meaning "it's not OK to
    * delete this manifest") then it won't be deleted.
    */
-  static class DeleteOldCommitLogsReducer
-      extends Reducer<Key<CommitLogManifest>, Boolean, Void> {
+  static class DeleteOldCommitLogsReducer extends Reducer<Key<CommitLogManifest>, Boolean, Void> {
 
     private static final long serialVersionUID = -4918760187627937268L;
 
@@ -241,12 +250,12 @@ public final class DeleteOldCommitLogsAction implements Runnable {
       }
 
       public abstract Status status();
+
       public abstract int numDeleted();
 
       static DeletionResult create(Status status, int numDeleted) {
-        return
-            new AutoValue_DeleteOldCommitLogsAction_DeleteOldCommitLogsReducer_DeletionResult(
-                status, numDeleted);
+        return new AutoValue_DeleteOldCommitLogsAction_DeleteOldCommitLogsReducer_DeletionResult(
+            status, numDeleted);
       }
     }
 
@@ -257,8 +266,7 @@ public final class DeleteOldCommitLogsAction implements Runnable {
 
     @Override
     public void reduce(
-        final Key<CommitLogManifest> manifestKey,
-        ReducerInput<Boolean> canDeleteVerdicts) {
+        final Key<CommitLogManifest> manifestKey, ReducerInput<Boolean> canDeleteVerdicts) {
       ImmutableMultiset<Boolean> canDeleteMultiset = ImmutableMultiset.copyOf(canDeleteVerdicts);
       if (canDeleteMultiset.count(TRUE) > 1) {
         getContext().incrementCounter("commit log manifests incorrectly mapped multiple times");
@@ -267,47 +275,54 @@ public final class DeleteOldCommitLogsAction implements Runnable {
         getContext().incrementCounter("commit log manifests referenced multiple times");
       }
       if (canDeleteMultiset.contains(FALSE)) {
-        getContext().incrementCounter(
-            canDeleteMultiset.contains(TRUE)
-            ? "old commit log manifests still referenced"
-            : "new (or nonexistent) commit log manifests referenced");
-        getContext().incrementCounter(
-            "EPP resource revisions handled",
-            canDeleteMultiset.count(FALSE));
+        getContext()
+            .incrementCounter(
+                canDeleteMultiset.contains(TRUE)
+                    ? "old commit log manifests still referenced"
+                    : "new (or nonexistent) commit log manifests referenced");
+        getContext()
+            .incrementCounter("EPP resource revisions handled", canDeleteMultiset.count(FALSE));
         return;
       }
 
-      DeletionResult deletionResult = tm().transactNew(() -> {
-        CommitLogManifest manifest = ofy().load().key(manifestKey).now();
-        // It is possible that the same manifestKey was run twice, if a shard had to be restarted
-        // or some weird failure. If this happens, we want to exit immediately.
-        // Note that this can never happen in dryRun.
-        if (manifest == null) {
-          return DeletionResult.create(DeletionResult.Status.ALREADY_DELETED, 0);
-        }
-        // Doing a sanity check on the date. This is the only place we use the CommitLogManifest,
-        // so maybe removing this test will improve performance. However, unless it's proven that
-        // the performance boost is significant (and we've tested this enough to be sure it never
-        // happens)- the safty of "let's not delete stuff we need from prod" is more important.
-        if (manifest.getCommitTime().isAfter(deletionThreshold)) {
-          return DeletionResult.create(DeletionResult.Status.AFTER_THRESHOLD, 0);
-        }
-        Iterable<Key<CommitLogMutation>> commitLogMutationKeys = ofy().load()
-            .type(CommitLogMutation.class)
-            .ancestor(manifestKey)
-            .keys()
-            .iterable();
-        ImmutableList<Key<?>> keysToDelete = ImmutableList.<Key<?>>builder()
-            .addAll(commitLogMutationKeys)
-            .add(manifestKey)
-            .build();
-        // Normally in a dry run we would log the entities that would be deleted, but those can
-        // number in the millions so we skip the logging.
-        if (!isDryRun) {
-          ofy().deleteWithoutBackup().keys(keysToDelete);
-        }
-        return DeletionResult.create(DeletionResult.Status.SUCCESS, keysToDelete.size());
-      });
+      DeletionResult deletionResult =
+          tm().transactNew(
+                  () -> {
+                    CommitLogManifest manifest = auditedOfy().load().key(manifestKey).now();
+                    // It is possible that the same manifestKey was run twice, if a shard had to be
+                    // restarted or some weird failure. If this happens, we want to exit
+                    // immediately. Note that this can never happen in dryRun.
+                    if (manifest == null) {
+                      return DeletionResult.create(DeletionResult.Status.ALREADY_DELETED, 0);
+                    }
+                    // Doing a sanity check on the date. This is the only place we use the
+                    // CommitLogManifest, so maybe removing this test will improve performance.
+                    // However, unless it's proven that the performance boost is significant (and
+                    // we've tested this enough to be sure it never happens)- the safety of "let's
+                    // not delete stuff we need from prod" is more important.
+                    if (manifest.getCommitTime().isAfter(deletionThreshold)) {
+                      return DeletionResult.create(DeletionResult.Status.AFTER_THRESHOLD, 0);
+                    }
+                    Iterable<Key<CommitLogMutation>> commitLogMutationKeys =
+                        auditedOfy()
+                            .load()
+                            .type(CommitLogMutation.class)
+                            .ancestor(manifestKey)
+                            .keys()
+                            .iterable();
+                    ImmutableList<Key<?>> keysToDelete =
+                        ImmutableList.<Key<?>>builder()
+                            .addAll(commitLogMutationKeys)
+                            .add(manifestKey)
+                            .build();
+                    // Normally in a dry run we would log the entities that would be deleted, but
+                    // those can number in the millions so we skip the logging.
+                    if (!isDryRun) {
+                      auditedOfy().deleteWithoutBackup().keys(keysToDelete);
+                    }
+                    return DeletionResult.create(
+                        DeletionResult.Status.SUCCESS, keysToDelete.size());
+                  });
 
       switch (deletionResult.status()) {
         case SUCCESS:

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

@@ -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.backup;
+
+import com.google.apphosting.api.ApiProxy;
+import com.google.storage.onestore.v3.OnestoreEntity;
+import com.google.storage.onestore.v3.OnestoreEntity.EntityProto;
+import com.google.storage.onestore.v3.OnestoreEntity.Path;
+import com.google.storage.onestore.v3.OnestoreEntity.Property.Meaning;
+import com.google.storage.onestore.v3.OnestoreEntity.PropertyValue.ReferenceValue;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+/** Utilities for handling imported Datastore entities. */
+public class EntityImports {
+
+  /**
+   * Transitively sets the {@code appId} of all keys in a foreign entity to that of the current
+   * system.
+   */
+  public static EntityProto fixEntity(EntityProto entityProto) {
+    String currentAappId = ApiProxy.getCurrentEnvironment().getAppId();
+    if (Objects.equals(currentAappId, entityProto.getKey().getApp())) {
+      return entityProto;
+    }
+    return fixEntity(entityProto, currentAappId);
+  }
+
+  private static EntityProto fixEntity(EntityProto entityProto, String appId) {
+    if (entityProto.hasKey()) {
+      fixKey(entityProto, appId);
+    }
+
+    for (OnestoreEntity.Property property : entityProto.mutablePropertys()) {
+      fixProperty(property, appId);
+    }
+
+    for (OnestoreEntity.Property property : entityProto.mutableRawPropertys()) {
+      fixProperty(property, appId);
+    }
+
+    // CommitLogMutation embeds an entity as bytes, which needs additional fixes.
+    if (isCommitLogMutation(entityProto)) {
+      fixMutationEntityProtoBytes(entityProto, appId);
+    }
+    return entityProto;
+  }
+
+  private static boolean isCommitLogMutation(EntityProto entityProto) {
+    if (!entityProto.hasKey()) {
+      return false;
+    }
+    Path path = entityProto.getKey().getPath();
+    if (path.elementSize() == 0) {
+      return false;
+    }
+    return Objects.equals(
+        path.getElement(path.elementSize() - 1).getType(StandardCharsets.UTF_8),
+        "CommitLogMutation");
+  }
+
+  private static void fixMutationEntityProtoBytes(EntityProto entityProto, String appId) {
+    for (OnestoreEntity.Property property : entityProto.mutableRawPropertys()) {
+      if (Objects.equals(property.getName(), "entityProtoBytes")) {
+        OnestoreEntity.PropertyValue value = property.getValue();
+        EntityProto fixedProto =
+            fixEntity(bytesToEntityProto(value.getStringValueAsBytes()), appId);
+        value.setStringValueAsBytes(fixedProto.toByteArray());
+        return;
+      }
+    }
+  }
+
+  private static void fixKey(EntityProto entityProto, String appId) {
+    entityProto.getMutableKey().setApp(appId);
+  }
+
+  private static void fixKey(ReferenceValue referenceValue, String appId) {
+    referenceValue.setApp(appId);
+  }
+
+  private static void fixProperty(OnestoreEntity.Property property, String appId) {
+    OnestoreEntity.PropertyValue value = property.getMutableValue();
+    if (value.hasReferenceValue()) {
+      fixKey(value.getMutableReferenceValue(), appId);
+      return;
+    }
+    if (property.getMeaningEnum().equals(Meaning.ENTITY_PROTO)) {
+      EntityProto embeddedProto = bytesToEntityProto(value.getStringValueAsBytes());
+      fixEntity(embeddedProto, appId);
+      value.setStringValueAsBytes(embeddedProto.toByteArray());
+    }
+  }
+
+  private static EntityProto bytesToEntityProto(byte[] bytes) {
+    EntityProto entityProto = new EntityProto();
+    boolean isParsed = entityProto.parseFrom(bytes);
+    if (!isParsed) {
+      throw new IllegalStateException("Failed to parse raw bytes as EntityProto.");
+    }
+    return entityProto;
+  }
+}

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

@@ -25,7 +25,7 @@ import static google.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTION
 import static google.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT;
 import static google.registry.backup.BackupUtils.serializeEntity;
 import static google.registry.model.ofy.CommitLogBucket.getBucketKey;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static java.nio.channels.Channels.newOutputStream;
@@ -89,11 +89,14 @@ public final class ExportCommitLogDiffAction implements Runnable {
     checkArgument(lowerCheckpointTime.isBefore(upperCheckpointTime));
     // Load the boundary checkpoints - lower is exclusive and may not exist (on the first export,
     // when lowerCheckpointTime is START_OF_TIME), whereas the upper is inclusive and must exist.
-    CommitLogCheckpoint lowerCheckpoint = lowerCheckpointTime.isAfter(START_OF_TIME)
-        ? verifyNotNull(ofy().load().key(CommitLogCheckpoint.createKey(lowerCheckpointTime)).now())
-        : null;
+    CommitLogCheckpoint lowerCheckpoint =
+        lowerCheckpointTime.isAfter(START_OF_TIME)
+            ? verifyNotNull(
+                auditedOfy().load().key(CommitLogCheckpoint.createKey(lowerCheckpointTime)).now())
+            : null;
     CommitLogCheckpoint upperCheckpoint =
-        verifyNotNull(ofy().load().key(CommitLogCheckpoint.createKey(upperCheckpointTime)).now());
+        verifyNotNull(
+            auditedOfy().load().key(CommitLogCheckpoint.createKey(upperCheckpointTime)).now());
 
     // Load the keys of all the manifests to include in this diff.
     List<Key<CommitLogManifest>> sortedKeys = loadAllDiffKeys(lowerCheckpoint, upperCheckpoint);
@@ -117,7 +120,7 @@ public final class ExportCommitLogDiffAction implements Runnable {
       // asynchronously load the entities for the next one.
       List<List<Key<CommitLogManifest>>> keyChunks = partition(sortedKeys, batchSize);
       // Objectify's map return type is asynchronous. Calling .values() will block until it loads.
-      Map<?, CommitLogManifest> nextChunkToExport = ofy().load().keys(keyChunks.get(0));
+      Map<?, CommitLogManifest> nextChunkToExport = auditedOfy().load().keys(keyChunks.get(0));
       for (int i = 0; i < keyChunks.size(); i++) {
         // Force the async load to finish.
         Collection<CommitLogManifest> chunkValues = nextChunkToExport.values();
@@ -125,10 +128,10 @@ public final class ExportCommitLogDiffAction implements Runnable {
         // Since there is no hard bound on how much data this might be, take care not to let the
         // Objectify session cache fill up and potentially run out of memory. This is the only safe
         // point to do this since at this point there is no async load in progress.
-        ofy().clearSessionCache();
+        auditedOfy().clearSessionCache();
         // Kick off the next async load, which can happen in parallel to the current GCS export.
         if (i + 1 < keyChunks.size()) {
-          nextChunkToExport = ofy().load().keys(keyChunks.get(i + 1));
+          nextChunkToExport = auditedOfy().load().keys(keyChunks.get(i + 1));
         }
         exportChunk(gcsStream, chunkValues);
         logger.atInfo().log("Exported %d manifests", chunkValues.size());
@@ -192,7 +195,8 @@ public final class ExportCommitLogDiffAction implements Runnable {
       return ImmutableSet.of();
     }
     Key<CommitLogBucket> bucketKey = getBucketKey(bucketNum);
-    return ofy().load()
+    return auditedOfy()
+        .load()
         .type(CommitLogManifest.class)
         .ancestor(bucketKey)
         .filterKey(">=", CommitLogManifest.createKey(bucketKey, lowerBound))
@@ -208,7 +212,7 @@ public final class ExportCommitLogDiffAction implements Runnable {
         new ImmutableList.Builder<>();
     for (CommitLogManifest manifest : chunk) {
       entities.add(ImmutableList.of(manifest));
-      entities.add(ofy().load().type(CommitLogMutation.class).ancestor(manifest));
+      entities.add(auditedOfy().load().type(CommitLogMutation.class).ancestor(manifest));
     }
     for (ImmutableObject entity : concat(entities.build())) {
       serializeEntity(entity, gcsStream);

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

@@ -16,7 +16,7 @@ package google.registry.backup;
 
 import static google.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX;
 import static google.registry.model.ofy.EntityWritePriorities.getEntityPriority;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static org.joda.time.Duration.standardHours;
@@ -27,11 +27,14 @@ import com.google.appengine.tools.cloudstorage.GcsFileMetadata;
 import com.google.appengine.tools.cloudstorage.GcsService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.flogger.FluentLogger;
-import google.registry.config.RegistryConfig;
+import google.registry.model.common.DatabaseMigrationStateSchedule;
+import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState;
+import google.registry.model.common.DatabaseMigrationStateSchedule.ReplayDirection;
 import google.registry.model.server.Lock;
 import google.registry.model.translators.VKeyTranslatorFactory;
 import google.registry.persistence.VKey;
 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.schema.replay.DatastoreEntity;
@@ -39,6 +42,7 @@ 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.Clock;
 import google.registry.util.RequestStatusChecker;
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,31 +57,38 @@ import org.joda.time.Duration;
 @Action(
     service = Action.Service.BACKEND,
     path = ReplayCommitLogsToSqlAction.PATH,
-    method = Action.Method.POST,
+    method = Method.POST,
     automaticallyPrintOk = true,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
 public class ReplayCommitLogsToSqlAction implements Runnable {
 
   static final String PATH = "/_dr/task/replayCommitLogsToSql";
 
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private static final int BLOCK_SIZE =
       1024 * 1024; // Buffer 1mb at a time, for no particular reason.
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private static final Duration LEASE_LENGTH = standardHours(1);
+  // Stop / pause where we are if we've been replaying for more than five minutes to avoid GAE
+  // request timeouts
+  private static final Duration REPLAY_TIMEOUT_DURATION = Duration.standardMinutes(5);
 
   @Inject GcsService gcsService;
   @Inject Response response;
   @Inject RequestStatusChecker requestStatusChecker;
   @Inject GcsDiffFileLister diffLister;
+  @Inject Clock clock;
 
   @Inject
   ReplayCommitLogsToSqlAction() {}
 
   @Override
   public void run() {
-    if (!RegistryConfig.getCloudSqlReplayCommitLogs()) {
-      String message = "ReplayCommitLogsToSqlAction was called but disabled in the config.";
-      logger.atWarning().log(message);
+    MigrationState state = DatabaseMigrationStateSchedule.getValueAtTime(clock.nowUtc());
+    if (!state.getReplayDirection().equals(ReplayDirection.DATASTORE_TO_SQL)) {
+      String message =
+          String.format(
+              "Skipping ReplayCommitLogsToSqlAction because we are in migration phase %s.", state);
+      logger.atInfo().log(message);
       // App Engine will retry on any non-2xx status code, which we don't want in this case.
       response.setStatus(SC_NO_CONTENT);
       response.setPayload(message);
@@ -98,42 +109,67 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
     try {
       replayFiles();
       response.setStatus(HttpServletResponse.SC_OK);
-      logger.atInfo().log("ReplayCommitLogsToSqlAction completed successfully.");
+      String message = "ReplayCommitLogsToSqlAction completed successfully.";
+      response.setPayload(message);
+      logger.atInfo().log(message);
+    } catch (Throwable t) {
+      String message = "Errored out replaying files.";
+      logger.atSevere().withCause(t).log(message);
+      response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      response.setPayload(message);
     } finally {
       lock.ifPresent(Lock::release);
     }
   }
 
   private void replayFiles() {
+    DateTime replayTimeoutTime = clock.nowUtc().plus(REPLAY_TIMEOUT_DURATION);
     // Start at the first millisecond we haven't seen yet
     DateTime fromTime = jpaTm().transact(() -> SqlReplayCheckpoint.get().plusMillis(1));
     // If there's an inconsistent file set, this will throw IllegalStateException and the job
     // will try later -- this is likely because an export hasn't finished yet.
     ImmutableList<GcsFileMetadata> commitLogFiles =
         diffLister.listDiffFiles(fromTime, /* current time */ null);
+    int processedFiles = 0;
     for (GcsFileMetadata metadata : commitLogFiles) {
       // One transaction per GCS file
       jpaTm().transact(() -> processFile(metadata));
+      processedFiles++;
+      if (clock.nowUtc().isAfter(replayTimeoutTime)) {
+        logger.atInfo().log(
+            "Reached max execution time after replaying %d files, leaving %d files for next run.",
+            processedFiles, commitLogFiles.size() - processedFiles);
+        return;
+      }
     }
-    logger.atInfo().log("Replayed %d commit log files to SQL successfully.", commitLogFiles.size());
+    logger.atInfo().log("Replayed %d commit log files to SQL successfully.", processedFiles);
   }
 
   private void processFile(GcsFileMetadata metadata) {
+    logger.atInfo().log(
+        "Processing commit log file %s of size %d B.",
+        metadata.getFilename(), metadata.getLength());
     try (InputStream input =
         Channels.newInputStream(
             gcsService.openPrefetchingReadChannel(metadata.getFilename(), 0, BLOCK_SIZE))) {
       // Load and process the Datastore transactions one at a time
       ImmutableList<ImmutableList<VersionedEntity>> allTransactions =
           CommitLogImports.loadEntitiesByTransaction(input);
+      logger.atInfo().log(
+          "Replaying %d transactions from commit log file %s.",
+          allTransactions.size(), metadata.getFilename());
       allTransactions.forEach(this::replayTransaction);
       // if we succeeded, set the last-seen time
       DateTime checkpoint =
           DateTime.parse(
               metadata.getFilename().getObjectName().substring(DIFF_FILE_PREFIX.length()));
       SqlReplayCheckpoint.set(checkpoint);
-      logger.atInfo().log("Replayed %d transactions from commit log file.", allTransactions.size());
+      logger.atInfo().log(
+          "Replayed %d transactions from commit log file %s.",
+          allTransactions.size(), metadata.getFilename());
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      throw new RuntimeException(
+          "Errored out while replaying commit log file " + metadata.getFilename(), e);
     }
   }
 
@@ -151,10 +187,16 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
   }
 
   private void handleEntityPut(Entity entity) {
-    Object ofyPojo = ofy().toPojo(entity);
+    Object ofyPojo = auditedOfy().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(

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

@@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterators.peekingIterator;
 import static google.registry.backup.BackupUtils.createDeserializingIterator;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.appengine.api.datastore.Entity;
@@ -104,7 +104,7 @@ public class RestoreCommitLogsAction implements Runnable {
       try (InputStream input = Channels.newInputStream(
           gcsService.openPrefetchingReadChannel(metadata.getFilename(), 0, BLOCK_SIZE))) {
         PeekingIterator<ImmutableObject> commitLogs =
-            peekingIterator(createDeserializingIterator(input));
+            peekingIterator(createDeserializingIterator(input, true));
         lastCheckpoint = (CommitLogCheckpoint) commitLogs.next();
         saveOfy(ImmutableList.of(lastCheckpoint));  // Save the checkpoint itself.
         while (commitLogs.hasNext()) {
@@ -146,10 +146,10 @@ public class RestoreCommitLogsAction implements Runnable {
   private CommitLogManifest restoreOneTransaction(PeekingIterator<ImmutableObject> commitLogs) {
     final CommitLogManifest manifest = (CommitLogManifest) commitLogs.next();
     Result<?> deleteResult = deleteAsync(manifest.getDeletions());
-    List<Entity> entitiesToSave = Lists.newArrayList(ofy().save().toEntity(manifest));
+    List<Entity> entitiesToSave = Lists.newArrayList(auditedOfy().save().toEntity(manifest));
     while (commitLogs.hasNext() && commitLogs.peek() instanceof CommitLogMutation) {
       CommitLogMutation mutation = (CommitLogMutation) commitLogs.next();
-      entitiesToSave.add(ofy().save().toEntity(mutation));
+      entitiesToSave.add(auditedOfy().save().toEntity(mutation));
       entitiesToSave.add(EntityTranslator.createFromPbBytes(mutation.getEntityProtoBytes()));
     }
     saveRaw(entitiesToSave);
@@ -176,7 +176,8 @@ public class RestoreCommitLogsAction implements Runnable {
       return;
     }
     retrier.callWithRetry(
-        () -> ofy().saveWithoutBackup().entities(objectsToSave).now(), RuntimeException.class);
+        () -> auditedOfy().saveWithoutBackup().entities(objectsToSave).now(),
+        RuntimeException.class);
   }
 
   private Result<?> deleteAsync(Set<Key<?>> keysToDelete) {
@@ -185,7 +186,7 @@ public class RestoreCommitLogsAction implements Runnable {
     }
     return dryRun || keysToDelete.isEmpty()
         ? new ResultNow<Void>(null)
-        : ofy().deleteWithoutBackup().keys(keysToDelete);
+        : auditedOfy().deleteWithoutBackup().keys(keysToDelete);
   }
 
 }

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

@@ -47,7 +47,7 @@ import javax.annotation.Nullable;
  *
  * <ul>
  *   <li>Convert an Objectify entity to a Datastore {@link Entity}: {@code
- *       ofy().save().toEntity(..)}
+ *       auditedOfy().save().toEntity(..)}
  *   <li>Entity is serializable, but the more efficient approach is to convert an Entity to a
  *       ProtocolBuffer ({@link com.google.storage.onestore.v3.OnestoreEntity.EntityProto}) and then
  *       to raw bytes.

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

@@ -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())

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

@@ -34,7 +34,7 @@ import static google.registry.model.ResourceTransferUtils.denyPendingTransfer;
 import static google.registry.model.ResourceTransferUtils.handlePendingTransferOnDelete;
 import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime;
 import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE;
 import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE_FAILURE;
 import static google.registry.model.reporting.HistoryEntry.Type.HOST_DELETE;
@@ -109,6 +109,7 @@ import org.joda.time.Duration;
  * A mapreduce that processes batch asynchronous deletions of contact and host resources by mapping
  * over all domains and checking for any references to the contacts/hosts in pending deletion.
  */
+@Deprecated
 @Action(
     service = Action.Service.BACKEND,
     path = "/_dr/task/deleteContactsAndHosts",
@@ -335,7 +336,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
         DeletionRequest deletionRequest, boolean hasNoActiveReferences) {
       DateTime now = tm().getTransactionTime();
       EppResource resource =
-          ofy().load().key(deletionRequest.key()).now().cloneProjectedAtTime(now);
+          auditedOfy().load().key(deletionRequest.key()).now().cloneProjectedAtTime(now);
       // Double-check transactionally that the resource is still active and in PENDING_DELETE.
       if (!doesResourceStateAllowDeletion(resource, now)) {
         return DeletionResult.create(Type.ERRORED, "");
@@ -369,11 +370,10 @@ public class DeleteContactsAndHostsAction implements Runnable {
                       : "it was transferred prior to deletion");
 
       HistoryEntry historyEntry =
-          new HistoryEntry.Builder()
+          HistoryEntry.createBuilderForResource(resource)
               .setClientId(deletionRequest.requestingClientId())
               .setModificationTime(now)
               .setType(getHistoryEntryType(resource, deleteAllowed))
-              .setParent(deletionRequest.key())
               .build();
 
       PollMessage.OneTime pollMessage =
@@ -408,7 +408,9 @@ public class DeleteContactsAndHostsAction implements Runnable {
       } else {
         resourceToSave = resource.asBuilder().removeStatusValue(PENDING_DELETE).build();
       }
-      ofy().save().<ImmutableObject>entities(resourceToSave, historyEntry, pollMessage);
+      auditedOfy()
+          .save()
+          .<ImmutableObject>entities(resourceToSave, historyEntry.asHistoryEntry(), pollMessage);
       return DeletionResult.create(
           deleteAllowed ? Type.DELETED : Type.NOT_DELETED, pollMessageText);
     }
@@ -525,7 +527,8 @@ public class DeleteContactsAndHostsAction implements Runnable {
           Key.create(
               checkNotNull(params.get(PARAM_RESOURCE_KEY), "Resource to delete not specified"));
       EppResource resource =
-          checkNotNull(ofy().load().key(resourceKey).now(), "Resource to delete doesn't exist");
+          checkNotNull(
+              auditedOfy().load().key(resourceKey).now(), "Resource to delete doesn't exist");
       checkState(
           resource instanceof ContactResource || resource instanceof HostResource,
           "Cannot delete a %s via this action",

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

@@ -17,8 +17,8 @@ package google.registry.batch;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static google.registry.flows.FlowUtils.marshalWithLenientRetry;
-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 static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static google.registry.util.ResourceUtils.readResourceUtf8;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -36,14 +36,15 @@ import google.registry.flows.StatelessRequestSessionMetadata;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppoutput.EppOutput;
+import google.registry.persistence.transaction.QueryComposer.Comparator;
 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 +60,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";
@@ -123,12 +129,15 @@ public class DeleteExpiredDomainsAction implements Runnable {
     logger.atInfo().log(
         "Deleting non-renewing domains with autorenew end times up through %s.", runTime);
 
-    // Note: This query is (and must be) non-transactional, and thus, is only eventually consistent.
+    // Note: in Datastore, this query is (and must be) non-transactional, and thus, is only
+    // eventually consistent.
     ImmutableList<DomainBase> domainsToDelete =
-        ofy().load().type(DomainBase.class).filter("autorenewEndTime <=", runTime).list().stream()
-            // Datastore can't do two inequalities in one query, so the second happens in-memory.
-            .filter(d -> d.getDeletionTime().isEqual(END_OF_TIME))
-            .collect(toImmutableList());
+        transactIfJpaTm(
+            () ->
+                tm().createQueryComposer(DomainBase.class)
+                    .where("autorenewEndTime", Comparator.LTE, runTime)
+                    .where("deletionTime", Comparator.EQ, END_OF_TIME)
+                    .list());
     if (domainsToDelete.isEmpty()) {
       logger.atInfo().log("Found 0 domains to delete.");
       response.setPayload("Found 0 domains to delete.");
@@ -141,12 +150,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 +205,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);
   }
 }

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

@@ -15,12 +15,14 @@
 package google.registry.batch;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.config.RegistryEnvironment.PRODUCTION;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
+import static google.registry.util.DateTimeUtils.END_OF_TIME;
 
 import com.google.appengine.tools.mapreduce.Mapper;
 import com.google.common.collect.ImmutableList;
@@ -28,16 +30,24 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryEnvironment;
+import google.registry.flows.poll.PollFlowUtils;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.model.EppResource;
+import google.registry.model.EppResourceUtils;
 import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.ForeignKeyIndex;
+import google.registry.model.poll.PollMessage;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.model.reporting.HistoryEntryDao;
+import google.registry.persistence.VKey;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
+import google.registry.util.Clock;
 import java.util.List;
 import javax.inject.Inject;
 
@@ -46,8 +56,8 @@ import javax.inject.Inject;
  * the associated ForeignKey and EppResourceIndex entities.
  *
  * <p>This only deletes contacts and hosts, NOT domains. To delete domains, use {@link
- * DeleteLoadTestDataAction} and pass it the TLD(s) that the load test domains were created on. Note
- * that DeleteLoadTestDataAction is safe enough to run in production whereas this mapreduce is not,
+ * DeleteProberDataAction} and pass it the TLD(s) that the load test domains were created on. Note
+ * that DeleteProberDataAction is safe enough to run in production whereas this mapreduce is not,
  * but this one does not need to be runnable in production because load testing isn't run against
  * production.
  */
@@ -68,15 +78,22 @@ public class DeleteLoadTestDataAction implements Runnable {
    */
   private static final ImmutableSet<String> LOAD_TEST_REGISTRARS = ImmutableSet.of("proxy");
 
-  @Inject
-  @Parameter(PARAM_DRY_RUN)
-  boolean isDryRun;
-
-  @Inject MapreduceRunner mrRunner;
-  @Inject Response response;
+  private final boolean isDryRun;
+  private final MapreduceRunner mrRunner;
+  private final Response response;
+  private final Clock clock;
 
   @Inject
-  DeleteLoadTestDataAction() {}
+  DeleteLoadTestDataAction(
+      @Parameter(PARAM_DRY_RUN) boolean isDryRun,
+      MapreduceRunner mrRunner,
+      Response response,
+      Clock clock) {
+    this.isDryRun = isDryRun;
+    this.mrRunner = mrRunner;
+    this.response = response;
+    this.clock = clock;
+  }
 
   @Override
   public void run() {
@@ -87,14 +104,85 @@ public class DeleteLoadTestDataAction implements Runnable {
         !RegistryEnvironment.get().equals(PRODUCTION),
         "This mapreduce is not safe to run on PRODUCTION.");
 
-    mrRunner
-        .setJobName("Delete load test data")
-        .setModuleName("backend")
-        .runMapOnly(
-            new DeleteLoadTestDataMapper(isDryRun),
-            ImmutableList.of(
-                createEntityInput(ContactResource.class), createEntityInput(HostResource.class)))
-        .sendLinkToMapreduceConsole(response);
+    if (tm().isOfy()) {
+      mrRunner
+          .setJobName("Delete load test data")
+          .setModuleName("backend")
+          .runMapOnly(
+              new DeleteLoadTestDataMapper(isDryRun),
+              ImmutableList.of(
+                  createEntityInput(ContactResource.class), createEntityInput(HostResource.class)))
+          .sendLinkToMapreduceConsole(response);
+    } else {
+      tm().transact(
+              () -> {
+                LOAD_TEST_REGISTRARS.forEach(this::deletePollMessages);
+                tm().loadAllOfStream(ContactResource.class).forEach(this::deleteContact);
+                tm().loadAllOfStream(HostResource.class).forEach(this::deleteHost);
+              });
+    }
+  }
+
+  private void deletePollMessages(String registrarId) {
+    ImmutableList<PollMessage> pollMessages =
+        PollFlowUtils.createPollMessageQuery(registrarId, END_OF_TIME).list();
+    if (isDryRun) {
+      logger.atInfo().log(
+          "Would delete %d poll messages for registrar %s.", pollMessages.size(), registrarId);
+    } else {
+      pollMessages.forEach(tm()::delete);
+    }
+  }
+
+  private void deleteContact(ContactResource contact) {
+    if (!LOAD_TEST_REGISTRARS.contains(contact.getPersistedCurrentSponsorClientId())) {
+      return;
+    }
+    // We cannot remove contacts from domains in the general case, so we cannot delete contacts
+    // that are linked to domains (since it would break the foreign keys)
+    if (EppResourceUtils.isLinked(contact.createVKey(), clock.nowUtc())) {
+      logger.atWarning().log(
+          "Cannot delete contact with repo ID %s since it is referenced from a domain",
+          contact.getRepoId());
+      return;
+    }
+    deleteResource(contact);
+  }
+
+  private void deleteHost(HostResource host) {
+    if (!LOAD_TEST_REGISTRARS.contains(host.getPersistedCurrentSponsorClientId())) {
+      return;
+    }
+    VKey<HostResource> hostVKey = host.createVKey();
+    // We can remove hosts from linked domains, so we should do so then delete the hosts
+    ImmutableSet<VKey<DomainBase>> linkedDomains =
+        EppResourceUtils.getLinkedDomainKeys(hostVKey, clock.nowUtc(), null);
+    tm().loadByKeys(linkedDomains)
+        .values()
+        .forEach(
+            domain -> {
+              ImmutableSet<VKey<HostResource>> remainingHosts =
+                  domain.getNsHosts().stream()
+                      .filter(vkey -> !vkey.equals(hostVKey))
+                      .collect(toImmutableSet());
+              tm().put(domain.asBuilder().setNameservers(remainingHosts).build());
+            });
+    deleteResource(host);
+  }
+
+  private void deleteResource(EppResource eppResource) {
+    // In SQL, the only objects parented on the resource are poll messages (deleted above) and
+    // history objects.
+    ImmutableList<HistoryEntry> historyObjects =
+        HistoryEntryDao.loadHistoryObjectsForResource(eppResource.createVKey());
+    if (isDryRun) {
+      logger.atInfo().log(
+          "Would delete repo ID %s along with %d history objects",
+          eppResource.getRepoId(), historyObjects.size());
+    } else {
+      historyObjects.forEach(tm()::delete);
+      tm().delete(eppResource);
+    }
   }
 
   /** Provides the map method that runs for each existing contact and host entity. */
@@ -125,12 +213,11 @@ public class DeleteLoadTestDataAction implements Runnable {
           Key.create(EppResourceIndex.create(Key.create(resource)));
       final Key<? extends ForeignKeyIndex<?>> fki = ForeignKeyIndex.createKey(resource);
       int numEntitiesDeleted =
-          tm()
-              .transact(
+          tm().transact(
                   () -> {
                     // This ancestor query selects all descendant entities.
                     List<Key<Object>> resourceAndDependentKeys =
-                        ofy().load().ancestor(resource).keys().list();
+                        auditedOfy().load().ancestor(resource).keys().list();
                     ImmutableSet<Key<?>> allKeys =
                         new ImmutableSet.Builder<Key<?>>()
                             .add(fki)
@@ -140,7 +227,7 @@ public class DeleteLoadTestDataAction implements Runnable {
                     if (isDryRun) {
                       logger.atInfo().log("Would hard-delete the following entities: %s", allKeys);
                     } else {
-                      ofy().deleteWithoutBackup().keys(allKeys);
+                      auditedOfy().deleteWithoutBackup().keys(allKeys);
                     }
                     return allKeys.size();
                   });

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

@@ -20,7 +20,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.config.RegistryEnvironment.PRODUCTION;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.model.registry.Registries.getTldsOfType;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_DELETE;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -44,11 +44,11 @@ import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.EppResourceInputs;
 import google.registry.model.EppResourceUtils;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.DomainHistory;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.ForeignKeyIndex;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldType;
-import google.registry.model.reporting.HistoryEntry;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
@@ -166,7 +166,7 @@ public class DeleteProberDataAction implements Runnable {
     }
 
     private void deleteDomain(final Key<DomainBase> domainKey) {
-      final DomainBase domain = ofy().load().key(domainKey).now();
+      final DomainBase domain = auditedOfy().load().key(domainKey).now();
 
       DateTime now = DateTime.now(UTC);
 
@@ -220,14 +220,13 @@ public class DeleteProberDataAction implements Runnable {
       final Key<? extends ForeignKeyIndex<?>> fki = ForeignKeyIndex.createKey(domain);
 
       int entitiesDeleted =
-          tm()
-              .transact(
+          tm().transact(
                   () -> {
                     // This ancestor query selects all descendant HistoryEntries, BillingEvents,
                     // PollMessages,
                     // and TLD-specific entities, as well as the domain itself.
                     List<Key<Object>> domainAndDependentKeys =
-                        ofy().load().ancestor(domainKey).keys().list();
+                        auditedOfy().load().ancestor(domainKey).keys().list();
                     ImmutableSet<Key<?>> allKeys =
                         new ImmutableSet.Builder<Key<?>>()
                             .add(fki)
@@ -237,7 +236,7 @@ public class DeleteProberDataAction implements Runnable {
                     if (isDryRun) {
                       logger.atInfo().log("Would hard-delete the following entities: %s", allKeys);
                     } else {
-                      ofy().deleteWithoutBackup().keys(allKeys);
+                      auditedOfy().deleteWithoutBackup().keys(allKeys);
                     }
                     return allKeys.size();
                   });
@@ -254,9 +253,9 @@ public class DeleteProberDataAction implements Runnable {
                         .setDeletionTime(tm().getTransactionTime())
                         .setStatusValues(null)
                         .build();
-                HistoryEntry historyEntry =
-                    new HistoryEntry.Builder()
-                        .setParent(domain)
+                DomainHistory historyEntry =
+                    new DomainHistory.Builder()
+                        .setDomain(domain)
                         .setType(DOMAIN_DELETE)
                         .setModificationTime(tm().getTransactionTime())
                         .setBySuperuser(true)
@@ -264,11 +263,9 @@ public class DeleteProberDataAction implements Runnable {
                         .setClientId(registryAdminClientId)
                         .build();
                 // Note that we don't bother handling grace periods, billing events, pending
-                // transfers,
-                // poll messages, or auto-renews because these will all be hard-deleted the next
-                // time the
-                // mapreduce runs anyway.
-                ofy().save().entities(deletedDomain, historyEntry);
+                // transfers, poll messages, or auto-renews because these will all be hard-deleted
+                // the next time the mapreduce runs anyway.
+                tm().putAll(deletedDomain, historyEntry);
                 updateForeignKeyIndexDeletionTime(deletedDomain);
                 dnsQueue.addDomainRefreshTask(deletedDomain.getDomainName());
               });

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

@@ -21,12 +21,13 @@ import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.mapreduce.inputs.EppResourceInputs.createChildEntityInput;
 import static google.registry.model.common.Cursor.CursorType.RECURRING_BILLING;
 import static google.registry.model.domain.Period.Unit.YEARS;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_AUTORENEW;
+import static google.registry.persistence.transaction.QueryComposer.Comparator.EQ;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 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;
@@ -40,10 +41,8 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Range;
 import com.google.common.collect.Streams;
 import com.google.common.flogger.FluentLogger;
-import com.googlecode.objectify.Key;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.NullInput;
-import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Flag;
@@ -51,16 +50,16 @@ import google.registry.model.billing.BillingEvent.OneTime;
 import google.registry.model.billing.BillingEvent.Recurring;
 import google.registry.model.common.Cursor;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.Period;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
-import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.VKey;
 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;
@@ -94,31 +93,88 @@ 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 persistedCursorTime =
+        transactIfJpaTm(
+            () ->
+                tm().loadByKeyIfPresent(Cursor.createGlobalVKey(RECURRING_BILLING))
+                    .orElse(Cursor.createGlobal(RECURRING_BILLING, START_OF_TIME))
+                    .getCursorTime());
     DateTime cursorTime = cursorTimeParam.orElse(persistedCursorTime);
     checkArgument(
-        cursorTime.isBefore(executeTime),
-        "Cursor time must be earlier than execution time.");
+        cursorTime.isBefore(executeTime), "Cursor time must be earlier than execution time.");
     logger.atInfo().log(
         "Running Recurring billing event expansion for billing time range [%s, %s).",
         cursorTime, executeTime);
-    mrRunner
-        .setJobName("Expand Recurring billing events into synthetic OneTime events.")
-        .setModuleName("backend")
-        .runMapreduce(
-            new ExpandRecurringBillingEventsMapper(isDryRun, cursorTime, clock.nowUtc()),
-            new ExpandRecurringBillingEventsReducer(isDryRun, persistedCursorTime),
-            // Add an extra shard that maps over a null recurring event (see the mapper for why).
-            ImmutableList.of(
-                new NullInput<>(),
-                createChildEntityInput(
-                    ImmutableSet.of(DomainBase.class), ImmutableSet.of(Recurring.class))))
-        .sendLinkToMapreduceConsole(response);
-  }
+    if (tm().isOfy()) {
+      mrRunner
+          .setJobName("Expand Recurring billing events into synthetic OneTime events.")
+          .setModuleName("backend")
+          .runMapreduce(
+              new ExpandRecurringBillingEventsMapper(isDryRun, cursorTime, clock.nowUtc()),
+              new ExpandRecurringBillingEventsReducer(isDryRun, persistedCursorTime),
+              // Add an extra shard that maps over a null recurring event (see the mapper for why).
+              ImmutableList.of(
+                  new NullInput<>(),
+                  createChildEntityInput(
+                      ImmutableSet.of(DomainBase.class), ImmutableSet.of(Recurring.class))))
+          .sendLinkToMapreduceConsole(response);
+    } else {
+      int numBillingEventsSaved =
+          jpaTm()
+              .transact(
+                  () ->
+                      jpaTm()
+                          .query(
+                              "FROM BillingRecurrence "
+                                  + "WHERE eventTime <= :executeTime "
+                                  + "AND eventTime < recurrenceEndTime "
+                                  + "ORDER BY id ASC",
+                              Recurring.class)
+                          .setParameter("executeTime", executeTime)
+                          // Need to get a list from the transaction and then convert it to a stream
+                          // for further processing. If we get a stream directly, each elements gets
+                          // processed downstream eagerly but Hibernate returns a
+                          // ScrollableResultsIterator that cannot be advanced outside the
+                          // transaction, resulting in an exception.
+                          .getResultList())
+              .stream()
+              .map(
+                  recurring ->
+                      jpaTm()
+                          .transact(
+                              () ->
+                                  expandBillingEvent(recurring, executeTime, cursorTime, isDryRun)))
+              .reduce(0, Integer::sum);
 
+      if (!isDryRun) {
+        logger.atInfo().log("Saved OneTime billing events", numBillingEventsSaved);
+      } else {
+        logger.atInfo().log("Generated OneTime billing events (dry run)", numBillingEventsSaved);
+      }
+      logger.atInfo().log(
+          "Recurring event expansion %s complete for billing event range [%s, %s).",
+          isDryRun ? "(dry run) " : "", cursorTime, executeTime);
+      tm().transact(
+              () -> {
+                // Check for the unlikely scenario where the cursor has been altered during the
+                // expansion.
+                DateTime currentCursorTime =
+                    tm().loadByKeyIfPresent(Cursor.createGlobalVKey(RECURRING_BILLING))
+                        .orElse(Cursor.createGlobal(RECURRING_BILLING, START_OF_TIME))
+                        .getCursorTime();
+                if (!currentCursorTime.equals(persistedCursorTime)) {
+                  throw new IllegalStateException(
+                      String.format(
+                          "Current cursor position %s does not match persisted cursor position %s.",
+                          currentCursorTime, persistedCursorTime));
+                }
+                if (!isDryRun) {
+                  tm().put(Cursor.createGlobal(RECURRING_BILLING, executeTime));
+                }
+              });
+    }
+  }
   /** Mapper to expand {@link Recurring} billing events into synthetic {@link OneTime} events. */
   public static class ExpandRecurringBillingEventsMapper
       extends Mapper<Recurring, DateTime, DateTime> {
@@ -157,98 +213,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
       try {
         numBillingEventsSaved =
             tm().transactNew(
-                    () -> {
-                      ImmutableSet.Builder<OneTime> syntheticOneTimesBuilder =
-                          new ImmutableSet.Builder<>();
-                      final Registry tld =
-                          Registry.get(getTldFromDomainName(recurring.getTargetId()));
-
-                      // Determine the complete set of times at which this recurring event should
-                      // occur (up to and including the runtime of the mapreduce).
-                      Iterable<DateTime> eventTimes =
-                          recurring
-                              .getRecurrenceTimeOfYear()
-                              .getInstancesInRange(
-                                  Range.closed(
-                                      recurring.getEventTime(),
-                                      earliestOf(recurring.getRecurrenceEndTime(), executeTime)));
-
-                      // Convert these event times to billing times
-                      final ImmutableSet<DateTime> billingTimes =
-                          getBillingTimesInScope(eventTimes, cursorTime, executeTime, tld);
-
-                      Key<? extends EppResource> domainKey = recurring.getParentKey().getParent();
-                      Iterable<OneTime> oneTimesForDomain =
-                          ofy().load().type(OneTime.class).ancestor(domainKey);
-
-                      // Determine the billing times that already have OneTime events persisted.
-                      ImmutableSet<DateTime> existingBillingTimes =
-                          getExistingBillingTimes(oneTimesForDomain, recurring);
-
-                      ImmutableSet.Builder<HistoryEntry> historyEntriesBuilder =
-                          new ImmutableSet.Builder<>();
-                      // Create synthetic OneTime events for all billing times that do not yet have
-                      // an event persisted.
-                      for (DateTime billingTime : difference(billingTimes, existingBillingTimes)) {
-                        // Construct a new HistoryEntry that parents over the OneTime
-                        HistoryEntry historyEntry =
-                            new HistoryEntry.Builder()
-                                .setBySuperuser(false)
-                                .setClientId(recurring.getClientId())
-                                .setModificationTime(tm().getTransactionTime())
-                                .setParent(domainKey)
-                                .setPeriod(Period.create(1, YEARS))
-                                .setReason(
-                                    "Domain autorenewal by ExpandRecurringBillingEventsAction")
-                                .setRequestedByRegistrar(false)
-                                .setType(DOMAIN_AUTORENEW)
-                                // Don't write a domain transaction record if the recurrence was
-                                // ended prior to the billing time (i.e. a domain was deleted
-                                // during the autorenew grace period).
-                                .setDomainTransactionRecords(
-                                    recurring.getRecurrenceEndTime().isBefore(billingTime)
-                                        ? ImmutableSet.of()
-                                        : ImmutableSet.of(
-                                            DomainTransactionRecord.create(
-                                                tld.getTldStr(),
-                                                // We report this when the autorenew grace period
-                                                // ends
-                                                billingTime,
-                                                TransactionReportField.netRenewsFieldFromYears(1),
-                                                1)))
-                                .build();
-                        historyEntriesBuilder.add(historyEntry);
-
-                        DateTime eventTime = billingTime.minus(tld.getAutoRenewGracePeriodLength());
-                        // Determine the cost for a one-year renewal.
-                        Money renewCost = getDomainRenewCost(recurring.getTargetId(), eventTime, 1);
-                        syntheticOneTimesBuilder.add(
-                            new OneTime.Builder()
-                                .setBillingTime(billingTime)
-                                .setClientId(recurring.getClientId())
-                                .setCost(renewCost)
-                                .setEventTime(eventTime)
-                                .setFlags(union(recurring.getFlags(), Flag.SYNTHETIC))
-                                .setParent(historyEntry)
-                                .setPeriodYears(1)
-                                .setReason(recurring.getReason())
-                                .setSyntheticCreationTime(executeTime)
-                                .setCancellationMatchingBillingEvent(recurring.createVKey())
-                                .setTargetId(recurring.getTargetId())
-                                .build());
-                      }
-                      Set<HistoryEntry> historyEntries = historyEntriesBuilder.build();
-                      Set<OneTime> syntheticOneTimes = syntheticOneTimesBuilder.build();
-                      if (!isDryRun) {
-                        ImmutableSet<ImmutableObject> entitiesToSave =
-                            new ImmutableSet.Builder<ImmutableObject>()
-                                .addAll(historyEntries)
-                                .addAll(syntheticOneTimes)
-                                .build();
-                        ofy().save().entities(entitiesToSave).now();
-                      }
-                      return syntheticOneTimes.size();
-                    });
+                    () -> expandBillingEvent(recurring, executeTime, cursorTime, isDryRun));
       } catch (Throwable t) {
         getContext().incrementCounter("error: " + t.getClass().getSimpleName());
         getContext().incrementCounter(ERROR_COUNTER);
@@ -260,45 +225,12 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
       if (!isDryRun) {
         getContext().incrementCounter("Saved OneTime billing events", numBillingEventsSaved);
       } else {
-        getContext().incrementCounter(
-            "Generated OneTime billing events (dry run)", numBillingEventsSaved);
+        getContext()
+            .incrementCounter("Generated OneTime billing events (dry run)", numBillingEventsSaved);
       }
     }
-
-    /**
-     * Filters a set of {@link DateTime}s down to event times that are in scope for a particular
-     * mapreduce run, given the cursor time and the mapreduce execution time.
-     */
-    private ImmutableSet<DateTime> getBillingTimesInScope(
-        Iterable<DateTime> eventTimes,
-        DateTime cursorTime,
-        DateTime executeTime,
-        final Registry tld) {
-      return Streams.stream(eventTimes)
-          .map(eventTime -> eventTime.plus(tld.getAutoRenewGracePeriodLength()))
-          .filter(Range.closedOpen(cursorTime, executeTime))
-          .collect(toImmutableSet());
-    }
-
-    /**
-     * Determines an {@link ImmutableSet} of {@link DateTime}s that have already been persisted
-     * for a given recurring billing event.
-     */
-    private ImmutableSet<DateTime> getExistingBillingTimes(
-        Iterable<BillingEvent.OneTime> oneTimesForDomain,
-        final BillingEvent.Recurring recurringEvent) {
-      return Streams.stream(oneTimesForDomain)
-          .filter(
-              billingEvent ->
-                  recurringEvent
-                      .createVKey()
-                      .equals(billingEvent.getCancellationMatchingBillingEvent()))
-          .map(OneTime::getBillingTime)
-          .collect(toImmutableSet());
-    }
   }
 
-
   /**
    * "Reducer" to advance the cursor after all map jobs have been completed. The NullInput into the
    * mapper will cause the mapper to emit one timestamp pair (current cursor and execution time),
@@ -331,8 +263,8 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
           isDryRun ? "(dry run) " : "", cursorTime, executionTime);
       tm().transact(
               () -> {
-                Cursor cursor = ofy().load().key(Cursor.createGlobalKey(RECURRING_BILLING)).now();
-                loadAndCompare(cursor, GLOBAL);
+                Cursor cursor =
+                    auditedOfy().load().key(Cursor.createGlobalKey(RECURRING_BILLING)).now();
                 DateTime currentCursorTime =
                     (cursor == null ? START_OF_TIME : cursor.getCursorTime());
                 if (!currentCursorTime.equals(expectedPersistedCursorTime)) {
@@ -342,10 +274,140 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
                   return;
                 }
                 if (!isDryRun) {
-                  CursorDao.saveCursor(
-                      Cursor.createGlobal(RECURRING_BILLING, executionTime), GLOBAL);
+                  tm().put(Cursor.createGlobal(RECURRING_BILLING, executionTime));
                 }
               });
     }
   }
+
+  private static int expandBillingEvent(
+      Recurring recurring, DateTime executeTime, DateTime cursorTime, boolean isDryRun) {
+    ImmutableSet.Builder<OneTime> syntheticOneTimesBuilder = new ImmutableSet.Builder<>();
+    final Registry tld = Registry.get(getTldFromDomainName(recurring.getTargetId()));
+
+    // Determine the complete set of times at which this recurring event should
+    // occur (up to and including the runtime of the mapreduce).
+    Iterable<DateTime> eventTimes =
+        recurring
+            .getRecurrenceTimeOfYear()
+            .getInstancesInRange(
+                Range.closed(
+                    recurring.getEventTime(),
+                    earliestOf(recurring.getRecurrenceEndTime(), executeTime)));
+
+    // Convert these event times to billing times
+    final ImmutableSet<DateTime> billingTimes =
+        getBillingTimesInScope(eventTimes, cursorTime, executeTime, tld);
+
+    VKey<DomainBase> domainKey =
+        VKey.create(
+            DomainBase.class, recurring.getDomainRepoId(), recurring.getParentKey().getParent());
+    Iterable<OneTime> oneTimesForDomain;
+    if (tm().isOfy()) {
+      oneTimesForDomain = auditedOfy().load().type(OneTime.class).ancestor(domainKey.getOfyKey());
+    } else {
+      oneTimesForDomain =
+          tm().createQueryComposer(OneTime.class)
+              .where("domainRepoId", EQ, recurring.getDomainRepoId())
+              .list();
+    }
+
+    // Determine the billing times that already have OneTime events persisted.
+    ImmutableSet<DateTime> existingBillingTimes =
+        getExistingBillingTimes(oneTimesForDomain, recurring);
+
+    ImmutableSet.Builder<DomainHistory> historyEntriesBuilder = new ImmutableSet.Builder<>();
+    // Create synthetic OneTime events for all billing times that do not yet have
+    // an event persisted.
+    for (DateTime billingTime : difference(billingTimes, existingBillingTimes)) {
+      // Construct a new HistoryEntry that parents over the OneTime
+      DomainHistory historyEntry =
+          new DomainHistory.Builder()
+              .setBySuperuser(false)
+              .setClientId(recurring.getClientId())
+              .setModificationTime(tm().getTransactionTime())
+              .setDomain(tm().loadByKey(domainKey))
+              .setPeriod(Period.create(1, YEARS))
+              .setReason("Domain autorenewal by ExpandRecurringBillingEventsAction")
+              .setRequestedByRegistrar(false)
+              .setType(DOMAIN_AUTORENEW)
+              // Don't write a domain transaction record if the recurrence was
+              // ended prior to the billing time (i.e. a domain was deleted
+              // during the autorenew grace period).
+              .setDomainTransactionRecords(
+                  recurring.getRecurrenceEndTime().isBefore(billingTime)
+                      ? ImmutableSet.of()
+                      : ImmutableSet.of(
+                          DomainTransactionRecord.create(
+                              tld.getTldStr(),
+                              // We report this when the autorenew grace period
+                              // ends
+                              billingTime,
+                              TransactionReportField.netRenewsFieldFromYears(1),
+                              1)))
+              .build();
+      historyEntriesBuilder.add(historyEntry);
+
+      DateTime eventTime = billingTime.minus(tld.getAutoRenewGracePeriodLength());
+      // Determine the cost for a one-year renewal.
+      Money renewCost = getDomainRenewCost(recurring.getTargetId(), eventTime, 1);
+      syntheticOneTimesBuilder.add(
+          new OneTime.Builder()
+              .setBillingTime(billingTime)
+              .setClientId(recurring.getClientId())
+              .setCost(renewCost)
+              .setEventTime(eventTime)
+              .setFlags(union(recurring.getFlags(), Flag.SYNTHETIC))
+              .setParent(historyEntry)
+              .setPeriodYears(1)
+              .setReason(recurring.getReason())
+              .setSyntheticCreationTime(executeTime)
+              .setCancellationMatchingBillingEvent(recurring.createVKey())
+              .setTargetId(recurring.getTargetId())
+              .build());
+    }
+    Set<DomainHistory> historyEntries = historyEntriesBuilder.build();
+    Set<OneTime> syntheticOneTimes = syntheticOneTimesBuilder.build();
+    if (!isDryRun) {
+      ImmutableSet<ImmutableObject> entitiesToSave =
+          new ImmutableSet.Builder<ImmutableObject>()
+              .addAll(historyEntries)
+              .addAll(syntheticOneTimes)
+              .build();
+      tm().putAll(entitiesToSave);
+    }
+    return syntheticOneTimes.size();
+  }
+
+  /**
+   * Filters a set of {@link DateTime}s down to event times that are in scope for a particular
+   * mapreduce run, given the cursor time and the mapreduce execution time.
+   */
+  protected static ImmutableSet<DateTime> getBillingTimesInScope(
+      Iterable<DateTime> eventTimes,
+      DateTime cursorTime,
+      DateTime executeTime,
+      final Registry tld) {
+    return Streams.stream(eventTimes)
+        .map(eventTime -> eventTime.plus(tld.getAutoRenewGracePeriodLength()))
+        .filter(Range.closedOpen(cursorTime, executeTime))
+        .collect(toImmutableSet());
+  }
+
+  /**
+   * Determines an {@link ImmutableSet} of {@link DateTime}s that have already been persisted for a
+   * given recurring billing event.
+   */
+  private static ImmutableSet<DateTime> getExistingBillingTimes(
+      Iterable<BillingEvent.OneTime> oneTimesForDomain,
+      final BillingEvent.Recurring recurringEvent) {
+    return Streams.stream(oneTimesForDomain)
+        .filter(
+            billingEvent ->
+                recurringEvent
+                    .createVKey()
+                    .equals(billingEvent.getCancellationMatchingBillingEvent()))
+        .map(OneTime::getBillingTime)
+        .collect(toImmutableSet());
+  }
 }

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

@@ -23,9 +23,10 @@ import static google.registry.batch.AsyncTaskEnqueuer.PARAM_REQUESTED_TIME;
 import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_HOST_RENAME;
 import static google.registry.batch.AsyncTaskMetrics.OperationType.DNS_REFRESH;
 import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
+import static google.registry.model.EppResourceUtils.getLinkedDomainKeys;
 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 +45,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,11 +64,13 @@ 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;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.apache.http.HttpStatus;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 
@@ -86,6 +88,8 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
   @Inject Clock clock;
   @Inject MapreduceRunner mrRunner;
   @Inject @Named(QUEUE_ASYNC_HOST_RENAME) Queue pullQueue;
+
+  @Inject DnsQueue dnsQueue;
   @Inject RequestStatusChecker requestStatusChecker;
   @Inject Response response;
   @Inject Retrier retrier;
@@ -123,7 +127,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) {
@@ -153,7 +157,39 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
     } else {
       logger.atInfo().log(
           "Processing asynchronous DNS refresh for renamed hosts: %s", hostKeys.build());
-      runMapreduce(refreshRequests, lock);
+      if (tm().isOfy()) {
+        runMapreduce(refreshRequests, lock);
+      } else {
+        try {
+          refreshRequests.stream()
+              .flatMap(
+                  request ->
+                      getLinkedDomainKeys(request.hostKey(), request.lastUpdateTime(), null)
+                          .stream())
+              .distinct()
+              .map(domainKey -> tm().transact(() -> tm().loadByKey(domainKey).getDomainName()))
+              .forEach(
+                  domainName -> {
+                    retrier.callWithRetry(
+                        () -> dnsQueue.addDomainRefreshTask(domainName),
+                        TransientFailureException.class);
+                    logger.atInfo().log("Enqueued DNS refresh for domain %s.", domainName);
+                  });
+          deleteTasksWithRetry(
+              refreshRequests,
+              getQueue(QUEUE_ASYNC_HOST_RENAME),
+              asyncTaskMetrics,
+              retrier,
+              OperationResult.SUCCESS);
+        } catch (Throwable t) {
+          String message = "Error refreshing DNS on host rename.";
+          logger.atSevere().withCause(t).log(message);
+          response.setPayload(message);
+          response.setStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        } finally {
+          lock.get().release();
+        }
+      }
     }
   }
 
@@ -204,10 +240,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 +329,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 +338,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 +352,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) {

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

@@ -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;

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

@@ -15,7 +15,7 @@
 package google.registry.batch;
 
 import static google.registry.mapreduce.MapreduceRunner.PARAM_FAST;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.appengine.tools.mapreduce.Mapper;
@@ -54,6 +54,8 @@ import javax.inject.Inject;
     service = Action.Service.BACKEND,
     path = "/_dr/task/resaveAllEppResources",
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+// No longer needed in SQL. Subject to future removal.
+@Deprecated
 public class ResaveAllEppResourcesAction implements Runnable {
 
   @Inject MapreduceRunner mrRunner;
@@ -104,13 +106,13 @@ public class ResaveAllEppResourcesAction implements Runnable {
       boolean resaved =
           tm().transact(
                   () -> {
-                    EppResource originalResource = ofy().load().key(resourceKey).now();
+                    EppResource originalResource = auditedOfy().load().key(resourceKey).now();
                     EppResource projectedResource =
                         originalResource.cloneProjectedAtTime(tm().getTransactionTime());
                     if (isFast && originalResource.equals(projectedResource)) {
                       return false;
                     } else {
-                      ofy().save().entity(projectedResource).now();
+                      auditedOfy().save().entity(projectedResource).now();
                       return true;
                     }
                   });

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

@@ -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.");
   }
 }

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

@@ -0,0 +1,165 @@
+// 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.ImmutableList;
+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.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.function.Supplier;
+import javax.inject.Inject;
+
+/**
+ * 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()) {
+              dropAllTables(conn, listTables(conn));
+              dropAllSequences(conn, listSequences(conn));
+            }
+            return null;
+          },
+          e -> !(e instanceof SQLException));
+      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);
+    }
+  }
+
+  /** Returns a list of all tables in the public schema of a Postgresql database. */
+  static ImmutableList<String> listTables(Connection connection) throws SQLException {
+    try (ResultSet resultSet =
+        connection.getMetaData().getTables(null, null, null, new String[] {"TABLE"})) {
+      ImmutableList.Builder<String> tables = new ImmutableList.Builder<>();
+      while (resultSet.next()) {
+        String schema = resultSet.getString("TABLE_SCHEM");
+        if (schema == null || !schema.equalsIgnoreCase("public")) {
+          continue;
+        }
+        String tableName = resultSet.getString("TABLE_NAME");
+        tables.add("public.\"" + tableName + "\"");
+      }
+      return tables.build();
+    }
+  }
+
+  static void dropAllTables(Connection conn, ImmutableList<String> tables) throws SQLException {
+    if (tables.isEmpty()) {
+      return;
+    }
+
+    try (Statement statement = conn.createStatement()) {
+      for (String table : tables) {
+        statement.addBatch(String.format("DROP TABLE IF EXISTS %s CASCADE;", table));
+      }
+      for (int code : statement.executeBatch()) {
+        if (code == Statement.EXECUTE_FAILED) {
+          throw new RuntimeException("Failed to drop some tables. Please check.");
+        }
+      }
+    }
+  }
+
+  /** Returns a list of all sequences in a Postgresql database. */
+  static ImmutableList<String> listSequences(Connection conn) throws SQLException {
+    try (Statement statement = conn.createStatement();
+        ResultSet resultSet =
+            statement.executeQuery("SELECT c.relname FROM pg_class c WHERE c.relkind = 'S';")) {
+      ImmutableList.Builder<String> sequences = new ImmutableList.Builder<>();
+      while (resultSet.next()) {
+        sequences.add('\"' + resultSet.getString(1) + '\"');
+      }
+      return sequences.build();
+    }
+  }
+
+  static void dropAllSequences(Connection conn, ImmutableList<String> sequences)
+      throws SQLException {
+    if (sequences.isEmpty()) {
+      return;
+    }
+
+    try (Statement statement = conn.createStatement()) {
+      for (String sequence : sequences) {
+        statement.addBatch(String.format("DROP SEQUENCE IF EXISTS %s CASCADE;", sequence));
+      }
+      for (int code : statement.executeBatch()) {
+        if (code == Statement.EXECUTE_FAILED) {
+          throw new RuntimeException("Failed to drop some sequences. Please check.");
+        }
+      }
+    }
+  }
+}

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

@@ -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 google.registry.beam.BeamUtils.createJobName;
+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 google.registry.util.Clock;
+import javax.inject.Inject;
+
+/**
+ * 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;
+  private final Clock clock;
+
+  @Inject
+  WipeoutDatastoreAction(
+      @Config("projectId") String projectId,
+      @Config("defaultJobRegion") String jobRegion,
+      @Config("beamStagingBucketUrl") String stagingBucketUrl,
+      Clock clock,
+      Response response,
+      Dataflow dataflow) {
+    this.projectId = projectId;
+    this.jobRegion = jobRegion;
+    this.stagingBucketUrl = stagingBucketUrl;
+    this.clock = clock;
+    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()
+              .setJobName(createJobName("bulk-delete-datastore-", clock))
+              .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);
+    }
+  }
+}

core/src/main/java/google/registry/beam/BeamUtils.java

@@ -14,10 +14,14 @@
 
 package google.registry.beam;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
+import google.registry.util.Clock;
 import google.registry.util.ResourceUtils;
+import java.util.regex.Pattern;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
 
@@ -41,8 +45,7 @@ public class BeamUtils {
       ImmutableList<String> fieldNames, SchemaAndRecord schemaAndRecord) {
     GenericRecord record = schemaAndRecord.getRecord();
     ImmutableList<String> nullFields =
-        fieldNames
-            .stream()
+        fieldNames.stream()
             .filter(fieldName -> record.get(fieldName) == null)
             .collect(ImmutableList.toImmutableList());
     String missingFieldList = Joiner.on(", ").join(nullFields);
@@ -61,4 +64,19 @@ public class BeamUtils {
   public static String getQueryFromFile(Class<?> clazz, String filename) {
     return ResourceUtils.readResourceUtf8(Resources.getResource(clazz, "sql/" + filename));
   }
+
+  /** Creates a beam job name and validates that it conforms to the requirements. */
+  public static String createJobName(String prefix, Clock clock) {
+    // Flex template job name must be unique and consists of only characters [-a-z0-9], starting
+    // with a letter and ending with a letter or number. So we replace the "T" and "Z" in ISO 8601
+    // with lowercase letters.
+    String jobName =
+        String.format("%s-%s", prefix, clock.nowUtc().toString("yyyy-MM-dd't'HH-mm-ss'z'"));
+    checkArgument(
+        Pattern.compile("^[a-z][-a-z0-9]*[a-z0-9]*").matcher(jobName).matches(),
+        "The job name %s is illegal, it consists of only characters [-a-z0-9], "
+            + "starting with a letter and ending with a letter or number,",
+        jobName);
+    return jobName;
+  }
 }

core/src/main/java/google/registry/beam/common/JpaDemoPipeline.java

@@ -18,17 +18,23 @@ import static com.google.common.base.Verify.verify;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 
 import google.registry.backup.AppEngineEnvironment;
+import google.registry.model.contact.ContactResource;
+import google.registry.persistence.transaction.CriteriaQueryBuilder;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import java.io.Serializable;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.metrics.Counter;
 import org.apache.beam.sdk.metrics.Metrics;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
 
-/** Toy pipeline that demonstrates how to use {@link JpaTransactionManager} in BEAM pipelines. */
+/**
+ * Toy pipeline that demonstrates how to use {@link JpaTransactionManager} in BEAM pipelines.
+ *
+ * <p>This pipeline may also be used as an integration test for {@link RegistryJpaIO.Read} in a
+ * project with realistic data.
+ */
 public class JpaDemoPipeline implements Serializable {
 
   public static void main(String[] args) {
@@ -38,23 +44,16 @@ public class JpaDemoPipeline implements Serializable {
 
     Pipeline pipeline = Pipeline.create(options);
     pipeline
-        .apply("Start", Create.of((Void) null))
         .apply(
-            "Generate Elements",
-            ParDo.of(
-                new DoFn<Void, Void>() {
-                  @ProcessElement
-                  public void processElement(OutputReceiver<Void> output) {
-                    for (int i = 0; i < 500; i++) {
-                      output.output(null);
-                    }
-                  }
-                }))
+            "Read contacts",
+            RegistryJpaIO.read(
+                () -> CriteriaQueryBuilder.create(ContactResource.class).build(),
+                ContactResource::getRepoId))
         .apply(
-            "Make Query",
+            "Count Contacts",
             ParDo.of(
-                new DoFn<Void, Void>() {
-                  private Counter counter = Metrics.counter("Demo", "Read");
+                new DoFn<String, Void>() {
+                  private Counter counter = Metrics.counter("Contacts", "Read");
 
                   @ProcessElement
                   public void processElement() {

core/src/main/java/google/registry/beam/common/RegistryJpaIO.java

@@ -0,0 +1,395 @@
+// 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.beam.common.RegistryQuery.CriteriaQuerySupplier;
+import google.registry.model.ofy.ObjectifyService;
+import google.registry.persistence.transaction.JpaTransactionManager;
+import google.registry.persistence.transaction.TransactionManagerFactory;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ThreadLocalRandom;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaQuery;
+import org.apache.beam.sdk.coders.Coder;
+import org.apache.beam.sdk.coders.SerializableCoder;
+import org.apache.beam.sdk.metrics.Counter;
+import org.apache.beam.sdk.metrics.Metrics;
+import org.apache.beam.sdk.transforms.Create;
+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.Reshuffle;
+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.PBegin;
+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 <R> Read<R, R> read(CriteriaQuerySupplier<R> query) {
+    return read(query, x -> x);
+  }
+
+  public static <R, T> Read<R, T> read(
+      CriteriaQuerySupplier<R> query, SerializableFunction<R, T> resultMapper) {
+    return Read.<R, T>builder().criteriaQuery(query).resultMapper(resultMapper).build();
+  }
+
+  public static <R, T> Read<R, T> read(
+      String sql, boolean nativeQuery, SerializableFunction<R, T> resultMapper) {
+    return read(sql, null, nativeQuery, resultMapper);
+  }
+
+  /**
+   * Returns a {@link Read} connector based on the given {@code jpql} query string.
+   *
+   * <p>User should take care to prevent sql-injection attacks.
+   */
+  public static <R, T> Read<R, T> read(
+      String sql,
+      @Nullable Map<String, Object> parameter,
+      boolean nativeQuery,
+      SerializableFunction<R, T> resultMapper) {
+    Read.Builder<R, T> builder = Read.builder();
+    if (nativeQuery) {
+      builder.nativeQuery(sql, parameter);
+    } else {
+      builder.jpqlQuery(sql, parameter);
+    }
+    return builder.resultMapper(resultMapper).build();
+  }
+
+  public static <R, T> Read<R, T> read(
+      String jpql, Class<R> clazz, SerializableFunction<R, T> resultMapper) {
+    return read(jpql, null, clazz, resultMapper);
+  }
+
+  /**
+   * Returns a {@link Read} connector based on the given {@code jpql} typed query string.
+   *
+   * <p>User should take care to prevent sql-injection attacks.
+   */
+  public static <R, T> Read<R, T> read(
+      String jpql,
+      @Nullable Map<String, Object> parameter,
+      Class<R> clazz,
+      SerializableFunction<R, T> resultMapper) {
+    return Read.<R, T>builder()
+        .jpqlQuery(jpql, clazz, parameter)
+        .resultMapper(resultMapper)
+        .build();
+  }
+
+  public static <T> Write<T> write() {
+    return Write.<T>builder().build();
+  }
+
+  /**
+   * A {@link PTransform transform} that transactionally executes a JPA {@link CriteriaQuery} and
+   * adds the results to the BEAM pipeline. Users have the option to transform the results before
+   * sending them to the next stages.
+   */
+  @AutoValue
+  public abstract static class Read<R, T> extends PTransform<PBegin, PCollection<T>> {
+
+    public static final String DEFAULT_NAME = "RegistryJpaIO.Read";
+
+    abstract String name();
+
+    abstract RegistryQuery<R> query();
+
+    abstract SerializableFunction<R, T> resultMapper();
+
+    abstract Coder<T> coder();
+
+    abstract Builder<R, T> toBuilder();
+
+    @Override
+    @SuppressWarnings("deprecation") // Reshuffle still recommended by GCP.
+    public PCollection<T> expand(PBegin input) {
+      return input
+          .apply("Starting " + name(), Create.of((Void) null))
+          .apply("Run query for " + name(), ParDo.of(new QueryRunner<>(query(), resultMapper())))
+          .setCoder(coder())
+          .apply("Reshuffle", Reshuffle.viaRandomKey());
+    }
+
+    public Read<R, T> withName(String name) {
+      return toBuilder().name(name).build();
+    }
+
+    public Read<R, T> withResultMapper(SerializableFunction<R, T> mapper) {
+      return toBuilder().resultMapper(mapper).build();
+    }
+
+    public Read<R, T> withCoder(Coder<T> coder) {
+      return toBuilder().coder(coder).build();
+    }
+
+    static <R, T> Builder<R, T> builder() {
+      return new AutoValue_RegistryJpaIO_Read.Builder<R, T>()
+          .name(DEFAULT_NAME)
+          .coder(SerializableCoder.of(Serializable.class));
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder<R, T> {
+
+      abstract Builder<R, T> name(String name);
+
+      abstract Builder<R, T> query(RegistryQuery<R> query);
+
+      abstract Builder<R, T> resultMapper(SerializableFunction<R, T> mapper);
+
+      abstract Builder<R, T> coder(Coder coder);
+
+      abstract Read<R, T> build();
+
+      Builder<R, T> criteriaQuery(CriteriaQuerySupplier<R> criteriaQuery) {
+        return query(RegistryQuery.createQuery(criteriaQuery));
+      }
+
+      Builder<R, T> nativeQuery(String sql, Map<String, Object> parameters) {
+        return query(RegistryQuery.createQuery(sql, parameters, true));
+      }
+
+      Builder<R, T> jpqlQuery(String jpql, Map<String, Object> parameters) {
+        return query(RegistryQuery.createQuery(jpql, parameters, false));
+      }
+
+      Builder<R, T> jpqlQuery(String jpql, Class<R> clazz, Map<String, Object> parameters) {
+        return query(RegistryQuery.createQuery(jpql, parameters, clazz));
+      }
+    }
+
+    static class QueryRunner<R, T> extends DoFn<Void, T> {
+      private final RegistryQuery<R> query;
+      private final SerializableFunction<R, T> resultMapper;
+
+      QueryRunner(RegistryQuery<R> query, SerializableFunction<R, T> resultMapper) {
+        this.query = query;
+        this.resultMapper = resultMapper;
+      }
+
+      @ProcessElement
+      public void processElement(OutputReceiver<T> outputReceiver) {
+        // AppEngineEnvironment is need for handling VKeys, which involve Ofy keys. Unlike
+        // SqlBatchWriter, it is unnecessary to initialize ObjectifyService in this class.
+        try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+          // TODO(b/187210388): JpaTransactionManager should support non-transactional query.
+          jpaTm()
+              .transactNoRetry(
+                  () -> query.stream().map(resultMapper::apply).forEach(outputReceiver::output));
+        }
+      }
+    }
+  }
+
+  /**
+   * 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() {
+      // AppEngineEnvironment is needed as long as Objectify keys are still involved in the handling
+      // of SQL entities (e.g., in VKeys). ObjectifyService needs to be initialized when conversion
+      // between Ofy entity and Datastore entity is needed.
+      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);
+    }
+  }
+}

core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java

@@ -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();
+  }
 }

core/src/main/java/google/registry/beam/common/RegistryPipelineOptions.java

@@ -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(

core/src/main/java/google/registry/beam/common/RegistryPipelineWorkerInitializer.java

@@ -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);
   }
 }

core/src/main/java/google/registry/beam/common/RegistryQuery.java

@@ -0,0 +1,116 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.beam.common;
+
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaQuery;
+
+/** Interface for query instances used by {@link RegistryJpaIO.Read}. */
+public interface RegistryQuery<T> extends Serializable {
+  Stream<T> stream();
+
+  interface CriteriaQuerySupplier<T> extends Supplier<CriteriaQuery<T>>, Serializable {}
+
+  /**
+   * Returns a {@link RegistryQuery} that creates a string query from constant text.
+   *
+   * @param nativeQuery whether the given string is to be interpreted as a native query or JPQL.
+   * @param parameters parameters to be substituted in the query.
+   * @param <T> Type of each row in the result set, {@link Object} in single-select queries, and
+   *     {@code Object[]} in multi-select queries.
+   */
+  static <T> RegistryQuery<T> createQuery(
+      String sql, @Nullable Map<String, Object> parameters, boolean nativeQuery) {
+    return () -> {
+      EntityManager entityManager = jpaTm().getEntityManager();
+      Query query =
+          nativeQuery ? entityManager.createNativeQuery(sql) : entityManager.createQuery(sql);
+      if (parameters != null) {
+        parameters.forEach(query::setParameter);
+      }
+      @SuppressWarnings("unchecked")
+      Stream<T> resultStream = query.getResultStream();
+      return nativeQuery ? resultStream : resultStream.map(e -> detach(entityManager, e));
+    };
+  }
+
+  /**
+   * Returns a {@link RegistryQuery} that creates a typed JPQL query from constant text.
+   *
+   * @param parameters parameters to be substituted in the query.
+   * @param <T> Type of each row in the result set.
+   */
+  static <T> RegistryQuery<T> createQuery(
+      String jpql, @Nullable Map<String, Object> parameters, Class<T> clazz) {
+    return () -> {
+      TypedQuery<T> query = jpaTm().query(jpql, clazz);
+      if (parameters != null) {
+        parameters.forEach(query::setParameter);
+      }
+      return query.getResultStream();
+    };
+  }
+
+  /**
+   * Returns a {@link RegistryQuery} from a {@link CriteriaQuery} supplier.
+   *
+   * <p>A serializable supplier is needed in because {@link CriteriaQuery} itself must be created
+   * within a transaction, and we are not in a transaction yet when this function is called to set
+   * up the pipeline.
+   *
+   * @param <T> Type of each row in the result set.
+   */
+  static <T> RegistryQuery<T> createQuery(CriteriaQuerySupplier<T> criteriaQuery) {
+    return () -> jpaTm().query(criteriaQuery.get()).getResultStream();
+  }
+
+  /**
+   * Removes an object from the JPA session cache if applicable.
+   *
+   * @param object An object that represents a row in the result set. It may be a JPA entity, a
+   *     non-entity object, or an array that holds JPA entities and/or non-entities.
+   */
+  static <T> T detach(EntityManager entityManager, T object) {
+    if (object.getClass().isArray()) {
+      for (Object arrayElement : (Object[]) object) {
+        detachObject(entityManager, arrayElement);
+      }
+    } else {
+      detachObject(entityManager, object);
+    }
+    return object;
+  }
+
+  static void detachObject(EntityManager entityManager, Object object) {
+    Class<?> objectClass = object.getClass();
+    if (objectClass.isPrimitive() || objectClass == String.class) {
+      return;
+    }
+    try {
+      entityManager.detach(object);
+    } catch (IllegalArgumentException e) {
+      // Not an entity. Do nothing.
+    }
+  }
+}

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

@@ -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.
@@ -87,20 +87,18 @@ public class BulkDeletePipeline {
 
   private final BulkDeletePipelineOptions options;
 
-  private final Pipeline pipeline;
-
-  BulkDeletePipeline(BulkDeletePipelineOptions options) {
+  BulkDeleteDatastorePipeline(BulkDeletePipelineOptions options) {
     this.options = options;
-    pipeline = Pipeline.create(options);
   }
 
   public void run() {
-    setupPipeline();
+    Pipeline pipeline = Pipeline.create(options);
+    setupPipeline(pipeline);
     pipeline.run();
   }
 
   @SuppressWarnings("deprecation") // org.apache.beam.sdk.transforms.Reshuffle
-  private void setupPipeline() {
+  private void setupPipeline(Pipeline pipeline) {
     checkState(
         !FORBIDDEN_PROJECTS.contains(options.getProject()),
         "Bulk delete is forbidden in %s",
@@ -303,7 +301,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);
   }

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

@@ -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());

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

@@ -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. */

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

@@ -1,201 +0,0 @@
-// 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.initsql;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Strings.isNullOrEmpty;
-
-import com.google.common.base.Splitter;
-import dagger.Component;
-import dagger.Lazy;
-import dagger.Module;
-import dagger.Provides;
-import google.registry.config.CredentialModule;
-import google.registry.config.RegistryConfig.Config;
-import google.registry.config.RegistryConfig.ConfigModule;
-import google.registry.keyring.kms.KmsModule;
-import google.registry.persistence.PersistenceModule;
-import google.registry.persistence.PersistenceModule.JdbcJpaTm;
-import google.registry.persistence.PersistenceModule.SocketFactoryJpaTm;
-import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
-import google.registry.persistence.transaction.JpaTransactionManager;
-import google.registry.privileges.secretmanager.SecretManagerModule;
-import google.registry.util.UtilsModule;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.channels.Channels;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import javax.annotation.Nullable;
-import javax.inject.Singleton;
-import org.apache.beam.sdk.io.FileSystems;
-import org.apache.beam.sdk.io.fs.ResourceId;
-
-/**
- * Provides bindings for {@link JpaTransactionManager} to Cloud SQL.
- *
- * <p>This module is intended for use in BEAM pipelines, and uses a BEAM utility to access GCS like
- * a regular file system.
- */
-@Module
-public class BeamJpaModule {
-
-  private static final String GCS_SCHEME = "gs://";
-
-  @Nullable private final String sqlAccessInfoFile;
-  @Nullable private final String cloudKmsProjectId;
-  @Nullable private final TransactionIsolationLevel isolationOverride;
-
-  /**
-   * Constructs a new instance of {@link BeamJpaModule}.
-   *
-   * <p>Note: it is an unfortunately necessary antipattern to check for the validity of
-   * sqlAccessInfoFile in {@link #provideCloudSqlAccessInfo} rather than in the constructor.
-   * Unfortunately, this is a restriction imposed upon us by Dagger. Specifically, because we use
-   * this in at least one 1 {@link google.registry.tools.RegistryTool} command(s), it must be
-   * instantiated in {@code google.registry.tools.RegistryToolComponent} for all possible commands;
-   * Dagger doesn't permit it to ever be null. For the vast majority of commands, it will never be
-   * used (so a null credential file path is fine in those cases).
-   *
-   * @param sqlAccessInfoFile the path to a Cloud SQL credential file. This must refer to either a
-   *     real encrypted file on GCS as returned by {@link
-   *     BackupPaths#getCloudSQLCredentialFilePatterns} or an unencrypted file on local filesystem
-   *     with credentials to a test database.
-   * @param cloudKmsProjectId the GCP project where the credential decryption key can be found
-   * @param isolationOverride the desired Transaction Isolation level for all JDBC connections
-   */
-  public BeamJpaModule(
-      @Nullable String sqlAccessInfoFile,
-      @Nullable String cloudKmsProjectId,
-      @Nullable TransactionIsolationLevel isolationOverride) {
-    this.sqlAccessInfoFile = sqlAccessInfoFile;
-    this.cloudKmsProjectId = cloudKmsProjectId;
-    this.isolationOverride = isolationOverride;
-  }
-
-  public BeamJpaModule(@Nullable String sqlAccessInfoFile, @Nullable String cloudKmsProjectId) {
-    this(sqlAccessInfoFile, cloudKmsProjectId, null);
-  }
-
-  /** Returns true if the credential file is on GCS (and therefore expected to be encrypted). */
-  private boolean isCloudSqlCredential() {
-    return sqlAccessInfoFile.startsWith(GCS_SCHEME);
-  }
-
-  @Provides
-  @Singleton
-  SqlAccessInfo provideCloudSqlAccessInfo(Lazy<CloudSqlCredentialDecryptor> lazyDecryptor) {
-    checkArgument(!isNullOrEmpty(sqlAccessInfoFile), "Null or empty credentialFilePath");
-    String line = readOnlyLineFromCredentialFile();
-    if (isCloudSqlCredential()) {
-      line = lazyDecryptor.get().decrypt(line);
-    }
-    // See ./BackupPaths.java for explanation of the line format.
-    List<String> parts = Splitter.on(' ').splitToList(line.trim());
-    checkState(parts.size() == 3, "Expecting three phrases in %s", line);
-    if (isCloudSqlCredential()) {
-      return SqlAccessInfo.createCloudSqlAccessInfo(parts.get(0), parts.get(1), parts.get(2));
-    } else {
-      return SqlAccessInfo.createLocalSqlAccessInfo(parts.get(0), parts.get(1), parts.get(2));
-    }
-  }
-
-  String readOnlyLineFromCredentialFile() {
-    try {
-      ResourceId resourceId = FileSystems.matchSingleFileSpec(sqlAccessInfoFile).resourceId();
-      try (BufferedReader reader =
-          new BufferedReader(
-              new InputStreamReader(
-                  Channels.newInputStream(FileSystems.open(resourceId)), StandardCharsets.UTF_8))) {
-        return reader.readLine();
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Provides
-  @Config("beamCloudSqlJdbcUrl")
-  String provideJdbcUrl(SqlAccessInfo sqlAccessInfo) {
-    return sqlAccessInfo.jdbcUrl();
-  }
-
-  @Provides
-  @Config("beamCloudSqlInstanceConnectionName")
-  String provideSqlInstanceName(SqlAccessInfo sqlAccessInfo) {
-    return sqlAccessInfo
-        .cloudSqlInstanceName()
-        .orElseThrow(() -> new IllegalStateException("Cloud SQL not provisioned."));
-  }
-
-  @Provides
-  @Config("beamCloudSqlUsername")
-  String provideSqlUsername(SqlAccessInfo sqlAccessInfo) {
-    return sqlAccessInfo.user();
-  }
-
-  @Provides
-  @Config("beamCloudSqlPassword")
-  String provideSqlPassword(SqlAccessInfo sqlAccessInfo) {
-    return sqlAccessInfo.password();
-  }
-
-  @Provides
-  @Config("beamCloudKmsProjectId")
-  String kmsProjectId() {
-    return cloudKmsProjectId;
-  }
-
-  @Provides
-  @Config("beamCloudKmsKeyRing")
-  static String keyRingName() {
-    return "nomulus-tool-keyring";
-  }
-
-  @Provides
-  @Config("beamIsolationOverride")
-  @Nullable
-  TransactionIsolationLevel providesIsolationOverride() {
-    return isolationOverride;
-  }
-
-  @Provides
-  @Config("beamHibernateHikariMaximumPoolSize")
-  static int getBeamHibernateHikariMaximumPoolSize() {
-    // TODO(weiminyu): make this configurable. Should be equal to number of cores.
-    return 4;
-  }
-
-  @Singleton
-  @Component(
-      modules = {
-        ConfigModule.class,
-        CredentialModule.class,
-        BeamJpaModule.class,
-        KmsModule.class,
-        PersistenceModule.class,
-        SecretManagerModule.class,
-        UtilsModule.class
-      })
-  public interface JpaTransactionManagerComponent {
-    @SocketFactoryJpaTm
-    JpaTransactionManager cloudSqlJpaTransactionManager();
-
-    @JdbcJpaTm
-    JpaTransactionManager localDbJpaTransactionManager();
-  }
-}

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

@@ -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;
@@ -122,31 +120,23 @@ public class InitSqlPipeline implements Serializable {
 
   private final InitSqlPipelineOptions options;
 
-  private final Pipeline pipeline;
-
-  private final SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager>
-      jpaGetter;
-
   InitSqlPipeline(InitSqlPipelineOptions options) {
     this.options = options;
-    pipeline = Pipeline.create(options);
-    jpaGetter = JpaTransactionManagerComponent::cloudSqlJpaTransactionManager;
+  }
+
+  PipelineResult run() {
+    return run(Pipeline.create(options));
   }
 
   @VisibleForTesting
-  InitSqlPipeline(InitSqlPipelineOptions options, Pipeline pipeline) {
-    this.options = options;
-    this.pipeline = pipeline;
-    jpaGetter = JpaTransactionManagerComponent::localDbJpaTransactionManager;
-  }
-
-  public PipelineResult run() {
-    setupPipeline();
+  PipelineResult run(Pipeline pipeline) {
+    setupPipeline(pipeline);
     return pipeline.run();
   }
 
   @VisibleForTesting
-  void setupPipeline() {
+  void setupPipeline(Pipeline pipeline) {
+    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_READ_UNCOMMITTED);
     PCollectionTuple datastoreSnapshot =
         pipeline.apply(
             "Load Datastore snapshot",
@@ -223,22 +213,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) {

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

@@ -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);
 }

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

@@ -1,60 +0,0 @@
-// 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.initsql;
-
-import google.registry.beam.initsql.BeamJpaModule.JpaTransactionManagerComponent;
-import google.registry.beam.initsql.Transforms.SerializableSupplier;
-import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
-import google.registry.persistence.transaction.JpaTransactionManager;
-import javax.annotation.Nullable;
-import org.apache.beam.sdk.transforms.SerializableFunction;
-
-public class JpaSupplierFactory implements SerializableSupplier<JpaTransactionManager> {
-
-  private static final long serialVersionUID = 1L;
-
-  private final String credentialFileUrl;
-  @Nullable private final String cloudKmsProjectId;
-  private final SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager>
-      jpaGetter;
-  @Nullable private final TransactionIsolationLevel isolationLevelOverride;
-
-  public JpaSupplierFactory(
-      String credentialFileUrl,
-      @Nullable String cloudKmsProjectId,
-      SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager> jpaGetter) {
-    this(credentialFileUrl, cloudKmsProjectId, jpaGetter, null);
-  }
-
-  public JpaSupplierFactory(
-      String credentialFileUrl,
-      @Nullable String cloudKmsProjectId,
-      SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager> jpaGetter,
-      @Nullable TransactionIsolationLevel isolationLevelOverride) {
-    this.credentialFileUrl = credentialFileUrl;
-    this.cloudKmsProjectId = cloudKmsProjectId;
-    this.jpaGetter = jpaGetter;
-    this.isolationLevelOverride = isolationLevelOverride;
-  }
-
-  @Override
-  public JpaTransactionManager get() {
-    return jpaGetter.apply(
-        DaggerBeamJpaModule_JpaTransactionManagerComponent.builder()
-            .beamJpaModule(
-                new BeamJpaModule(credentialFileUrl, cloudKmsProjectId, isolationLevelOverride))
-            .build());
-  }
-}

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

@@ -19,13 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.beam.initsql.BackupPaths.getCommitLogTimestamp;
 import static google.registry.beam.initsql.BackupPaths.getExportFilePatterns;
-import static google.registry.model.ofy.ObjectifyService.ofy;
-import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
-import static google.registry.persistence.transaction.TransactionManagerFactory.setJpaTm;
+import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static java.util.Comparator.comparing;
-import static org.apache.beam.sdk.values.TypeDescriptors.integers;
 import static org.apache.beam.sdk.values.TypeDescriptors.kvs;
 import static org.apache.beam.sdk.values.TypeDescriptors.strings;
 
@@ -35,15 +32,14 @@ import com.google.appengine.api.datastore.EntityTranslator;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
-import com.googlecode.objectify.Key;
-import google.registry.backup.AppEngineEnvironment;
 import google.registry.backup.CommitLogImports;
 import google.registry.backup.VersionedEntity;
+import google.registry.model.billing.BillingEvent.Flag;
+import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainBase;
-import google.registry.model.ofy.ObjectifyService;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.schema.replay.SqlEntity;
 import google.registry.tools.LevelDbLogReader;
@@ -53,7 +49,6 @@ import java.util.Iterator;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -62,18 +57,14 @@ import org.apache.beam.sdk.io.FileIO;
 import org.apache.beam.sdk.io.FileIO.ReadableFile;
 import org.apache.beam.sdk.io.fs.EmptyMatchTreatment;
 import org.apache.beam.sdk.io.fs.MatchResult.Metadata;
-import org.apache.beam.sdk.metrics.Counter;
-import org.apache.beam.sdk.metrics.Metrics;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.Flatten;
 import org.apache.beam.sdk.transforms.GroupByKey;
-import org.apache.beam.sdk.transforms.GroupIntoBatches;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.transforms.ProcessFunction;
-import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PBegin;
 import org.apache.beam.sdk.values.PCollection;
@@ -268,81 +259,58 @@ public final class Transforms {
                     .iterator()));
   }
 
-  /**
-   * Returns a {@link PTransform} that writes a {@link PCollection} of {@link VersionedEntity}s to a
-   * SQL database. and outputs an empty {@code PCollection<Void>}. This allows other operations to
-   * {@link org.apache.beam.sdk.transforms.Wait wait} for the completion of this transform.
-   *
-   * <p>Errors are handled according to the pipeline runner's default policy. As part of a one-time
-   * job, we will not add features unless proven necessary.
-   *
-   * @param transformId a unique ID for an instance of the returned transform
-   * @param maxWriters the max number of concurrent writes to SQL, which also determines the max
-   *     number of connection pools created
-   * @param batchSize the number of entities to write in each operation
-   * @param jpaSupplier supplier of a {@link JpaTransactionManager}
-   */
-  public static PTransform<PCollection<VersionedEntity>, PCollection<Void>> writeToSql(
-      String transformId,
-      int maxWriters,
-      int batchSize,
-      SerializableSupplier<JpaTransactionManager> jpaSupplier) {
-    return writeToSql(
-        transformId,
-        maxWriters,
-        batchSize,
-        jpaSupplier,
-        Transforms::convertVersionedEntityToSqlEntity,
-        TypeDescriptor.of(VersionedEntity.class));
-  }
+  // Production data repair configs go below. See b/185954992.
 
-  /**
-   * Returns a {@link PTransform} that writes a {@link PCollection} of entities to a SQL database.
-   * and outputs an empty {@code PCollection<Void>}. This allows other operations to {@link
-   * org.apache.beam.sdk.transforms.Wait wait} for the completion of this transform.
-   *
-   * <p>The converter and type descriptor are generics so that we can convert any type of entity to
-   * an object to be placed in SQL.
-   *
-   * <p>Errors are handled according to the pipeline runner's default policy. As part of a one-time
-   * job, we will not add features unless proven necessary.
-   *
-   * @param transformId a unique ID for an instance of the returned transform
-   * @param maxWriters the max number of concurrent writes to SQL, which also determines the max
-   *     number of connection pools created
-   * @param batchSize the number of entities to write in each operation
-   * @param jpaSupplier supplier of a {@link JpaTransactionManager}
-   * @param jpaConverter the function that converts the input object to a JPA entity
-   * @param objectDescriptor the type descriptor of the input object
-   */
-  public static <T> PTransform<PCollection<T>, PCollection<Void>> writeToSql(
-      String transformId,
-      int maxWriters,
-      int batchSize,
-      SerializableSupplier<JpaTransactionManager> jpaSupplier,
-      SerializableFunction<T, Object> jpaConverter,
-      TypeDescriptor<T> objectDescriptor) {
-    return new PTransform<PCollection<T>, PCollection<Void>>() {
-      @Override
-      public PCollection<Void> expand(PCollection<T> input) {
-        return input
-            .apply(
-                "Shard data for " + transformId,
-                MapElements.into(kvs(integers(), objectDescriptor))
-                    .via(ve -> KV.of(ThreadLocalRandom.current().nextInt(maxWriters), ve)))
-            .apply("Batch output by shard " + transformId, GroupIntoBatches.ofSize(batchSize))
-            .apply(
-                "Write in batch for " + transformId,
-                ParDo.of(new SqlBatchWriter<T>(transformId, jpaSupplier, jpaConverter)));
-      }
-    };
-  }
+  // Prober domains in bad state, without associated contacts, hosts, billings, and history.
+  // They can be safely ignored.
+  private static final ImmutableSet<String> IGNORED_DOMAINS =
+      ImmutableSet.of("6AF6D2-IQCANT", "2-IQANYT");
 
-  private static Key toOfyKey(Object ofyEntity) {
-    return Key.create(ofyEntity);
-  }
+  // Prober hosts referencing phantom registrars. They and their associated history entries can be
+  // safely ignored.
+  private static final ImmutableSet<String> IGNORED_HOSTS =
+      ImmutableSet.of(
+          "4E21_WJ0TEST-GOOGLE",
+          "4E21_WJ1TEST-GOOGLE",
+          "4E21_WJ2TEST-GOOGLE",
+          "4E21_WJ3TEST-GOOGLE");
+
+  // Prober contacts referencing phantom registrars. They and their associated history entries can
+  // be safely ignored.
+  private static final ImmutableSet IGNORED_CONTACTS =
+      ImmutableSet.of(
+          "1_WJ0TEST-GOOGLE", "1_WJ1TEST-GOOGLE", "1_WJ2TEST-GOOGLE", "1_WJ3TEST-GOOGLE");
 
   private static boolean isMigratable(Entity entity) {
+    // Checks specific to production data. See b/185954992 for details.
+    // The names of these bad entities in production do not conflict with other environments. For
+    // simplicities sake we apply them regardless of the source of the data.
+    if (entity.getKind().equals("DomainBase")
+        && IGNORED_DOMAINS.contains(entity.getKey().getName())) {
+      return false;
+    }
+    if (entity.getKind().equals("ContactResource")) {
+      String roid = entity.getKey().getName();
+      return !IGNORED_CONTACTS.contains(roid);
+    }
+    if (entity.getKind().equals("HostResource")) {
+      String roid = entity.getKey().getName();
+      return !IGNORED_HOSTS.contains(roid);
+    }
+    if (entity.getKind().equals("HistoryEntry")) {
+      // Remove production bad data: History of the contacts to be ignored:
+      com.google.appengine.api.datastore.Key parentKey = entity.getKey().getParent();
+      if (parentKey.getKind().equals("ContactResource")) {
+        String contactRoid = parentKey.getName();
+        return !IGNORED_CONTACTS.contains(contactRoid);
+      }
+      if (parentKey.getKind().equals("HostResource")) {
+        String hostRoid = parentKey.getName();
+        return !IGNORED_HOSTS.contains(hostRoid);
+      }
+    }
+    // End of production-specific checks.
+
     if (entity.getKind().equals("HistoryEntry")) {
       // DOMAIN_APPLICATION_CREATE is deprecated type and should not be migrated.
       // The Enum name DOMAIN_APPLICATION_CREATE no longer exists in Java and cannot
@@ -352,6 +320,18 @@ public final class Transforms {
     return true;
   }
 
+  private static Entity repairBadData(Entity entity) {
+    if (entity.getKind().equals("Cancellation")
+        && Objects.equals(entity.getProperty("reason"), "AUTO_RENEW")) {
+      // AUTO_RENEW has been moved from 'reason' to flags. Change reason to RENEW and add the
+      // AUTO_RENEW flag. Note: all affected entities have empty flags so we can simply assign
+      // instead of append. See b/185954992.
+      entity.setUnindexedProperty("reason", Reason.RENEW.name());
+      entity.setUnindexedProperty("flags", ImmutableList.of(Flag.AUTO_RENEW.name()));
+    }
+    return entity;
+  }
+
   private static SqlEntity toSqlEntity(Object ofyEntity) {
     if (ofyEntity instanceof HistoryEntry) {
       HistoryEntry ofyHistory = (HistoryEntry) ofyEntity;
@@ -368,11 +348,12 @@ 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)
-        .map(e -> ofy().toPojo(e))
+        .map(Transforms::repairBadData)
+        .map(e -> auditedOfy().toPojo(e))
         .map(Transforms::toSqlEntity)
         .orElse(null);
   }
@@ -458,93 +439,6 @@ public final class Transforms {
     }
   }
 
-  /**
-   * Writes a batch of entities to a SQL database.
-   *
-   * <p>Note that an arbitrary number of instances of this class may be created and freed in
-   * arbitrary order in a single JVM. Due to the tech debt that forced us to use a static variable
-   * to hold the {@code JpaTransactionManager} instance, we must ensure that JpaTransactionManager
-   * is not changed or torn down while being used by some instance.
-   */
-  private static class SqlBatchWriter<T> extends DoFn<KV<Integer, Iterable<T>>, Void> {
-
-    private static int instanceCount = 0;
-    private static JpaTransactionManager originalJpa;
-
-    private Counter counter;
-
-    private final SerializableSupplier<JpaTransactionManager> jpaSupplier;
-    private final SerializableFunction<T, Object> jpaConverter;
-
-    SqlBatchWriter(
-        String type,
-        SerializableSupplier<JpaTransactionManager> jpaSupplier,
-        SerializableFunction<T, Object> jpaConverter) {
-      counter = Metrics.counter("SQL_WRITE", type);
-      this.jpaSupplier = jpaSupplier;
-      this.jpaConverter = jpaConverter;
-    }
-
-    @Setup
-    public void setup() {
-      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
-        ObjectifyService.initOfy();
-      }
-
-      synchronized (SqlBatchWriter.class) {
-        if (instanceCount == 0) {
-          originalJpa = jpaTm();
-          setJpaTm(jpaSupplier);
-        }
-        instanceCount++;
-      }
-    }
-
-    @Teardown
-    public void teardown() {
-      synchronized (SqlBatchWriter.class) {
-        instanceCount--;
-        if (instanceCount == 0) {
-          jpaTm().teardown();
-          setJpaTm(() -> originalJpa);
-        }
-      }
-    }
-
-    @ProcessElement
-    public void processElement(@Element KV<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);
-        }
-      }
-    }
-  }
-
   /**
    * Removes BillingEvents, {@link google.registry.model.poll.PollMessage PollMessages} and {@link
    * google.registry.model.host.HostResource} from a {@link DomainBase}. These are circular foreign

core/src/main/java/google/registry/beam/invoicing/BillingEvent.java

@@ -251,7 +251,14 @@ public abstract class BillingEvent implements Serializable {
   InvoiceGroupingKey getInvoiceGroupingKey() {
     return new AutoValue_BillingEvent_InvoiceGroupingKey(
         billingTime().toLocalDate().withDayOfMonth(1).toString(),
-        billingTime().toLocalDate().withDayOfMonth(1).plusYears(years()).minusDays(1).toString(),
+        years() == 0
+            ? ""
+            : billingTime()
+                .toLocalDate()
+                .withDayOfMonth(1)
+                .plusYears(years())
+                .minusDays(1)
+                .toString(),
         billingId(),
         String.format("%s - %s", registrarId(), tld()),
         String.format("%s | TLD: %s | TERM: %d-year", action(), tld(), years()),
@@ -260,6 +267,11 @@ public abstract class BillingEvent implements Serializable {
         poNumber());
   }
 
+  /** Returns the grouping key for this {@code BillingEvent}, to generate the detailed report. */
+  String getDetailedReportGroupingKey() {
+    return String.format("%s_%s", registrarId(), tld());
+  }
+
   /** Key for each {@code BillingEvent}, when aggregating for the overall invoice. */
   @AutoValue
   abstract static class InvoiceGroupingKey implements Serializable {

core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java

@@ -14,28 +14,27 @@
 
 package google.registry.beam.invoicing;
 
-import com.google.auth.oauth2.GoogleCredentials;
+import static google.registry.beam.BeamUtils.getQueryFromFile;
+import static org.apache.beam.sdk.values.TypeDescriptors.strings;
+
 import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey;
 import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey.InvoiceGroupingKeyCoder;
-import google.registry.config.CredentialModule.LocalCredential;
-import google.registry.config.RegistryConfig.Config;
 import google.registry.reporting.billing.BillingModule;
-import google.registry.reporting.billing.GenerateInvoicesAction;
-import google.registry.util.GoogleCredentialsBundle;
+import google.registry.util.SqlTemplate;
 import java.io.Serializable;
-import javax.inject.Inject;
-import org.apache.beam.runners.dataflow.DataflowRunner;
-import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.SerializableCoder;
-import org.apache.beam.sdk.io.DefaultFilenamePolicy.Params;
-import org.apache.beam.sdk.io.FileBasedSink;
+import org.apache.beam.sdk.coders.StringUtf8Coder;
+import org.apache.beam.sdk.io.FileIO;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
-import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.options.ValueProvider;
-import org.apache.beam.sdk.options.ValueProvider.NestedValueProvider;
+import org.apache.beam.sdk.transforms.Contextful;
 import org.apache.beam.sdk.transforms.Count;
 import org.apache.beam.sdk.transforms.Filter;
 import org.apache.beam.sdk.transforms.MapElements;
@@ -43,107 +42,48 @@ import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TypeDescriptor;
-import org.apache.beam.sdk.values.TypeDescriptors;
 
 /**
- * Definition of a Dataflow pipeline template, which generates a given month's invoices.
+ * Definition of a Dataflow Flex pipeline template, which generates a given month's invoices.
  *
- * <p>To stage this template on GCS, run the {@link
- * google.registry.tools.DeployInvoicingPipelineCommand} Nomulus command.
+ * <p>To stage this template locally, run the {@code stage_beam_pipeline.sh} shell script.
  *
  * <p>Then, you can run the staged template via the API client library, gCloud or a raw REST call.
- * For an example using the API client library, see {@link GenerateInvoicesAction}.
  *
- * @see <a href="https://cloud.google.com/dataflow/docs/templates/overview">Dataflow Templates</a>
+ * @see <a href="https://cloud.google.com/dataflow/docs/guides/templates/using-flex-templates">Using
+ *     Flex Templates</a>
  */
 public class InvoicingPipeline implements Serializable {
 
-  private final String projectId;
-  private final String beamJobRegion;
-  private final String beamBucketUrl;
-  private final String invoiceTemplateUrl;
-  private final String beamStagingUrl;
-  private final String billingBucketUrl;
-  private final String invoiceFilePrefix;
-  private final GoogleCredentials googleCredentials;
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
 
-  @Inject
-  public InvoicingPipeline(
-      @Config("projectId") String projectId,
-      @Config("defaultJobRegion") String beamJobRegion,
-      @Config("apacheBeamBucketUrl") String beamBucketUrl,
-      @Config("invoiceTemplateUrl") String invoiceTemplateUrl,
-      @Config("beamStagingUrl") String beamStagingUrl,
-      @Config("billingBucketUrl") String billingBucketUrl,
-      @Config("invoiceFilePrefix") String invoiceFilePrefix,
-      @LocalCredential GoogleCredentialsBundle googleCredentialsBundle) {
-    this.projectId = projectId;
-    this.beamJobRegion = beamJobRegion;
-    this.beamBucketUrl = beamBucketUrl;
-    this.invoiceTemplateUrl = invoiceTemplateUrl;
-    this.beamStagingUrl = beamStagingUrl;
-    this.billingBucketUrl = billingBucketUrl;
-    this.invoiceFilePrefix = invoiceFilePrefix;
-    this.googleCredentials = googleCredentialsBundle.getGoogleCredentials();
+  private final InvoicingPipelineOptions options;
+
+  InvoicingPipeline(InvoicingPipelineOptions options) {
+    this.options = options;
   }
 
-  /** Custom options for running the invoicing pipeline. */
-  public interface InvoicingPipelineOptions extends DataflowPipelineOptions {
-    /** Returns the yearMonth we're generating invoices for, in yyyy-MM format. */
-    @Description("The yearMonth we generate invoices for, in yyyy-MM format.")
-    ValueProvider<String> getYearMonth();
-    /**
-     * Sets the yearMonth we generate invoices for.
-     *
-     * <p>This is implicitly set when executing the Dataflow template, by specifying the 'yearMonth
-     * parameter.
-     */
-    void setYearMonth(ValueProvider<String> value);
+  PipelineResult run() {
+    Pipeline pipeline = Pipeline.create(options);
+    setupPipeline(pipeline);
+    return pipeline.run();
   }
 
-  /** Deploys the invoicing pipeline as a template on GCS, for a given projectID and GCS bucket. */
-  public void deploy() {
-    // We can't store options as a member variable due to serialization concerns.
-    InvoicingPipelineOptions options = PipelineOptionsFactory.as(InvoicingPipelineOptions.class);
-    options.setProject(projectId);
-    options.setRegion(beamJobRegion);
-    options.setRunner(DataflowRunner.class);
-    // This causes p.run() to stage the pipeline as a template on GCS, as opposed to running it.
-    options.setTemplateLocation(invoiceTemplateUrl);
-    options.setStagingLocation(beamStagingUrl);
-    // This credential is used when Dataflow deploys the template to GCS in target GCP project.
-    // So, make sure the credential has write permission to GCS in that project.
-    options.setGcpCredential(googleCredentials);
-
-    Pipeline p = Pipeline.create(options);
-
+  void setupPipeline(Pipeline pipeline) {
     PCollection<BillingEvent> billingEvents =
-        p.apply(
+        pipeline.apply(
             "Read BillingEvents from Bigquery",
             BigQueryIO.read(BillingEvent::parseFromRecord)
-                .fromQuery(InvoicingUtils.makeQueryProvider(options.getYearMonth(), projectId))
+                .fromQuery(makeQuery(options.getYearMonth(), options.getProject()))
                 .withCoder(SerializableCoder.of(BillingEvent.class))
                 .usingStandardSql()
                 .withoutValidation()
                 .withTemplateCompatibility());
-    applyTerminalTransforms(billingEvents, options.getYearMonth());
-    p.run();
-  }
 
-  /**
-   * Applies output transforms to the {@code BillingEvent} source collection.
-   *
-   * <p>This is factored out purely to facilitate testing.
-   */
-  void applyTerminalTransforms(
-      PCollection<BillingEvent> billingEvents, ValueProvider<String> yearMonthProvider) {
-    billingEvents
-        .apply("Generate overall invoice rows", new GenerateInvoiceRows())
-        .apply("Write overall invoice to CSV", writeInvoice(yearMonthProvider));
+    saveInvoiceCsv(billingEvents, options);
 
-    billingEvents.apply(
-        "Write detail reports to separate CSVs keyed by registrarId_tld pair",
-        writeDetailReports(yearMonthProvider));
+    saveDetailedCsv(billingEvents, options);
   }
 
   /** Transform that converts a {@code BillingEvent} into an invoice CSV row. */
@@ -156,49 +96,85 @@ public class InvoicingPipeline implements Serializable {
               "Map to invoicing key",
               MapElements.into(TypeDescriptor.of(InvoiceGroupingKey.class))
                   .via(BillingEvent::getInvoiceGroupingKey))
-          .apply(Filter.by((InvoiceGroupingKey key) -> key.unitPrice() != 0))
+          .apply(
+              "Filter out free events", Filter.by((InvoiceGroupingKey key) -> key.unitPrice() != 0))
           .setCoder(new InvoiceGroupingKeyCoder())
           .apply("Count occurrences", Count.perElement())
           .apply(
               "Format as CSVs",
-              MapElements.into(TypeDescriptors.strings())
+              MapElements.into(strings())
                   .via((KV<InvoiceGroupingKey, Long> kv) -> kv.getKey().toCsv(kv.getValue())));
     }
   }
 
-  /** Returns an IO transform that writes the overall invoice to a single CSV file. */
-  private TextIO.Write writeInvoice(ValueProvider<String> yearMonthProvider) {
-    return TextIO.write()
-        .to(
-            NestedValueProvider.of(
-                yearMonthProvider,
-                yearMonth ->
+  /** Saves the billing events to a single overall invoice CSV file. */
+  static void saveInvoiceCsv(
+      PCollection<BillingEvent> billingEvents, InvoicingPipelineOptions options) {
+    billingEvents
+        .apply("Generate overall invoice rows", new GenerateInvoiceRows())
+        .apply(
+            "Write overall invoice to CSV",
+            TextIO.write()
+                .to(
                     String.format(
                         "%s/%s/%s/%s-%s",
-                        billingBucketUrl,
+                        options.getBillingBucketUrl(),
                         BillingModule.INVOICES_DIRECTORY,
-                        yearMonth,
-                        invoiceFilePrefix,
-                        yearMonth)))
-        .withHeader(InvoiceGroupingKey.invoiceHeader())
-        .withoutSharding()
-        .withSuffix(".csv");
+                        options.getYearMonth(),
+                        options.getInvoiceFilePrefix(),
+                        options.getYearMonth()))
+                .withHeader(InvoiceGroupingKey.invoiceHeader())
+                .withoutSharding()
+                .withSuffix(".csv"));
   }
 
-  /** Returns an IO transform that writes detail reports to registrar-tld keyed CSV files. */
-  private TextIO.TypedWrite<BillingEvent, Params> writeDetailReports(
-      ValueProvider<String> yearMonthProvider) {
-    return TextIO.<BillingEvent>writeCustomType()
-        .to(
-            InvoicingUtils.makeDestinationFunction(
-                String.format("%s/%s", billingBucketUrl, BillingModule.INVOICES_DIRECTORY),
-                yearMonthProvider),
-            InvoicingUtils.makeEmptyDestinationParams(billingBucketUrl + "/errors"))
-        .withFormatFunction(BillingEvent::toCsv)
-        .withoutSharding()
-        .withTempDirectory(
-            FileBasedSink.convertToFileResourceIfPossible(beamBucketUrl + "/temporary"))
-        .withHeader(BillingEvent.getHeader())
-        .withSuffix(".csv");
+  /** Saves the billing events to detailed report CSV files keyed by registrar-tld pairs. */
+  static void saveDetailedCsv(
+      PCollection<BillingEvent> billingEvents, InvoicingPipelineOptions options) {
+    String yearMonth = options.getYearMonth();
+    billingEvents.apply(
+        "Write detailed report for each registrar-tld pair",
+        FileIO.<String, BillingEvent>writeDynamic()
+            .to(
+                String.format(
+                    "%s/%s/%s",
+                    options.getBillingBucketUrl(), BillingModule.INVOICES_DIRECTORY, yearMonth))
+            .by(BillingEvent::getDetailedReportGroupingKey)
+            .withNumShards(1)
+            .withDestinationCoder(StringUtf8Coder.of())
+            .withNaming(
+                key ->
+                    (window, pane, numShards, shardIndex, compression) ->
+                        String.format(
+                            "%s_%s_%s.csv", BillingModule.DETAIL_REPORT_PREFIX, yearMonth, key))
+            .via(
+                Contextful.fn(BillingEvent::toCsv),
+                TextIO.sink().withHeader(BillingEvent.getHeader())));
+  }
+
+  /** Create the Bigquery query for a given project and yearMonth at runtime. */
+  static String makeQuery(String yearMonth, String projectId) {
+    // Get the timestamp endpoints capturing the entire month with microsecond precision
+    YearMonth reportingMonth = YearMonth.parse(yearMonth);
+    LocalDateTime firstMoment = reportingMonth.atDay(1).atTime(LocalTime.MIDNIGHT);
+    LocalDateTime lastMoment = reportingMonth.atEndOfMonth().atTime(LocalTime.MAX);
+    // Construct the month's query by filling in the billing_events.sql template
+    return SqlTemplate.create(getQueryFromFile(InvoicingPipeline.class, "billing_events.sql"))
+        .put("FIRST_TIMESTAMP_OF_MONTH", firstMoment.format(TIMESTAMP_FORMATTER))
+        .put("LAST_TIMESTAMP_OF_MONTH", lastMoment.format(TIMESTAMP_FORMATTER))
+        .put("PROJECT_ID", projectId)
+        .put("DATASTORE_EXPORT_DATA_SET", "latest_datastore_export")
+        .put("ONETIME_TABLE", "OneTime")
+        .put("REGISTRY_TABLE", "Registry")
+        .put("REGISTRAR_TABLE", "Registrar")
+        .put("CANCELLATION_TABLE", "Cancellation")
+        .build();
+  }
+
+  public static void main(String[] args) {
+    PipelineOptionsFactory.register(InvoicingPipelineOptions.class);
+    InvoicingPipelineOptions options =
+        PipelineOptionsFactory.fromArgs(args).withValidation().as(InvoicingPipelineOptions.class);
+    new InvoicingPipeline(options).run();
   }
 }

core/src/main/java/google/registry/beam/invoicing/InvoicingPipelineOptions.java

@@ -0,0 +1,37 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.beam.invoicing;
+
+import google.registry.beam.common.RegistryPipelineOptions;
+import org.apache.beam.sdk.options.Description;
+
+/** Custom options for running the invoicing pipeline. */
+public interface InvoicingPipelineOptions extends RegistryPipelineOptions {
+
+  @Description("The year and month we generate invoices for, in yyyy-MM format.")
+  String getYearMonth();
+
+  void setYearMonth(String value);
+
+  @Description("Filename prefix for the invoice CSV file.")
+  String getInvoiceFilePrefix();
+
+  void setInvoiceFilePrefix(String value);
+
+  @Description("The GCS bucket URL for invoices and detailed  reports to be uploaded.")
+  String getBillingBucketUrl();
+
+  void setBillingBucketUrl(String value);
+}

core/src/main/java/google/registry/beam/invoicing/InvoicingUtils.java

@@ -1,106 +0,0 @@
-// Copyright 2018 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.invoicing;
-
-import static google.registry.beam.BeamUtils.getQueryFromFile;
-
-import google.registry.util.SqlTemplate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.YearMonth;
-import java.time.format.DateTimeFormatter;
-import org.apache.beam.sdk.io.DefaultFilenamePolicy.Params;
-import org.apache.beam.sdk.io.FileBasedSink;
-import org.apache.beam.sdk.options.ValueProvider;
-import org.apache.beam.sdk.options.ValueProvider.NestedValueProvider;
-import org.apache.beam.sdk.transforms.SerializableFunction;
-
-/** Pipeline helper functions used to generate invoices from instances of {@link BillingEvent}. */
-public class InvoicingUtils {
-
-  private InvoicingUtils() {}
-
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
-      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
-
-  /**
-   * Returns a function mapping from {@code BillingEvent} to filename {@code Params}.
-   *
-   * <p>Beam uses this to determine which file a given {@code BillingEvent} should get placed into.
-   *
-   * @param outputBucket the GCS bucket we're outputting reports to
-   * @param yearMonthProvider a runtime provider for the yyyy-MM we're generating the invoice for
-   */
-  static SerializableFunction<BillingEvent, Params> makeDestinationFunction(
-      String outputBucket, ValueProvider<String> yearMonthProvider) {
-    return billingEvent ->
-        new Params()
-            .withShardTemplate("")
-            .withSuffix(".csv")
-            .withBaseFilename(
-                NestedValueProvider.of(
-                    yearMonthProvider,
-                    yearMonth ->
-                        FileBasedSink.convertToFileResourceIfPossible(
-                            String.format(
-                                "%s/%s/%s",
-                                outputBucket, yearMonth, billingEvent.toFilename(yearMonth)))));
-  }
-
-  /**
-   * Returns the default filename parameters for an unmappable {@code BillingEvent}.
-   *
-   * <p>The "failed" file should only be populated when an error occurs, which warrants further
-   * investigation.
-   */
-  static Params makeEmptyDestinationParams(String outputBucket) {
-    return new Params()
-        .withBaseFilename(
-            FileBasedSink.convertToFileResourceIfPossible(
-                String.format("%s/%s", outputBucket, "FAILURES")));
-  }
-
-  /**
-   * Returns a provider that creates a Bigquery query for a given project and yearMonth at runtime.
-   *
-   * <p>We only know yearMonth at runtime, so this provider fills in the {@code
-   * sql/billing_events.sql} template at runtime.
-   *
-   * @param yearMonthProvider a runtime provider that returns which month we're invoicing for.
-   * @param projectId the projectId we're generating invoicing for.
-   */
-  static ValueProvider<String> makeQueryProvider(
-      ValueProvider<String> yearMonthProvider, String projectId) {
-    return NestedValueProvider.of(
-        yearMonthProvider,
-        (yearMonth) -> {
-          // Get the timestamp endpoints capturing the entire month with microsecond precision
-          YearMonth reportingMonth = YearMonth.parse(yearMonth);
-          LocalDateTime firstMoment = reportingMonth.atDay(1).atTime(LocalTime.MIDNIGHT);
-          LocalDateTime lastMoment = reportingMonth.atEndOfMonth().atTime(LocalTime.MAX);
-          // Construct the month's query by filling in the billing_events.sql template
-          return SqlTemplate.create(getQueryFromFile(InvoicingPipeline.class, "billing_events.sql"))
-              .put("FIRST_TIMESTAMP_OF_MONTH", firstMoment.format(TIMESTAMP_FORMATTER))
-              .put("LAST_TIMESTAMP_OF_MONTH", lastMoment.format(TIMESTAMP_FORMATTER))
-              .put("PROJECT_ID", projectId)
-              .put("DATASTORE_EXPORT_DATA_SET", "latest_datastore_export")
-              .put("ONETIME_TABLE", "OneTime")
-              .put("REGISTRY_TABLE", "Registry")
-              .put("REGISTRAR_TABLE", "Registrar")
-              .put("CANCELLATION_TABLE", "Cancellation")
-              .build();
-        });
-  }
-}

core/src/main/java/google/registry/beam/rde/RdePipeline.java

@@ -0,0 +1,260 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.beam.rde;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static google.registry.model.EppResourceUtils.loadAtPointInTimeAsync;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.io.BaseEncoding;
+import google.registry.beam.common.RegistryJpaIO;
+import google.registry.model.EppResource;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainBase;
+import google.registry.model.host.HostResource;
+import google.registry.model.rde.RdeMode;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.Registrar.Type;
+import google.registry.persistence.VKey;
+import google.registry.rde.DepositFragment;
+import google.registry.rde.PendingDeposit;
+import google.registry.rde.PendingDeposit.PendingDepositCoder;
+import google.registry.rde.RdeFragmenter;
+import google.registry.rde.RdeMarshaller;
+import google.registry.xml.ValidationMode;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+import javax.persistence.Entity;
+import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.PipelineResult;
+import org.apache.beam.sdk.coders.KvCoder;
+import org.apache.beam.sdk.coders.SerializableCoder;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.apache.beam.sdk.transforms.FlatMapElements;
+import org.apache.beam.sdk.transforms.Flatten;
+import org.apache.beam.sdk.transforms.Reshuffle;
+import org.apache.beam.sdk.values.KV;
+import org.apache.beam.sdk.values.PCollection;
+import org.apache.beam.sdk.values.PCollectionList;
+import org.apache.beam.sdk.values.TypeDescriptor;
+import org.apache.beam.sdk.values.TypeDescriptors;
+import org.joda.time.DateTime;
+
+/**
+ * Definition of a Dataflow Flex template, which generates RDE/BRDA deposits.
+ *
+ * <p>To stage this template locally, run the {@code stage_beam_pipeline.sh} shell script.
+ *
+ * <p>Then, you can run the staged template via the API client library, gCloud or a raw REST call.
+ *
+ * @see <a href="https://cloud.google.com/dataflow/docs/guides/templates/using-flex-templates">Using
+ *     Flex Templates</a>
+ */
+public class RdePipeline implements Serializable {
+
+  private final RdeMarshaller marshaller;
+  private final ImmutableSetMultimap<String, PendingDeposit> pendings;
+
+  // Registrars to be excluded from data escrow. Not including the sandbox-only OTE type so that
+  // if sneaks into production we would get an extra signal.
+  private static final ImmutableSet<Type> IGNORED_REGISTRAR_TYPES =
+      Sets.immutableEnumSet(Registrar.Type.MONITORING, Registrar.Type.TEST);
+
+  private static final String EPP_RESOURCE_QUERY =
+      "SELECT id FROM %entity% "
+          + "WHERE COALESCE(creationClientId, '') NOT LIKE 'prober-%' "
+          + "AND COALESCE(currentSponsorClientId, '') NOT LIKE 'prober-%' "
+          + "AND COALESCE(lastEppUpdateClientId, '') NOT LIKE 'prober-%'";
+
+  public static String createEppResourceQuery(Class<? extends EppResource> clazz) {
+    return EPP_RESOURCE_QUERY.replace("%entity%", clazz.getAnnotation(Entity.class).name())
+        + (clazz.equals(DomainBase.class) ? " AND tld in (:tlds)" : "");
+  }
+
+  RdePipeline(RdePipelineOptions options) throws IOException, ClassNotFoundException {
+    this.marshaller = new RdeMarshaller(ValidationMode.valueOf(options.getValidationMode()));
+    this.pendings = decodePendings(options.getPendings());
+  }
+
+  @VisibleForTesting
+  PipelineResult run(Pipeline pipeline) {
+    createFragments(pipeline);
+    return pipeline.run();
+  }
+
+  PipelineResult run() {
+    return run(Pipeline.create());
+  }
+
+  PCollection<KV<PendingDeposit, DepositFragment>> createFragments(Pipeline pipeline) {
+    PCollection<KV<PendingDeposit, DepositFragment>> fragments =
+        PCollectionList.of(processRegistrars(pipeline))
+            .and(processNonRegistrarEntities(pipeline, DomainBase.class))
+            .and(processNonRegistrarEntities(pipeline, ContactResource.class))
+            .and(processNonRegistrarEntities(pipeline, HostResource.class))
+            .apply(Flatten.pCollections())
+            .setCoder(
+                KvCoder.of(PendingDepositCoder.of(), SerializableCoder.of(DepositFragment.class)));
+    return fragments;
+  }
+
+  PCollection<KV<PendingDeposit, DepositFragment>> processRegistrars(Pipeline pipeline) {
+    return pipeline
+        .apply(
+            "Read all production Registrar entities",
+            RegistryJpaIO.read(
+                "SELECT clientIdentifier FROM Registrar WHERE type NOT IN (:types)",
+                ImmutableMap.of("types", IGNORED_REGISTRAR_TYPES),
+                String.class,
+                // TODO: consider adding coders for entities and pass them directly instead of using
+                // VKeys.
+                id -> VKey.createSql(Registrar.class, id)))
+        .apply(
+            "Marshal Registrar into DepositFragment",
+            FlatMapElements.into(
+                    TypeDescriptors.kvs(
+                        TypeDescriptor.of(PendingDeposit.class),
+                        TypeDescriptor.of(DepositFragment.class)))
+                .via(
+                    (VKey<Registrar> key) -> {
+                      Registrar registrar = jpaTm().transact(() -> jpaTm().loadByKey(key));
+                      DepositFragment fragment = marshaller.marshalRegistrar(registrar);
+                      return pendings.values().stream()
+                          .map(pending -> KV.of(pending, fragment))
+                          .collect(toImmutableSet());
+                    }));
+  }
+
+  @SuppressWarnings("deprecation") // Reshuffle is still recommended by Dataflow.
+  <T extends EppResource>
+      PCollection<KV<PendingDeposit, DepositFragment>> processNonRegistrarEntities(
+          Pipeline pipeline, Class<T> clazz) {
+    return createInputs(pipeline, clazz)
+        .apply("Marshal " + clazz.getSimpleName() + " into DepositFragment", mapToFragments(clazz))
+        .setCoder(KvCoder.of(PendingDepositCoder.of(), SerializableCoder.of(DepositFragment.class)))
+        .apply(
+            "Reshuffle KV<PendingDeposit, DepositFragment> of "
+                + clazz.getSimpleName()
+                + " to prevent fusion",
+            Reshuffle.of());
+  }
+
+  <T extends EppResource> PCollection<VKey<T>> createInputs(Pipeline pipeline, Class<T> clazz) {
+    return pipeline.apply(
+        "Read all production " + clazz.getSimpleName() + " entities",
+        RegistryJpaIO.read(
+            createEppResourceQuery(clazz),
+            clazz.equals(DomainBase.class)
+                ? ImmutableMap.of("tlds", pendings.keySet())
+                : ImmutableMap.of(),
+            String.class,
+            // TODO: consider adding coders for entities and pass them directly instead of using
+            // VKeys.
+            x -> VKey.create(clazz, x)));
+  }
+
+  <T extends EppResource>
+      FlatMapElements<VKey<T>, KV<PendingDeposit, DepositFragment>> mapToFragments(Class<T> clazz) {
+    return FlatMapElements.into(
+            TypeDescriptors.kvs(
+                TypeDescriptor.of(PendingDeposit.class), TypeDescriptor.of(DepositFragment.class)))
+        .via(
+            (VKey<T> key) -> {
+              T resource = jpaTm().transact(() -> jpaTm().loadByKey(key));
+              // The set of all TLDs to which this resource should be emitted.
+              ImmutableSet<String> tlds =
+                  clazz.equals(DomainBase.class)
+                      ? ImmutableSet.of(((DomainBase) resource).getTld())
+                      : pendings.keySet();
+              // Get the set of all point-in-time watermarks we need, to minimize rewinding.
+              ImmutableSet<DateTime> dates =
+                  tlds.stream()
+                      .map(pendings::get)
+                      .flatMap(ImmutableSet::stream)
+                      .map(PendingDeposit::watermark)
+                      .collect(toImmutableSet());
+              // Launch asynchronous fetches of point-in-time representations of resource.
+              ImmutableMap<DateTime, Supplier<EppResource>> resourceAtTimes =
+                  ImmutableMap.copyOf(
+                      Maps.asMap(dates, input -> loadAtPointInTimeAsync(resource, input)));
+              // Convert resource to an XML fragment for each watermark/mode pair lazily and cache
+              // the result.
+              RdeFragmenter fragmenter = new RdeFragmenter(resourceAtTimes, marshaller);
+              List<KV<PendingDeposit, DepositFragment>> results = new ArrayList<>();
+              for (String tld : tlds) {
+                for (PendingDeposit pending : pendings.get(tld)) {
+                  // Hosts and contacts don't get included in BRDA deposits.
+                  if (pending.mode() == RdeMode.THIN && !clazz.equals(DomainBase.class)) {
+                    continue;
+                  }
+                  Optional<DepositFragment> fragment =
+                      fragmenter.marshal(pending.watermark(), pending.mode());
+                  fragment.ifPresent(
+                      depositFragment -> results.add(KV.of(pending, depositFragment)));
+                }
+              }
+              return results;
+            });
+  }
+
+  /**
+   * Decodes the pipeline option extracted from the URL parameter sent by the pipeline launcher to
+   * the original TLD to pending deposit map.
+   */
+  @SuppressWarnings("unchecked")
+  static ImmutableSetMultimap<String, PendingDeposit> decodePendings(String encodedPending)
+      throws IOException, ClassNotFoundException {
+    try (ObjectInputStream ois =
+        new ObjectInputStream(
+            new ByteArrayInputStream(
+                BaseEncoding.base64Url().omitPadding().decode(encodedPending)))) {
+      return (ImmutableSetMultimap<String, PendingDeposit>) ois.readObject();
+    }
+  }
+
+  /**
+   * Encodes the TLD to pending deposit map in an URL safe string that is sent to the pipeline
+   * worker by the pipeline launcher as a pipeline option.
+   */
+  public static String encodePendings(ImmutableSetMultimap<String, PendingDeposit> pendings)
+      throws IOException {
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+      ObjectOutputStream oos = new ObjectOutputStream(baos);
+      oos.writeObject(pendings);
+      oos.flush();
+      return BaseEncoding.base64Url().omitPadding().encode(baos.toByteArray());
+    }
+  }
+
+  public static void main(String[] args) throws IOException, ClassNotFoundException {
+    PipelineOptionsFactory.register(RdePipelineOptions.class);
+    RdePipelineOptions options = PipelineOptionsFactory.fromArgs(args).as(RdePipelineOptions.class);
+    new RdePipeline(options).run();
+  }
+}

core/src/main/java/google/registry/beam/rde/RdePipelineOptions.java

@@ -0,0 +1,32 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.beam.rde;
+
+import google.registry.beam.common.RegistryPipelineOptions;
+import org.apache.beam.sdk.options.Description;
+
+/** Custom options for running the spec11 pipeline. */
+public interface RdePipelineOptions extends RegistryPipelineOptions {
+
+  @Description("The Base64-encoded serialized map of TLDs to PendingDeposit.")
+  String getPendings();
+
+  void setPendings(String value);
+
+  @Description("The validation mode (LENIENT|STRICT) that the RDE marshaller uses.")
+  String getValidationMode();
+
+  void setValidationMode(String value);
+}

core/src/main/java/google/registry/beam/spec11/SafeBrowsingTransforms.java

@@ -14,7 +14,6 @@
 
 package google.registry.beam.spec11;
 
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.http.HttpStatus.SC_OK;
 
@@ -30,7 +29,6 @@ import java.net.URISyntaxException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
-import org.apache.beam.sdk.options.ValueProvider;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.windowing.GlobalWindow;
 import org.apache.beam.sdk.values.KV;
@@ -73,7 +71,7 @@ public class SafeBrowsingTransforms {
     private static final int BATCH_SIZE = 490;
 
     /** Provides the SafeBrowsing API key at runtime. */
-    private final ValueProvider<String> apiKeyProvider;
+    private final String apiKey;
 
     /**
      * Maps a subdomain's {@code fullyQualifiedDomainName} to its corresponding {@link Subdomain} to
@@ -93,20 +91,18 @@ public class SafeBrowsingTransforms {
     private final Retrier retrier;
 
     /**
-     * Constructs a {@link EvaluateSafeBrowsingFn} that gets its API key from the given provider.
+     * Constructs a {@link EvaluateSafeBrowsingFn} with a given API key.
      *
      * <p>We need to dual-cast the closeableHttpClientSupplier lambda because all {@code DoFn}
      * member variables need to be serializable. The (Supplier & Serializable) dual cast is safe
      * because class methods are generally serializable, especially a static function such as {@link
      * HttpClients#createDefault()}.
-     *
-     * @param apiKeyProvider provides the SafeBrowsing API key from {@code KMS} at runtime
      */
     @SuppressWarnings("unchecked")
-    EvaluateSafeBrowsingFn(ValueProvider<String> apiKeyProvider, Retrier retrier) {
-      this.apiKeyProvider = apiKeyProvider;
+    EvaluateSafeBrowsingFn(String apiKey, Retrier retrier) {
+      this.apiKey = apiKey;
       this.retrier = retrier;
-      this.closeableHttpClientSupplier = (Supplier & Serializable) HttpClients::createDefault;
+      closeableHttpClientSupplier = (Supplier & Serializable) HttpClients::createDefault;
     }
 
     /**
@@ -117,12 +113,10 @@ public class SafeBrowsingTransforms {
      */
     @VisibleForTesting
     EvaluateSafeBrowsingFn(
-        ValueProvider<String> apiKeyProvider,
-        Retrier retrier,
-        Supplier<CloseableHttpClient> clientSupplier) {
-      this.apiKeyProvider = apiKeyProvider;
+        String apiKey, Retrier retrier, Supplier<CloseableHttpClient> clientSupplier) {
+      this.apiKey = apiKey;
       this.retrier = retrier;
-      this.closeableHttpClientSupplier = clientSupplier;
+      closeableHttpClientSupplier = clientSupplier;
     }
 
     /** Evaluates any buffered {@link Subdomain} objects upon completing the bundle. */
@@ -159,7 +153,7 @@ public class SafeBrowsingTransforms {
       try {
         URIBuilder uriBuilder = new URIBuilder(SAFE_BROWSING_URL);
         // Add the API key param
-        uriBuilder.addParameter("key", apiKeyProvider.get());
+        uriBuilder.addParameter("key", apiKey);
 
         HttpPost httpPost = new HttpPost(uriBuilder.build());
         httpPost.addHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
@@ -175,7 +169,7 @@ public class SafeBrowsingTransforms {
               }
             },
             IOException.class);
-      } catch (URISyntaxException | JSONException  e) {
+      } catch (URISyntaxException | JSONException e) {
         // Fail the pipeline on a parsing exception- this indicates the API likely changed.
         throw new RuntimeException("Caught parsing exception, failing pipeline.", e);
       } finally {
@@ -239,7 +233,9 @@ public class SafeBrowsingTransforms {
             String url = match.getJSONObject("threat").getString("url");
             Subdomain subdomain = subdomainBuffer.get(url);
             resultBuilder.add(
-                KV.of(subdomain, ThreatMatch.create(match, subdomain.domainName())));
+                KV.of(
+                    subdomain,
+                    ThreatMatch.create(match.getString("threatType"), subdomain.domainName())));
           }
         }
       }

core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java

@@ -17,32 +17,29 @@ package google.registry.beam.spec11;
 import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.beam.BeamUtils.getQueryFromFile;
 
-import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableSet;
-import google.registry.beam.initsql.Transforms;
-import google.registry.beam.initsql.Transforms.SerializableSupplier;
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import google.registry.beam.common.RegistryJpaIO;
+import google.registry.beam.common.RegistryJpaIO.Read;
 import google.registry.beam.spec11.SafeBrowsingTransforms.EvaluateSafeBrowsingFn;
-import google.registry.config.CredentialModule.LocalCredential;
-import google.registry.config.RegistryConfig.Config;
+import google.registry.config.RegistryConfig.ConfigModule;
+import google.registry.model.domain.DomainBase;
 import google.registry.model.reporting.Spec11ThreatMatch;
 import google.registry.model.reporting.Spec11ThreatMatch.ThreatType;
-import google.registry.persistence.transaction.JpaTransactionManager;
-import google.registry.util.GoogleCredentialsBundle;
 import google.registry.util.Retrier;
 import google.registry.util.SqlTemplate;
+import google.registry.util.UtilsModule;
 import java.io.Serializable;
-import javax.inject.Inject;
-import org.apache.beam.runners.dataflow.DataflowRunner;
-import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
+import javax.inject.Singleton;
 import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.SerializableCoder;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
-import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.options.ValueProvider;
-import org.apache.beam.sdk.options.ValueProvider.NestedValueProvider;
 import org.apache.beam.sdk.transforms.GroupByKey;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -58,21 +55,20 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
- * Definition of a Dataflow pipeline template, which generates a given month's spec11 report.
+ * Definition of a Dataflow Flex template, which generates a given month's spec11 report.
  *
- * <p>To stage this template on GCS, run the {@link
- * google.registry.tools.DeploySpec11PipelineCommand} Nomulus command.
+ * <p>To stage this template locally, run the {@code stage_beam_pipeline.sh} shell script.
  *
  * <p>Then, you can run the staged template via the API client library, gCloud or a raw REST call.
  *
- * @see <a href="https://cloud.google.com/dataflow/docs/templates/overview">Dataflow Templates</a>
+ * @see <a href="https://cloud.google.com/dataflow/docs/guides/templates/using-flex-templates">Using
+ *     Flex Templates</a>
  */
 public class Spec11Pipeline implements Serializable {
 
   /**
    * Returns the subdirectory spec11 reports reside in for a given local date in yyyy-MM-dd format.
    *
-   * @see google.registry.beam.spec11.Spec11Pipeline
    * @see google.registry.reporting.spec11.Spec11EmailUtils
    */
   public static String getSpec11ReportFilePath(LocalDate localDate) {
@@ -87,135 +83,102 @@ public class Spec11Pipeline implements Serializable {
   /** The JSON object field into which we put the threat match array for Spec11 reports. */
   public static final String THREAT_MATCHES_FIELD = "threatMatches";
 
-  private final String projectId;
-  private final String beamJobRegion;
-  private final String beamStagingUrl;
-  private final String spec11TemplateUrl;
-  private final String reportingBucketUrl;
-  private final GoogleCredentials googleCredentials;
-  private final Retrier retrier;
-  private final SerializableSupplier<JpaTransactionManager> jpaSupplierFactory;
+  private final Spec11PipelineOptions options;
+  private final EvaluateSafeBrowsingFn safeBrowsingFn;
 
-  @Inject
-  public Spec11Pipeline(
-      @Config("projectId") String projectId,
-      @Config("defaultJobRegion") String beamJobRegion,
-      @Config("beamStagingUrl") String beamStagingUrl,
-      @Config("spec11TemplateUrl") String spec11TemplateUrl,
-      @Config("reportingBucketUrl") String reportingBucketUrl,
-      SerializableSupplier<JpaTransactionManager> jpaSupplierFactory,
-      @LocalCredential GoogleCredentialsBundle googleCredentialsBundle,
-      Retrier retrier) {
-    this.projectId = projectId;
-    this.beamJobRegion = beamJobRegion;
-    this.beamStagingUrl = beamStagingUrl;
-    this.spec11TemplateUrl = spec11TemplateUrl;
-    this.reportingBucketUrl = reportingBucketUrl;
-    this.jpaSupplierFactory = jpaSupplierFactory;
-    this.googleCredentials = googleCredentialsBundle.getGoogleCredentials();
-    this.retrier = retrier;
+  Spec11Pipeline(Spec11PipelineOptions options, EvaluateSafeBrowsingFn safeBrowsingFn) {
+    this.options = options;
+    this.safeBrowsingFn = safeBrowsingFn;
   }
 
-  /** Custom options for running the spec11 pipeline. */
-  public interface Spec11PipelineOptions extends DataflowPipelineOptions {
-    /** Returns the local date we're generating the report for, in yyyy-MM-dd format. */
-    @Description("The local date we generate the report for, in yyyy-MM-dd format.")
-    ValueProvider<String> getDate();
-
-    /**
-     * Sets the local date we generate invoices for.
-     *
-     * <p>This is implicitly set when executing the Dataflow template, by specifying the "date"
-     * parameter.
-     */
-    void setDate(ValueProvider<String> value);
-
-    /** Returns the SafeBrowsing API key we use to evaluate subdomain health. */
-    @Description("The API key we use to access the SafeBrowsing API.")
-    ValueProvider<String> getSafeBrowsingApiKey();
-
-    /**
-     * Sets the SafeBrowsing API key we use.
-     *
-     * <p>This is implicitly set when executing the Dataflow template, by specifying the
-     * "safeBrowsingApiKey" parameter.
-     */
-    void setSafeBrowsingApiKey(ValueProvider<String> value);
+  PipelineResult run() {
+    Pipeline pipeline = Pipeline.create(options);
+    setupPipeline(pipeline);
+    return pipeline.run();
   }
 
-  /** Deploys the spec11 pipeline as a template on GCS. */
-  public void deploy() {
-    // We can't store options as a member variable due to serialization concerns.
-    Spec11PipelineOptions options = PipelineOptionsFactory.as(Spec11PipelineOptions.class);
-    options.setProject(projectId);
-    options.setRegion(beamJobRegion);
-    options.setRunner(DataflowRunner.class);
-    // This causes p.run() to stage the pipeline as a template on GCS, as opposed to running it.
-    options.setTemplateLocation(spec11TemplateUrl);
-    options.setStagingLocation(beamStagingUrl);
-    // This credential is used when Dataflow deploys the template to GCS in target GCP project.
-    // So, make sure the credential has write permission to GCS in that project.
-    options.setGcpCredential(googleCredentials);
-
-    Pipeline p = Pipeline.create(options);
+  void setupPipeline(Pipeline pipeline) {
     PCollection<Subdomain> domains =
-        p.apply(
-            "Read active domains from BigQuery",
-            BigQueryIO.read(Subdomain::parseFromRecord)
-                .fromQuery(
-                    SqlTemplate.create(getQueryFromFile(Spec11Pipeline.class, "subdomains.sql"))
-                        .put("PROJECT_ID", projectId)
-                        .put("DATASTORE_EXPORT_DATASET", "latest_datastore_export")
-                        .put("REGISTRAR_TABLE", "Registrar")
-                        .put("DOMAIN_BASE_TABLE", "DomainBase")
-                        .build())
-                .withCoder(SerializableCoder.of(Subdomain.class))
-                .usingStandardSql()
-                .withoutValidation()
-                .withTemplateCompatibility());
+        options.getDatabase().equals("DATASTORE")
+            ? readFromBigQuery(options, pipeline)
+            : readFromCloudSql(pipeline);
 
-    evaluateUrlHealth(
-        domains,
-        new EvaluateSafeBrowsingFn(options.getSafeBrowsingApiKey(), retrier),
-        options.getDate());
-    p.run();
+    PCollection<KV<Subdomain, ThreatMatch>> threatMatches =
+        domains.apply("Run through SafeBrowsing API", ParDo.of(safeBrowsingFn));
+
+    saveToSql(threatMatches, options);
+    saveToGcs(threatMatches, options);
   }
 
-  /**
-   * Evaluate each {@link Subdomain} URL via the SafeBrowsing API.
-   *
-   * <p>This is factored out to facilitate testing.
-   */
-  void evaluateUrlHealth(
-      PCollection<Subdomain> domains,
-      EvaluateSafeBrowsingFn evaluateSafeBrowsingFn,
-      ValueProvider<String> dateProvider) {
-    PCollection<KV<Subdomain, ThreatMatch>> subdomainsSql =
-        domains.apply("Run through SafeBrowsing API", ParDo.of(evaluateSafeBrowsingFn));
-    TypeDescriptor<KV<Subdomain, ThreatMatch>> descriptor =
-        new TypeDescriptor<KV<Subdomain, ThreatMatch>>() {};
-    subdomainsSql.apply(
-        Transforms.writeToSql(
-            "Spec11ThreatMatch",
-            4,
-            4,
-            jpaSupplierFactory,
-            (kv) -> {
-              Subdomain subdomain = kv.getKey();
-              return new Spec11ThreatMatch.Builder()
-                  .setThreatTypes(ImmutableSet.of(ThreatType.valueOf(kv.getValue().threatType())))
-                  .setCheckDate(LocalDate.parse(dateProvider.get(), ISODateTimeFormat.date()))
-                  .setDomainName(subdomain.domainName())
-                  .setDomainRepoId(subdomain.domainRepoId())
-                  .setRegistrarId(subdomain.registrarId())
-                  .build();
-            },
-            descriptor));
+  static PCollection<Subdomain> readFromCloudSql(Pipeline pipeline) {
+    Read<Object[], Subdomain> read =
+        RegistryJpaIO.read(
+            "select d, r.emailAddress from Domain d join Registrar r on"
+                + " d.currentSponsorClientId = r.clientIdentifier where r.type = 'REAL'"
+                + " and d.deletionTime > now()",
+            false,
+            Spec11Pipeline::parseRow);
 
-    /* Store ThreatMatch objects in JSON. */
-    PCollection<KV<Subdomain, ThreatMatch>> subdomainsJson =
-        domains.apply("Run through SafeBrowsingAPI", ParDo.of(evaluateSafeBrowsingFn));
-    subdomainsJson
+    return pipeline.apply("Read active domains from Cloud SQL", read);
+  }
+
+  static PCollection<Subdomain> readFromBigQuery(Spec11PipelineOptions options, Pipeline pipeline) {
+    return pipeline.apply(
+        "Read active domains from BigQuery",
+        BigQueryIO.read(Subdomain::parseFromRecord)
+            .fromQuery(
+                SqlTemplate.create(getQueryFromFile(Spec11Pipeline.class, "subdomains.sql"))
+                    .put("PROJECT_ID", options.getProject())
+                    .put("DATASTORE_EXPORT_DATASET", "latest_datastore_export")
+                    .put("REGISTRAR_TABLE", "Registrar")
+                    .put("DOMAIN_BASE_TABLE", "DomainBase")
+                    .build())
+            .withCoder(SerializableCoder.of(Subdomain.class))
+            .usingStandardSql()
+            .withoutValidation()
+            .withTemplateCompatibility());
+  }
+
+  private static Subdomain parseRow(Object[] row) {
+    DomainBase domainBase = (DomainBase) row[0];
+    String emailAddress = (String) row[1];
+    if (emailAddress == null) {
+      emailAddress = "";
+    }
+    return Subdomain.create(
+        domainBase.getDomainName(),
+        domainBase.getRepoId(),
+        domainBase.getCurrentSponsorClientId(),
+        emailAddress);
+  }
+
+  static void saveToSql(
+      PCollection<KV<Subdomain, ThreatMatch>> threatMatches, Spec11PipelineOptions options) {
+    String transformId = "Spec11 Threat Matches";
+    LocalDate date = LocalDate.parse(options.getDate(), ISODateTimeFormat.date());
+    threatMatches.apply(
+        "Write to Sql: " + transformId,
+        RegistryJpaIO.<KV<Subdomain, ThreatMatch>>write()
+            .withName(transformId)
+            .withBatchSize(options.getSqlWriteBatchSize())
+            .withShards(options.getSqlWriteShards())
+            .withJpaConverter(
+                (kv) -> {
+                  Subdomain subdomain = kv.getKey();
+                  return new Spec11ThreatMatch.Builder()
+                      .setThreatTypes(
+                          ImmutableSet.of(ThreatType.valueOf(kv.getValue().threatType())))
+                      .setCheckDate(date)
+                      .setDomainName(subdomain.domainName())
+                      .setDomainRepoId(subdomain.domainRepoId())
+                      .setRegistrarId(subdomain.registrarId())
+                      .build();
+                }));
+  }
+
+  static void saveToGcs(
+      PCollection<KV<Subdomain, ThreatMatch>> threatMatches, Spec11PipelineOptions options) {
+    threatMatches
         .apply(
             "Map registrar ID to email/ThreatMatch pair",
             MapElements.into(
@@ -260,17 +223,54 @@ public class Spec11Pipeline implements Serializable {
             "Output to text file",
             TextIO.write()
                 .to(
-                    NestedValueProvider.of(
-                        dateProvider,
-                        date ->
-                            String.format(
-                                "%s/%s",
-                                reportingBucketUrl,
-                                getSpec11ReportFilePath(LocalDate.parse(date)))))
+                    String.format(
+                        "%s/%s",
+                        options.getReportingBucketUrl(),
+                        getSpec11ReportFilePath(LocalDate.parse(options.getDate()))))
                 .withoutSharding()
                 .withHeader("Map from registrar email / name to detected subdomain threats:"));
   }
 
+  public static void main(String[] args) {
+    PipelineOptionsFactory.register(Spec11PipelineOptions.class);
+    DaggerSpec11Pipeline_Spec11PipelineComponent.builder()
+        .spec11PipelineModule(new Spec11PipelineModule(args))
+        .build()
+        .spec11Pipeline()
+        .run();
+  }
+
+  @Module
+  static class Spec11PipelineModule {
+    private final String[] args;
+
+    Spec11PipelineModule(String[] args) {
+      this.args = args;
+    }
+
+    @Provides
+    Spec11PipelineOptions provideOptions() {
+      return PipelineOptionsFactory.fromArgs(args).withValidation().as(Spec11PipelineOptions.class);
+    }
+
+    @Provides
+    EvaluateSafeBrowsingFn provideSafeBrowsingFn(Spec11PipelineOptions options, Retrier retrier) {
+      return new EvaluateSafeBrowsingFn(options.getSafeBrowsingApiKey(), retrier);
+    }
+
+    @Provides
+    Spec11Pipeline providePipeline(
+        Spec11PipelineOptions options, EvaluateSafeBrowsingFn safeBrowsingFn) {
+      return new Spec11Pipeline(options, safeBrowsingFn);
+    }
+  }
+
+  @Component(modules = {Spec11PipelineModule.class, UtilsModule.class, ConfigModule.class})
+  @Singleton
+  interface Spec11PipelineComponent {
+    Spec11Pipeline spec11Pipeline();
+  }
+
   @AutoValue
   abstract static class EmailAndThreatMatch implements Serializable {
 

core/src/main/java/google/registry/beam/spec11/Spec11PipelineOptions.java

@@ -0,0 +1,42 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.beam.spec11;
+
+import google.registry.beam.common.RegistryPipelineOptions;
+import org.apache.beam.sdk.options.Description;
+
+/** Custom options for running the spec11 pipeline. */
+public interface Spec11PipelineOptions extends RegistryPipelineOptions {
+
+  @Description("The local date we generate the report for, in yyyy-MM-dd format.")
+  String getDate();
+
+  void setDate(String value);
+
+  @Description("The API key we use to access the SafeBrowsing API.")
+  String getSafeBrowsingApiKey();
+
+  void setSafeBrowsingApiKey(String value);
+
+  @Description("The GCS bucket URL for Spec11 reports to be uploaded.")
+  String getReportingBucketUrl();
+
+  void setReportingBucketUrl(String value);
+
+  @Description("The database to read data from.")
+  String getDatabase();
+
+  void setDatabase(String value);
+}

core/src/main/java/google/registry/beam/spec11/ThreatMatch.java

@@ -15,6 +15,7 @@
 package google.registry.beam.spec11;
 
 import com.google.auto.value.AutoValue;
+import com.google.common.annotations.VisibleForTesting;
 import java.io.Serializable;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -31,16 +32,9 @@ public abstract class ThreatMatch implements Serializable {
   /** Returns the fully qualified domain name [SLD].[TLD] of the matched threat. */
   public abstract String fullyQualifiedDomainName();
 
-  /**
-   * Constructs a {@link ThreatMatch} by parsing a {@code SafeBrowsing API} response {@link
-   * JSONObject}.
-   *
-   * @throws JSONException when encountering parse errors in the response format
-   */
-  static ThreatMatch create(JSONObject threatMatchJSON, String fullyQualifiedDomainName)
-      throws JSONException {
-    return new AutoValue_ThreatMatch(
-        threatMatchJSON.getString(THREAT_TYPE_FIELD), fullyQualifiedDomainName);
+  @VisibleForTesting
+  static ThreatMatch create(String threatType, String fullyQualifiedDomainName) {
+    return new AutoValue_ThreatMatch(threatType, fullyQualifiedDomainName);
   }
 
   /** Returns a {@link JSONObject} representing a subset of this object's data. */

core/src/main/java/google/registry/bigquery/BigqueryConnection.java

@@ -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)));
   }
 

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -203,7 +203,7 @@ public final class RegistryConfig {
      * Configuration for analytics services installed in the web console.
      *
      * @see google.registry.ui.server.registrar.ConsoleUiAction
-     * @see google.registry.ui.soy.AnalyticsSoyInfo
+     * @see google.registry.ui.soy.registrar.AnalyticsSoyInfo
      */
     @Provides
     @Config("analyticsConfig")
@@ -384,31 +384,12 @@ public final class RegistryConfig {
       return Duration.standardHours(1);
     }
 
-    /**
-     * Number of sharded entity group roots used for performing strongly consistent scans.
-     *
-     * <p><b>Warning:</b> This number may increase but never decrease.
-     *
-     * @see google.registry.model.index.EppResourceIndex
-     */
-    @Provides
-    @Config("eppResourceIndexBucketCount")
-    public static int provideEppResourceIndexBucketCount(RegistryConfigSettings config) {
-      return config.datastore.eppResourceIndexBucketsNum;
-    }
-
     @Provides
     @Config("cloudSqlJdbcUrl")
     public static String providesCloudSqlJdbcUrl(RegistryConfigSettings config) {
       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) {
@@ -570,53 +551,6 @@ public final class RegistryConfig {
       return config.gSuite.outgoingEmailDisplayName;
     }
 
-    /**
-     * Returns the name of the GCS bucket for storing Beam templates and results.
-     *
-     * @see google.registry.reporting.billing.GenerateInvoicesAction
-     */
-    @Provides
-    @Config("apacheBeamBucket")
-    public static String provideApacheBeamBucket(@Config("projectId") String projectId) {
-      return projectId + "-beam";
-    }
-
-    /**
-     * Returns the URL of the GCS location for storing Apache Beam related objects.
-     *
-     * @see google.registry.reporting.billing.GenerateInvoicesAction
-     */
-    @Provides
-    @Config("apacheBeamBucketUrl")
-    public static String provideApacheBeamBucketUrl(@Config("apacheBeamBucket") String beamBucket) {
-      return "gs://" + beamBucket;
-    }
-
-    /**
-     * Returns the URL of the GCS location for storing the monthly invoicing Beam template.
-     *
-     * @see google.registry.reporting.billing.GenerateInvoicesAction
-     * @see google.registry.beam.invoicing.InvoicingPipeline
-     */
-    @Provides
-    @Config("invoiceTemplateUrl")
-    public static String provideInvoiceTemplateUrl(
-        @Config("apacheBeamBucketUrl") String beamBucketUrl) {
-      return beamBucketUrl + "/templates/invoicing";
-    }
-
-    /**
-     * Returns the URL of the GCS location for storing the monthly spec11 Beam template.
-     *
-     * @see google.registry.beam.spec11.Spec11Pipeline
-     */
-    @Provides
-    @Config("spec11TemplateUrl")
-    public static String provideSpec11TemplateUrl(
-        @Config("apacheBeamBucketUrl") String beamBucketUrl) {
-      return beamBucketUrl + "/templates/spec11";
-    }
-
     /**
      * Returns whether an SSL certificate hash is required to log in via EPP and run flows.
      *
@@ -640,29 +574,11 @@ public final class RegistryConfig {
       return config.beam.defaultJobRegion;
     }
 
-    /**
-     * Returns the default job zone to run Apache Beam (Cloud Dataflow) jobs in.
-     *
-     * @see google.registry.reporting.billing.GenerateInvoicesAction
-     * @see google.registry.reporting.spec11.GenerateSpec11ReportAction
-     */
+    /** Returns the GCS bucket URL with all staged BEAM flex templates. */
     @Provides
-    @Config("defaultJobZone")
-    public static String provideDefaultJobZone(RegistryConfigSettings config) {
-      return config.beam.defaultJobZone;
-    }
-
-    /**
-     * Returns the URL of the GCS location we store jar dependencies for beam pipelines.
-     *
-     * @see google.registry.beam.invoicing.InvoicingPipeline
-     * @see google.registry.beam.spec11.Spec11Pipeline
-     */
-    @Provides
-    @Config("beamStagingUrl")
-    public static String provideInvoiceStagingUrl(
-        @Config("apacheBeamBucketUrl") String beamBucketUrl) {
-      return beamBucketUrl + "/staging";
+    @Config("beamStagingBucketUrl")
+    public static String provideBeamStagingBucketUrl(RegistryConfigSettings config) {
+      return config.beam.stagingBucketUrl;
     }
 
     /**
@@ -1226,14 +1142,6 @@ public final class RegistryConfig {
       return formatComments(config.registryPolicy.reservedTermsExportDisclaimer);
     }
 
-    /** Returns the clientId of the registrar used by the {@code CheckApiServlet}. */
-    // TODO(b/80417678): remove this once CheckApiAction no longer uses this id.
-    @Provides
-    @Config("checkApiServletRegistrarClientId")
-    public static String provideCheckApiServletRegistrarClientId(RegistryConfigSettings config) {
-      return config.registryPolicy.checkApiServletClientId;
-    }
-
     /**
      * Returns the clientId of the registrar that admins are automatically logged in as if they
      * aren't otherwise associated with one.
@@ -1335,12 +1243,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) {
@@ -1600,22 +1502,6 @@ public final class RegistryConfig {
     CONFIG_SETTINGS.get().cloudSql.replicateTransactions = replicateTransactions;
   }
 
-  /**
-   * Returns whether or not to replay commit logs to the SQL database after export to GCS.
-   *
-   * <p>If true, we will trigger the {@link google.registry.backup.ReplayCommitLogsToSqlAction}
-   * after the {@link google.registry.backup.ExportCommitLogDiffAction} to load the commit logs and
-   * replay them to SQL.
-   */
-  public static boolean getCloudSqlReplayCommitLogs() {
-    return CONFIG_SETTINGS.get().cloudSql.replayCommitLogs;
-  }
-
-  @VisibleForTesting
-  public static void overrideCloudSqlReplayCommitLogs(boolean replayCommitLogs) {
-    CONFIG_SETTINGS.get().cloudSql.replayCommitLogs = replayCommitLogs;
-  }
-
   /** Returns the roid suffix to be used for the roids of all contacts and hosts. */
   public static String getContactAndHostRoidSuffix() {
     return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix;

core/src/main/java/google/registry/config/RegistryConfigSettings.java

@@ -123,16 +123,16 @@ 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;
-    public boolean replayCommitLogs;
   }
 
   /** Configuration for Apache Beam (Cloud Dataflow). */
   public static class Beam {
     public String defaultJobRegion;
-    public String defaultJobZone;
+    public String stagingBucketUrl;
   }
 
   /** Configuration for Cloud DNS. */
@@ -220,6 +220,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;
   }
 

core/src/main/java/google/registry/config/files/default-config.yaml

@@ -207,34 +207,29 @@ 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
   # background.
   replicateTransactions: false
-  # Set this to true to enable replay of commit logs to SQL
-  replayCommitLogs: false
 
 cloudDns:
   # Set both properties to null in Production.
@@ -423,9 +418,7 @@ misc:
 beam:
   # The default region to run Apache Beam (Cloud Dataflow) jobs in.
   defaultJobRegion: us-east1
-  # 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 +440,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: