Move "WithLongVKey" to BillingEvent subclasses (#821)

When loading the VKeys for the BillingEvents hierarchy, it is necessary to
restore the original concrete class for the type, otherwise we end up with a
different (and incompatible) VKey.

As part of this, convert the cancellation matching billing event to
VKey<Recurring>, which seems like the only thing it actually can be.

.gitignore

@@ -79,6 +79,10 @@ nomulus.iml
 nomulus.ipr
 nomulus.iws
 
+# Auto-generated java classes by Intellij
+*/src/main/generated/
+*/src/test/generated_tests/
+
 # VScode
 .vscode
 
@@ -93,8 +97,9 @@ nomulus.iws
 ######################################################################
 # Gradle Ignores
 
-# We don't want to ignore the gradle jar files
+# We don't want to ignore the gradle or google-java-format jar files
 !/gradle/wrapper/**/*.jar
+!/java-format/*.jar
 .gradle/
 **/build
 cloudbuild-caches/

.lgtm.yml

@@ -2,3 +2,5 @@ extraction:
   java:
     prepare:
       packages: "npm"
+    index:
+      java_version: "11"

README.md

@@ -33,7 +33,7 @@ running system:
 *   View the source code for the [GAE app](https://github.com/google/nomulus/tree/master/core/src/main/java/google/registry)
     and for the [GKE proxy](https://github.com/google/nomulus/tree/master/proxy/src/main/java/google/registry)
 *   [Other docs](https://github.com/google/nomulus/tree/master/docs)
-*   [Javadoc](https://nomulus.foo/javadoc/latest/)
+*   [Javadoc](https://javadoc.nomulus.foo/)
 *   [Nomulus discussion
     group](https://groups.google.com/forum/#!forum/nomulus-discuss), for any
     other questions

appengine_war.gradle

@@ -31,10 +31,6 @@ def coreResourcesDir = "${rootDir}/core/build/resources/main"
 war {
     webInf {
         from "../../core/src/main/java/google/registry/env/common/${project.name}/WEB-INF"
-
-        from("${coreResourcesDir}/META-INF/persistence.xml") {
-            into "classes/META-INF"
-        }
     }
 }
 

build.gradle

@@ -25,7 +25,7 @@ buildscript {
 
   dependencies {
     classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.0.1'
-    classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.6.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'
   }
@@ -35,9 +35,6 @@ plugins {
   // Java static analysis plugins. Keep versions consistent with
   // ./buildSrc/build.gradle
   id 'nebula.lint' version '16.0.2'
-  // TODO(weiminyu): consider remove net.ltgt.apt. Gradle 5.2+
-  //  has similar functionalities.
-  id 'net.ltgt.apt' version '0.19' apply false
   id 'net.ltgt.errorprone' version '0.6.1'
   id 'checkstyle'
   id 'com.github.johnrengelman.shadow' version '5.1.0'
@@ -49,6 +46,7 @@ plugins {
   id 'com.diffplug.gradle.spotless' version '3.25.0'
 
   id 'jacoco'
+  id 'com.dorongold.task-tree' version '1.5'
 }
 
 wrapper {
@@ -193,10 +191,14 @@ allprojects {
 }
 
 task runPresubmits(type: Exec) {
-  executable '/usr/bin/python'
+  executable '/usr/bin/python3'
   args('config/presubmits.py')
 }
 
+def javadocSource = []
+def javadocClasspath = []
+def javadocDependentTasks = []
+
 subprojects {
   // Skip no-op project
   if (project.name == 'services') return
@@ -258,7 +260,7 @@ subprojects {
       // in the 'configurations' block, the following code must run after
       // project evaluation, when all configurations have been created.
       configurations.each {
-        if (it.name != 'dependencyLicenseReport') {
+        if (it.name != 'dependencyLicenseReport' && it.name != 'integration') {
           it.resolutionStrategy.activateDependencyLocking()
         }
       }
@@ -285,12 +287,6 @@ subprojects {
 
   project.tasks.test.dependsOn runPresubmits
 
-// Path to code generated with annotation processors. Note that this path is
-// chosen by the 'net.ltgt.apt' plugin, and may change if IDE-specific plugins
-// are applied, e.g., 'idea' or 'eclipse'
-  def aptGeneratedDir = "${project.buildDir}/generated/source/apt/main"
-  def aptGeneratedTestDir = "${project.buildDir}/generated/source/apt/test"
-
   def commonlyExcludedResources = ['**/*.java', '**/BUILD']
 
   project.ext.javaDir = "${project.projectDir}/src/main/java"
@@ -299,24 +295,27 @@ subprojects {
 
   sourceSets {
     main {
-      java {
-        srcDirs += aptGeneratedDir
-      }
       resources {
         srcDirs += project.ext.javaDir
         exclude commonlyExcludedResources
       }
     }
     test {
-      java {
-        srcDirs += aptGeneratedTestDir
-      }
       resources {
         srcDirs += project.ext.javaTestDir
         exclude commonlyExcludedResources
       }
     }
   }
+
+  // No need to produce javadoc for the docs subproject, which has no APIs to
+  // expose to users.
+  if (project.name != 'docs') {
+    javadocSource << project.sourceSets.main.allJava
+    javadocClasspath << project.sourceSets.main.compileClasspath
+    javadocClasspath << "${buildDir}/generated/sources/annotationProcessor/java/main"
+    javadocDependentTasks << project.tasks.compileJava
+  }
 }
 
 // If "-P verboseTestOutput=true" is passed in, configure all subprojects to dump all of their
@@ -435,6 +434,7 @@ task javaIncrementalFormatDryRun {
     println("${invokeJavaDiffFormatScript("show")}")
   }
 }
+tasks.build.dependsOn(tasks.javaIncrementalFormatCheck)
 
 // Checks if modified lines in Java source files need reformatting.
 // Note that this task processes modified Java files in the entire repository.
@@ -444,4 +444,30 @@ task javaIncrementalFormatApply {
   }
 }
 
-tasks.build.dependsOn(tasks.javaIncrementalFormatCheck)
+task javadoc(type: Javadoc) {
+  source javadocSource
+  classpath = files(javadocClasspath)
+  destinationDir = file("${buildDir}/docs/javadoc")
+  options.encoding = "UTF-8"
+  // In a lot of places we don't write @return so suppress warnings about that.
+  options.addBooleanOption('Xdoclint:all,-missing', true)
+  options.addBooleanOption("-allow-script-in-comments",true)
+  options.tags = ["type:a:Generic Type",
+                  "error:a:Expected Error"]
+}
+
+tasks.build.dependsOn(tasks.javadoc)
+
+// Task for doing development on core Nomulus.
+// This fixes code formatting automatically as necessary, builds and tests the
+// core Nomulus codebase, and runs all presubmits.
+task coreDev {
+  dependsOn 'javaIncrementalFormatApply'
+  dependsOn 'javadoc'
+  dependsOn 'checkDependenciesDotGradle'
+  dependsOn 'checkLicense'
+  dependsOn ':core:check'
+  dependsOn 'assemble'
+}
+
+javadocDependentTasks.each { tasks.javadoc.dependsOn(it) }

buildSrc/build.gradle

@@ -26,9 +26,6 @@ buildscript {
 plugins {
   // Java static analysis plugins. Keep versions consistent with ../build.gradle
   id 'nebula.lint' version '16.0.2'
-  // Config helper for annotation processors such as AutoValue and Dagger.
-  // Ensures that source code is generated at an appropriate location.
-  id 'net.ltgt.apt' version '0.19' apply false
   id 'net.ltgt.errorprone' version '0.6.1'
   id 'checkstyle'
   id 'com.diffplug.gradle.spotless' version '3.25.0'
@@ -83,10 +80,8 @@ dependencies {
   annotationProcessor deps['com.google.auto.value:auto-value']
   testCompile deps['com.google.truth:truth']
   testCompile deps['com.google.truth.extensions:truth-java8-extension']
-  testCompile deps['junit:junit']
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
-  testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.mockito:mockito-core']
 }
 

buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile

@@ -19,9 +19,7 @@ commons-lang:commons-lang:2.6
 javax.inject:javax.inject:1
 junit:junit:4.12
 nebula.lint:nebula.lint.gradle.plugin:16.0.2
-net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19
 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1
-net.ltgt.gradle:gradle-apt-plugin:0.19
 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
 org.apache.commons:commons-lang3:3.8.1
 org.apache.maven:maven-artifact:3.6.2

buildSrc/gradle/dependency-locks/compile.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -50,7 +50,7 @@ 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.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0

buildSrc/gradle/dependency-locks/compileClasspath.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -50,7 +50,7 @@ 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.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0

buildSrc/gradle/dependency-locks/deploy_jar.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -50,7 +50,7 @@ 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.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0

buildSrc/gradle/dependency-locks/errorproneJavac.lockfile

@@ -1,4 +0,0 @@
-# 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.errorprone:javac:9+181-r4173-1

buildSrc/gradle/dependency-locks/runtime.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -50,7 +50,7 @@ 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.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0

buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -50,7 +50,7 @@ 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.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.json:json:20160212
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-commons:6.0

buildSrc/gradle/dependency-locks/testCompile.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -49,25 +49,24 @@ 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.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.7
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.5
 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.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
-org.mockito:mockito-core:2.25.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:6.0

buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -49,25 +49,24 @@ 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.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.7
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.5
 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.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
-org.mockito:mockito-core:2.25.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:6.0

buildSrc/gradle/dependency-locks/testRuntime.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -49,25 +49,24 @@ 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.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.7
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.5
 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.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
-org.mockito:mockito-core:2.25.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:6.0

buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -22,7 +22,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -49,25 +49,24 @@ 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.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.7
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.5
 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.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.hamcrest:hamcrest-core:1.3
 org.json:json:20160212
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
-org.mockito:mockito-core:2.25.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:6.0

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

@@ -29,6 +29,7 @@ import google.registry.gradle.plugin.ProjectData.TaskData;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Map;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -162,7 +163,7 @@ final class CoverPageGenerator {
             task.reports().entrySet().stream()
                 .collect(
                     toImmutableMap(
-                        entry -> entry.getKey(),
+                        Map.Entry::getKey,
                         entry ->
                             entry.getValue().files().isEmpty()
                                 ? ""

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

@@ -57,6 +57,10 @@ final class GcsPluginUtils {
     return file.toPath().toAbsolutePath().normalize();
   }
 
+  static Path toNormalizedPath(Path file) {
+    return file.toAbsolutePath().normalize();
+  }
+
   static String getContentType(String fileName) {
     return EXTENSION_TO_CONTENT_TYPE.getOrDefault(
         Files.getFileExtension(fileName), DEFAULT_CONTENT_TYPE);
@@ -168,7 +172,7 @@ final class GcsPluginUtils {
             .collect(
                 toImmutableMap(
                     file -> rootDir.relativize(toNormalizedPath(file)),
-                    file -> toByteArraySupplier(file)));
+                    GcsPluginUtils::toByteArraySupplier));
 
     if (files.isEmpty()) {
       // The directory exists, but is empty. Return empty FilesWithEntryPoint

buildSrc/src/test/java/google/registry/gradle/plugin/CoverPageGeneratorTest.java

@@ -26,13 +26,10 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.gradle.plugin.ProjectData.TaskData;
 import java.io.File;
 import java.nio.file.Paths;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.Test;
 
 /** Tests for {@link CoverPageGenerator} */
-@RunWith(JUnit4.class)
-public final class CoverPageGeneratorTest {
+final class CoverPageGeneratorTest {
 
   private static final ProjectData EMPTY_PROJECT =
       ProjectData.builder()
@@ -88,14 +85,14 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testGetFilesToUpload_entryPoint_isIndexHtml() {
+  void testGetFilesToUpload_entryPoint_isIndexHtml() {
     CoverPageGenerator coverPageGenerator = new CoverPageGenerator(EMPTY_PROJECT);
     assertThat(coverPageGenerator.getFilesToUpload().entryPoint())
         .isEqualTo(Paths.get("index.html"));
   }
 
   @Test
-  public void testGetFilesToUpload_containsEntryFile() {
+  void testGetFilesToUpload_containsEntryFile() {
     String content = getContentOfGeneratedFile(EMPTY_PROJECT, "index.html");
     assertThat(content)
         .contains(
@@ -103,7 +100,7 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_showsFailedTask() {
+  void testCoverPage_showsFailedTask() {
     String content = getCoverPage(EMPTY_PROJECT.toBuilder().addTask(EMPTY_TASK_FAILURE).build());
     assertThat(content).contains("task-failure");
     assertThat(content).contains("<p>FAILURE</p>");
@@ -112,7 +109,7 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_showsSuccessfulTask() {
+  void testCoverPage_showsSuccessfulTask() {
     String content = getCoverPage(EMPTY_PROJECT.toBuilder().addTask(EMPTY_TASK_SUCCESS).build());
     assertThat(content).contains("task-success");
     assertThat(content).doesNotContain("<p>FAILURE</p>");
@@ -121,7 +118,7 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_showsUpToDateTask() {
+  void testCoverPage_showsUpToDateTask() {
     String content = getCoverPage(EMPTY_PROJECT.toBuilder().addTask(EMPTY_TASK_UP_TO_DATE).build());
     assertThat(content).contains("task-up-to-date");
     assertThat(content).doesNotContain("<p>FAILURE</p>");
@@ -130,11 +127,10 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_failedAreFirst() {
+  void testCoverPage_failedAreFirst() {
     String content =
         getCoverPage(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(EMPTY_TASK_UP_TO_DATE)
                 .addTask(EMPTY_TASK_FAILURE)
                 .addTask(EMPTY_TASK_SUCCESS)
@@ -149,11 +145,10 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_failingTask_statusIsFailure() {
+  void testCoverPage_failingTask_statusIsFailure() {
     String content =
         getCoverPage(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(EMPTY_TASK_UP_TO_DATE)
                 .addTask(EMPTY_TASK_FAILURE)
                 .addTask(EMPTY_TASK_SUCCESS)
@@ -162,11 +157,10 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCoverPage_noFailingTask_statusIsSuccess() {
+  void testCoverPage_noFailingTask_statusIsSuccess() {
     String content =
         getCoverPage(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(EMPTY_TASK_UP_TO_DATE)
                 .addTask(EMPTY_TASK_SUCCESS)
                 .build());
@@ -174,7 +168,7 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testGetFilesToUpload_containsCssFile() {
+  void testGetFilesToUpload_containsCssFile() {
     ImmutableMap<String, String> files = getGeneratedFiles(EMPTY_PROJECT);
     assertThat(files).containsKey(filenameJoiner.join("css", "style.css"));
     assertThat(files.get(filenameJoiner.join("css", "style.css"))).contains("body {");
@@ -183,14 +177,12 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCreateReportFiles_taskWithLog() {
+  void testCreateReportFiles_taskWithLog() {
     ImmutableMap<String, String> files =
         getGeneratedFiles(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(
-                    EMPTY_TASK_SUCCESS
-                        .toBuilder()
+                    EMPTY_TASK_SUCCESS.toBuilder()
                         .setUniqueName("my:name")
                         .setLog(toByteArraySupplier("my log data"))
                         .build())
@@ -200,11 +192,10 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCreateReportFiles_taskWithoutLog() {
+  void testCreateReportFiles_taskWithoutLog() {
     ImmutableMap<String, String> files =
         getGeneratedFiles(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(EMPTY_TASK_SUCCESS.toBuilder().setUniqueName("my:name").build())
                 .build());
     assertThat(files).doesNotContainKey("logs/my-name.log");
@@ -212,14 +203,12 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCreateReportFiles_taskWithFilledReport() {
+  void testCreateReportFiles_taskWithFilledReport() {
     ImmutableMap<String, String> files =
         getGeneratedFiles(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(
-                    EMPTY_TASK_SUCCESS
-                        .toBuilder()
+                    EMPTY_TASK_SUCCESS.toBuilder()
                         .putReport(
                             "someReport",
                             FilesWithEntryPoint.create(
@@ -234,14 +223,12 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCreateReportFiles_taskWithEmptyReport() {
+  void testCreateReportFiles_taskWithEmptyReport() {
     ImmutableMap<String, String> files =
         getGeneratedFiles(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(
-                    EMPTY_TASK_SUCCESS
-                        .toBuilder()
+                    EMPTY_TASK_SUCCESS.toBuilder()
                         .putReport(
                             "someReport",
                             FilesWithEntryPoint.create(
@@ -254,14 +241,12 @@ public final class CoverPageGeneratorTest {
   }
 
   @Test
-  public void testCreateReportFiles_taskWithLogAndMultipleReports() {
+  void testCreateReportFiles_taskWithLogAndMultipleReports() {
     ImmutableMap<String, String> files =
         getGeneratedFiles(
-            EMPTY_PROJECT
-                .toBuilder()
+            EMPTY_PROJECT.toBuilder()
                 .addTask(
-                    EMPTY_TASK_SUCCESS
-                        .toBuilder()
+                    EMPTY_TASK_SUCCESS.toBuilder()
                         .setUniqueName("my:name")
                         .setLog(toByteArraySupplier("log data"))
                         .putReport(

buildSrc/src/test/java/google/registry/gradle/plugin/GcsPluginUtilsTest.java

@@ -23,6 +23,9 @@ import static google.registry.gradle.plugin.GcsPluginUtils.toNormalizedPath;
 import static google.registry.gradle.plugin.GcsPluginUtils.uploadFileToGcs;
 import static google.registry.gradle.plugin.GcsPluginUtils.uploadFilesToGcsMultithread;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.createDirectories;
+import static java.nio.file.Files.createDirectory;
+import static java.nio.file.Files.createFile;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -36,22 +39,20 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 /** Tests for {@link GcsPluginUtilsTest} */
-@RunWith(JUnit4.class)
-public final class GcsPluginUtilsTest {
+final class GcsPluginUtilsTest {
 
   private static final Joiner filenameJoiner = Joiner.on(File.separator);
 
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+  @SuppressWarnings("WeakerAccess")
+  @TempDir
+  Path tmpDir;
 
   @Test
-  public void testGetContentType_knownTypes() {
+  void testGetContentType_knownTypes() {
     assertThat(getContentType("path/to/file.html")).isEqualTo("text/html");
     assertThat(getContentType("path/to/file.htm")).isEqualTo("text/html");
     assertThat(getContentType("path/to/file.log")).isEqualTo("text/plain");
@@ -63,12 +64,12 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testGetContentType_unknownTypes() {
+  void testGetContentType_unknownTypes() {
     assertThat(getContentType("path/to/file.unknown")).isEqualTo("application/octet-stream");
   }
 
   @Test
-  public void testUploadFileToGcs() {
+  void testUploadFileToGcs() {
     Storage storage = mock(Storage.class);
     uploadFileToGcs(
         storage, "my-bucket", Paths.get("my", "filename.txt"), toByteArraySupplier("my data"));
@@ -82,7 +83,7 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testUploadFilesToGcsMultithread() {
+  void testUploadFilesToGcsMultithread() {
     Storage storage = mock(Storage.class);
     uploadFilesToGcsMultithread(
         storage,
@@ -121,21 +122,21 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testToByteArraySupplier_string() {
+  void testToByteArraySupplier_string() {
     assertThat(toByteArraySupplier("my string").get()).isEqualTo("my string".getBytes(UTF_8));
   }
 
   @Test
-  public void testToByteArraySupplier_stringSupplier() {
+  void testToByteArraySupplier_stringSupplier() {
     assertThat(toByteArraySupplier(() -> "my string").get()).isEqualTo("my string".getBytes(UTF_8));
   }
 
   @Test
-  public void testToByteArraySupplier_file() throws Exception {
-    folder.newFolder("arbitrary");
-    File file = folder.newFile("arbitrary/file.txt");
-    Files.write(file.toPath(), "some data".getBytes(UTF_8));
-    assertThat(toByteArraySupplier(file).get()).isEqualTo("some data".getBytes(UTF_8));
+  void testToByteArraySupplier_file() throws Exception {
+    Path dir = createDirectory(tmpDir.resolve("arbitrary"));
+    Path file = createFile(dir.resolve("file.txt"));
+    Files.write(file, "some data".getBytes(UTF_8));
+    assertThat(toByteArraySupplier(file.toFile()).get()).isEqualTo("some data".getBytes(UTF_8));
   }
 
   private ImmutableMap<String, String> readAllFiles(FilesWithEntryPoint reportFiles) {
@@ -147,16 +148,16 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testCreateReportFiles_destinationIsFile() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    folder.newFolder("my", "root", "some", "path");
-    File destination = folder.newFile("my/root/some/path/file.txt");
-    Files.write(destination.toPath(), "some data".getBytes(UTF_8));
+  void testCreateReportFiles_destinationIsFile() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path somePath = createDirectories(root.resolve("some/path"));
+    Path destination = createFile(somePath.resolve("file.txt"));
+    Files.write(destination, "some data".getBytes(UTF_8));
     // Since the entry point is obvious here - any hint given is just ignored.
-    File ignoredHint = folder.newFile("my/root/ignored.txt");
+    File ignoredHint = createFile(root.resolve("ignored.txt")).toFile();
 
     FilesWithEntryPoint files =
-        readFilesWithEntryPoint(destination, Optional.of(ignoredHint), root);
+        readFilesWithEntryPoint(destination.toFile(), Optional.of(ignoredHint), root);
 
     assertThat(files.entryPoint().toString())
         .isEqualTo(filenameJoiner.join("some", "path", "file.txt"));
@@ -165,13 +166,13 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testCreateReportFiles_destinationDoesntExist() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
+  void testCreateReportFiles_destinationDoesntExist() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
     File destination = root.resolve("non/existing.txt").toFile();
     assertThat(destination.isFile()).isFalse();
     assertThat(destination.isDirectory()).isFalse();
-    // Since there are not files, any hint given is obvioulsy wrong and will be ignored.
-    File ignoredHint = folder.newFile("my/root/ignored.txt");
+    // Since there are no files, any hint given is obviously wrong and will be ignored.
+    File ignoredHint = createFile(root.resolve("ignored.txt")).toFile();
 
     FilesWithEntryPoint files =
         readFilesWithEntryPoint(destination, Optional.of(ignoredHint), root);
@@ -181,34 +182,33 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testCreateReportFiles_noFiles() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    File destination = folder.newFolder("my", "root", "some", "path");
-    folder.newFolder("my", "root", "some", "path", "a", "b");
-    folder.newFolder("my", "root", "some", "path", "c");
-    // Since there are not files, any hint given is obvioulsy wrong and will be ignored.
-    File ignoredHint = folder.newFile("my/root/ignored.txt");
+  void testCreateReportFiles_noFiles() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path destination = createDirectories(root.resolve("some/path"));
+    createDirectories(destination.resolve("a/b"));
+    createDirectory(destination.resolve("c"));
+    // Since there are not files, any hint given is obviously wrong and will be ignored.
+    File ignoredHint = createFile(root.resolve("ignored.txt")).toFile();
 
     FilesWithEntryPoint files =
-        readFilesWithEntryPoint(destination, Optional.of(ignoredHint), root);
+        readFilesWithEntryPoint(destination.toFile(), Optional.of(ignoredHint), root);
 
     assertThat(files.entryPoint().toString()).isEqualTo(filenameJoiner.join("some", "path"));
     assertThat(files.files()).isEmpty();
   }
 
   @Test
-  public void testCreateReportFiles_oneFile() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    File destination = folder.newFolder("my", "root", "some", "path");
-    folder.newFolder("my", "root", "some", "path", "a", "b");
-    folder.newFolder("my", "root", "some", "path", "c");
-    Files.write(
-        folder.newFile("my/root/some/path/a/file.txt").toPath(), "some data".getBytes(UTF_8));
+  void testCreateReportFiles_oneFile() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path destination = createDirectories(root.resolve("some/path"));
+    createDirectories(destination.resolve("a/b"));
+    createDirectory(destination.resolve("c"));
+    Files.write(createFile(destination.resolve("a/file.txt")), "some data".getBytes(UTF_8));
     // Since the entry point is obvious here - any hint given is just ignored.
-    File ignoredHint = folder.newFile("my/root/ignored.txt");
+    File ignoredHint = createFile(root.resolve("ignored.txt")).toFile();
 
     FilesWithEntryPoint files =
-        readFilesWithEntryPoint(destination, Optional.of(ignoredHint), root);
+        readFilesWithEntryPoint(destination.toFile(), Optional.of(ignoredHint), root);
 
     assertThat(files.entryPoint().toString())
         .isEqualTo(filenameJoiner.join("some", "path", "a", "file.txt"));
@@ -222,22 +222,19 @@ public final class GcsPluginUtilsTest {
    * <p>TODO(guyben): switch to checking zip file instead.
    */
   @Test
-  public void testCreateReportFiles_multipleFiles_noHint() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    File destination = folder.newFolder("my", "root", "some", "path");
-    folder.newFolder("my", "root", "some", "path", "a", "b");
-    folder.newFolder("my", "root", "some", "path", "c");
+  void testCreateReportFiles_multipleFiles_noHint() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path destination = createDirectories(root.resolve("some/path"));
+    createDirectories(destination.resolve("a/b"));
+    createDirectory(destination.resolve("c"));
 
-    Files.write(
-        folder.newFile("my/root/some/path/index.html").toPath(), "some data".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/a/index.html").toPath(), "wrong index".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/c/style.css").toPath(), "css file".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/my_image.png").toPath(), "images".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("index.html")), "some data".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("a/index.html")), "wrong index".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("c/style.css")), "css file".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("my_image.png")), "images".getBytes(UTF_8));
 
-    FilesWithEntryPoint files = readFilesWithEntryPoint(destination, Optional.empty(), root);
+    FilesWithEntryPoint files =
+        readFilesWithEntryPoint(destination.toFile(), Optional.empty(), root);
 
     assertThat(files.entryPoint().toString())
         .isEqualTo(filenameJoiner.join("some", "path", "path.zip"));
@@ -251,24 +248,20 @@ public final class GcsPluginUtilsTest {
    * <p>TODO(guyben): switch to checking zip file instead.
    */
   @Test
-  public void testCreateReportFiles_multipleFiles_withBadHint() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    File destination = folder.newFolder("my", "root", "some", "path");
+  void testCreateReportFiles_multipleFiles_withBadHint() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path destination = createDirectories(root.resolve("some/path"));
     // This entry point points to a directory, which isn't an appropriate entry point
-    File badEntryPoint = folder.newFolder("my", "root", "some", "path", "a", "b");
-    folder.newFolder("my", "root", "some", "path", "c");
+    File badEntryPoint = createDirectories(destination.resolve("a/b")).toFile();
+    createDirectory(destination.resolve("c"));
 
-    Files.write(
-        folder.newFile("my/root/some/path/index.html").toPath(), "some data".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/a/index.html").toPath(), "wrong index".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/c/style.css").toPath(), "css file".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/my_image.png").toPath(), "images".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("index.html")), "some data".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("a/index.html")), "wrong index".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("c/style.css")), "css file".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("my_image.png")), "images".getBytes(UTF_8));
 
     FilesWithEntryPoint files =
-        readFilesWithEntryPoint(destination, Optional.of(badEntryPoint), root);
+        readFilesWithEntryPoint(destination.toFile(), Optional.of(badEntryPoint), root);
 
     assertThat(files.entryPoint().toString())
         .isEqualTo(filenameJoiner.join("some", "path", "path.zip"));
@@ -277,24 +270,21 @@ public final class GcsPluginUtilsTest {
   }
 
   @Test
-  public void testCreateReportFiles_multipleFiles_withGoodHint() throws Exception {
-    Path root = toNormalizedPath(folder.newFolder("my", "root"));
-    File destination = folder.newFolder("my", "root", "some", "path");
-    folder.newFolder("my", "root", "some", "path", "a", "b");
-    folder.newFolder("my", "root", "some", "path", "c");
+  void testCreateReportFiles_multipleFiles_withGoodHint() throws Exception {
+    Path root = toNormalizedPath(createDirectories(tmpDir.resolve("my/root")).toAbsolutePath());
+    Path destination = createDirectories(root.resolve("some/path"));
+    createDirectories(destination.resolve("a/b"));
+    createDirectory(destination.resolve("c"));
     // The hint is an actual file nested in the destination directory!
-    File goodEntryPoint = folder.newFile("my/root/some/path/index.html");
+    Path goodEntryPoint = createFile(destination.resolve("index.html"));
 
-    Files.write(goodEntryPoint.toPath(), "some data".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/a/index.html").toPath(), "wrong index".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/c/style.css").toPath(), "css file".getBytes(UTF_8));
-    Files.write(
-        folder.newFile("my/root/some/path/my_image.png").toPath(), "images".getBytes(UTF_8));
+    Files.write(goodEntryPoint, "some data".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("a/index.html")), "wrong index".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("c/style.css")), "css file".getBytes(UTF_8));
+    Files.write(createFile(destination.resolve("my_image.png")), "images".getBytes(UTF_8));
 
     FilesWithEntryPoint files =
-        readFilesWithEntryPoint(destination, Optional.of(goodEntryPoint), root);
+        readFilesWithEntryPoint(destination.toFile(), Optional.of(goodEntryPoint.toFile()), root);
 
     assertThat(files.entryPoint().toString())
         .isEqualTo(filenameJoiner.join("some", "path", "index.html"));

common/build.gradle

@@ -61,8 +61,6 @@ dependencies {
   testingCompile deps['com.google.truth:truth']
   testingCompile deps['io.github.java-diff-utils:java-diff-utils']
 
-  testCompile deps['junit:junit']
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
-  testCompile deps['org.junit.vintage:junit-vintage-engine']
 }

common/gradle/dependency-locks/compile.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/compileClasspath.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/default.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/deploy_jar.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/errorproneJavac.lockfile

@@ -1,4 +1,3 @@
 # 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.errorprone:javac:9+181-r4173-1

common/gradle/dependency-locks/runtime.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -4,9 +4,9 @@
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1

common/gradle/dependency-locks/testCompile.lockfile

@@ -6,7 +6,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -14,16 +14,15 @@ com.googlecode.java-diff-utils:diffutils:1.3.0
 io.github.java-diff-utils:java-diff-utils:4.0
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-junit:junit:4.13
+junit:junit:4.12
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -6,7 +6,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -14,16 +14,15 @@ com.googlecode.java-diff-utils:diffutils:1.3.0
 io.github.java-diff-utils:java-diff-utils:4.0
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-junit:junit:4.13
+junit:junit:4.12
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testRuntime.lockfile

@@ -7,7 +7,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -15,16 +15,15 @@ com.googlecode.java-diff-utils:diffutils:1.3.0
 io.github.java-diff-utils:java-diff-utils:4.0
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-junit:junit:4.13
+junit:junit:4.12
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -7,7 +7,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -15,16 +15,15 @@ com.googlecode.java-diff-utils:diffutils:1.3.0
 io.github.java-diff-utils:java-diff-utils:4.0
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-junit:junit:4.13
+junit:junit:4.12
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testingCompile.lockfile

@@ -6,7 +6,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -16,6 +16,6 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3

common/gradle/dependency-locks/testingCompileClasspath.lockfile

@@ -6,7 +6,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -16,6 +16,6 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3

common/gradle/dependency-locks/testingRuntime.lockfile

@@ -7,7 +7,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -17,6 +17,6 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3

common/gradle/dependency-locks/testingRuntimeClasspath.lockfile

@@ -7,7 +7,7 @@ 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.guava:failureaccess:1.0.1
-com.google.guava:guava:28.2-jre
+com.google.guava:guava:29.0-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
@@ -17,6 +17,6 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.1
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.hamcrest:hamcrest-core:1.3

common/src/main/java/google/registry/util/Sleeper.java

@@ -21,7 +21,6 @@ import org.joda.time.ReadableDuration;
  * An object which accepts requests to put the current thread to sleep.
  *
  * @see SystemSleeper
- * @see google.registry.testing.FakeSleeper
  */
 @ThreadSafe
 public interface Sleeper {

common/src/test/java/google/registry/testing/truth/TextDiffSubjectTest.java

@@ -17,7 +17,7 @@ package google.registry.testing.truth;
 import static com.google.common.io.Resources.getResource;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.truth.TextDiffSubject.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
@@ -25,13 +25,10 @@ import com.google.common.io.Resources;
 import google.registry.testing.truth.TextDiffSubject.DiffFormat;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link TextDiffSubject}. */
-@RunWith(JUnit4.class)
-public class TextDiffSubjectTest {
+class TextDiffSubjectTest {
 
   private static final String RESOURCE_FOLDER = "google/registry/testing/truth/";
   // Resources for input data.
@@ -44,21 +41,21 @@ public class TextDiffSubjectTest {
       RESOURCE_FOLDER + "text-sidebyside-diff.txt";
 
   @Test
-  public void unifiedDiff_equal() throws IOException {
+  void unifiedDiff_equal() throws IOException {
     assertThat(getResource(ACTUAL_RESOURCE))
         .withDiffFormat(DiffFormat.UNIFIED_DIFF)
         .hasSameContentAs(getResource(ACTUAL_RESOURCE));
   }
 
   @Test
-  public void sideBySideDiff_equal() throws IOException {
+  void sideBySideDiff_equal() throws IOException {
     assertThat(getResource(ACTUAL_RESOURCE))
         .withDiffFormat(DiffFormat.SIDE_BY_SIDE_MARKDOWN)
         .hasSameContentAs(getResource(ACTUAL_RESOURCE));
   }
 
   @Test
-  public void unifedDiff_notEqual() throws IOException {
+  void unifedDiff_notEqual() throws IOException {
     assertThrows(
         AssertionError.class,
         () ->
@@ -68,7 +65,7 @@ public class TextDiffSubjectTest {
   }
 
   @Test
-  public void sideBySideDiff_notEqual() throws IOException {
+  void sideBySideDiff_notEqual() throws IOException {
     assertThrows(
         AssertionError.class,
         () ->
@@ -78,13 +75,13 @@ public class TextDiffSubjectTest {
   }
 
   @Test
-  public void displayed_unifiedDiff_noDiff() throws IOException {
+  void displayed_unifiedDiff_noDiff() throws IOException {
     ImmutableList<String> actual = readAllLinesFromResource(ACTUAL_RESOURCE);
     assertThat(TextDiffSubject.generateUnifiedDiff(actual, actual)).isEqualTo("");
   }
 
   @Test
-  public void displayed_unifiedDiff_hasDiff() throws IOException {
+  void displayed_unifiedDiff_hasDiff() throws IOException {
     ImmutableList<String> actual = readAllLinesFromResource(ACTUAL_RESOURCE);
     ImmutableList<String> expected = readAllLinesFromResource(EXPECTED_RESOURCE);
     String diff = Joiner.on('\n').join(readAllLinesFromResource(UNIFIED_DIFF_RESOURCE));
@@ -92,7 +89,7 @@ public class TextDiffSubjectTest {
   }
 
   @Test
-  public void displayed_sideBySideDiff_hasDiff() throws IOException {
+  void displayed_sideBySideDiff_hasDiff() throws IOException {
     ImmutableList<String> actual = readAllLinesFromResource(ACTUAL_RESOURCE);
     ImmutableList<String> expected = readAllLinesFromResource(EXPECTED_RESOURCE);
     String diff = Joiner.on('\n').join(readAllLinesFromResource(SIDE_BY_SIDE_DIFF_RESOURCE));

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

@@ -16,6 +16,7 @@ package google.registry.testing.truth;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.truth.Truth.assertAbout;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.github.difflib.DiffUtils;
@@ -31,6 +32,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import com.google.common.truth.Fact;
 import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.SimpleSubjectBuilder;
 import com.google.common.truth.Subject;
 import java.io.IOException;
 import java.net.URL;
@@ -68,6 +70,15 @@ public class TextDiffSubject extends Subject {
     this.actual = ImmutableList.copyOf(actual);
   }
 
+  protected TextDiffSubject(FailureMetadata metadata, URL actual) {
+    super(metadata, actual);
+    try {
+      this.actual = ImmutableList.copyOf(Resources.asCharSource(actual, UTF_8).readLines());
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   public TextDiffSubject withDiffFormat(DiffFormat format) {
     this.diffFormat = format;
     return this;
@@ -100,6 +111,11 @@ public class TextDiffSubject extends Subject {
     return assertThat(Resources.asCharSource(resourceUrl, UTF_8).readLines());
   }
 
+  public static SimpleSubjectBuilder<TextDiffSubject, URL> assertWithMessageAboutUrlSource(
+      String format, Object... params) {
+    return assertWithMessage(format, params).about(urlFactory());
+  }
+
   private static final Subject.Factory<TextDiffSubject, ImmutableList<String>>
       TEXT_DIFF_SUBJECT_TEXT_FACTORY = TextDiffSubject::new;
 
@@ -107,6 +123,13 @@ public class TextDiffSubject extends Subject {
     return TEXT_DIFF_SUBJECT_TEXT_FACTORY;
   }
 
+  private static final Subject.Factory<TextDiffSubject, URL> TEXT_DIFF_SUBJECT_URL_FACTORY =
+      TextDiffSubject::new;
+
+  public static Subject.Factory<TextDiffSubject, URL> urlFactory() {
+    return TEXT_DIFF_SUBJECT_URL_FACTORY;
+  }
+
   static String generateUnifiedDiff(
       ImmutableList<String> expectedContent, ImmutableList<String> actualContent) {
     Patch<String> diff;

config/dependency-license/allowed_licenses.json

@@ -66,6 +66,9 @@
     {
       "moduleLicense": "BSD 3-clause New License"
     },
+    {
+      "moduleLicense": "3-Clause BSD License"
+    },
     {
       "moduleLicense": "The 3-Clause BSD License"
     },

config/nom_build.py

@@ -19,6 +19,7 @@ import argparse
 import attr
 import io
 import os
+import shutil
 import subprocess
 import sys
 from typing import List, Union
@@ -49,16 +50,32 @@ PROPERTIES_HEADER = """\
 # This file defines properties used by the gradle build.  It must be kept in
 # sync with config/nom_build.py.
 #
-# To regenerate, run config/nom_build.py --generate-gradle-properties
+# To regenerate, run ./nom_build --generate-gradle-properties
 #
 # To view property descriptions (which are command line flags for
-# nom_build), run config/nom_build.py --help.
+# nom_build), run ./nom_build --help.
 #
 # DO NOT EDIT THIS FILE BY HAND
 org.gradle.jvmargs=-Xmx1024m
 """
 
+# Help text to be displayed (in addition to the synopsis and flag help, which
+# are displayed automatically).
+HELP_TEXT = """\
+A wrapper around the gradle build that provides the following features:
+
+-   Converts properties into flags to guard against property name spelling errors
+    and to provide help descriptions for all properties.
+-   Provides pseudo-commands (with the ":nom:" prefix) that encapsulate common
+    actions that are difficult to implement in gradle.
+
+Pseudo-commands:
+    :nom:generate_golden_file - regenerates the golden file from the current
+        set of flyway files.
+"""
+
 # Define all of our special gradle properties here.
+# TODO(b/169318491): use consistent naming style for properties and variables.
 PROPERTIES = [
     Property('mavenUrl',
              'URL to use for the main maven repository (defaults to maven '
@@ -108,12 +125,20 @@ PROPERTIES = [
              'server/schema integration tests. Please refer to <a '
              'href="./integration/README.md">integration project</a> for more '
              'information.'),
+    Property('baseSchemaTag',
+             'The nomulus version tag of the schema for use in the schema'
+             'deployment integration test (:db:schemaIncrementalDeployTest)'),
     Property('schema_version',
              'The nomulus version tag of the schema for use in a database'
              'integration test.'),
     Property('nomulus_version',
              'The version of nomulus to test against in a database '
              'integration test.'),
+    Property('dot_path',
+             'The path to "dot", part of the graphviz package that converts '
+             'a BEAM pipeline to image. Setting this property to empty string '
+             'will disable image generation.',
+             '/usr/bin/dot'),
 ]
 
 GRADLE_FLAGS = [
@@ -251,8 +276,42 @@ def get_root() -> str:
     return cur_dir
 
 
-def main(args):
-    parser = argparse.ArgumentParser('nom_build')
+class Abort(Exception):
+    """Raised to terminate the process with a non-zero error code.
+
+    Parameters are ignored.
+    """
+
+
+def do_pseudo_task(task: str) -> None:
+    root = get_root()
+    if task == ':nom:generate_golden_file':
+        if not subprocess.call([f'{root}/gradlew', ':db:test']):
+            print('\033[33mWARNING:\033[0m Golden schema appears to be '
+                  'up-to-date.  If you are making schema changes,  be sure to '
+                  'add a flyway file for them.')
+            return
+        print('\033[33mWARNING:\033[0m Ignore the above failure, it is '
+              'expected.')
+
+        # Copy the new schema into place.
+        shutil.copy(f'{root}/db/build/resources/test/testcontainer/'
+                    'mount/dump.txt',
+                    f'{root}/db/src/main/resources/sql/schema/'
+                    'nomulus.golden.sql')
+
+        if subprocess.call([f'{root}/gradlew', ':db:test']):
+            print('\033[31mERROR:\033[0m Golden file test failed after '
+                  'copying schema.  Please check your flyway files.')
+            raise Abort()
+    else:
+        print(f'\033[31mERROR:\033[0m Unknown task {task}')
+        raise Abort()
+
+
+def main(args) -> int:
+    parser = argparse.ArgumentParser('nom_build', description=HELP_TEXT,
+                                     formatter_class=argparse.RawTextHelpFormatter)
     for prop in PROPERTIES:
         parser.add_argument('--' + prop.name, default=prop.default,
                             help=prop.desc)
@@ -291,7 +350,7 @@ def main(args):
     if args.generate_gradle_properties:
         with open(f'{root}/gradle.properties', 'w') as dst:
             dst.write(gradle_properties)
-        return
+        return 0
 
     # Verify that the gradle properties file is what we expect it to be.
     with open(f'{root}/gradle.properties') as src:
@@ -316,12 +375,39 @@ def main(args):
             if flag.has_arg:
                 gradle_command.append(arg_val)
 
+    # See if there are any special ":nom:" pseudo-tasks specified.
+    got_non_pseudo_tasks = False
+    for arg in args.non_flag_args[1:]:
+        if arg.startswith(':nom:'):
+            if got_non_pseudo_tasks:
+                # We can't currently deal with the situation of gradle tasks
+                # before pseudo-tasks.  This could be implemented by invoking
+                # gradle for only the set of gradle tasks before the pseudo
+                # task, but that's overkill for now.
+                print(f'\033[31mERROR:\033[0m Pseudo task ({arg}) must be '
+                      'specified prior to all actual gradle tasks.  Aborting.')
+                return 1
+            do_pseudo_task(arg)
+        else:
+            got_non_pseudo_tasks = True
+    non_flag_args = [
+        arg for arg in args.non_flag_args[1:] if not arg.startswith(':nom:')]
+
+    if not non_flag_args:
+        if not got_non_pseudo_tasks:
+            print('\033[33mWARNING:\033[0m No tasks specified.  Not '
+                  'doing anything')
+        return 0
+
     # Add the non-flag args (we exclude the first, which is the command name
     # itself) and run.
-    gradle_command.extend(args.non_flag_args[1:])
-    subprocess.call(gradle_command)
+    gradle_command.extend(non_flag_args)
+    return subprocess.call(gradle_command)
 
 
 if __name__ == '__main__':
-    main(sys.argv)
+    try:
+        sys.exit(main(sys.argv))
+    except Abort as ex:
+        sys.exit(1)
 

config/nom_build_test.py

@@ -14,6 +14,7 @@
 
 import io
 import os
+import shutil
 import unittest
 from unittest import mock
 import nom_build
@@ -67,6 +68,7 @@ class MyTest(unittest.TestCase):
             mock.patch.object(nom_build, 'print', self.print_fake).start())
 
         self.call_mock = mock.patch.object(subprocess, 'call').start()
+        self.copy_mock = mock.patch.object(shutil, 'copy').start()
 
         self.file_contents = {
             # Prefil with the actual file contents.
@@ -92,17 +94,32 @@ class MyTest(unittest.TestCase):
 
     def test_no_args(self):
         nom_build.main(['nom_build'])
-        self.assertEqual(self.printed, [])
-        self.call_mock.assert_called_with([GRADLEW])
+        self.assertEqual(self.printed,
+                         ['\x1b[33mWARNING:\x1b[0m No tasks specified.  Not '
+                         'doing anything'])
 
     def test_property_calls(self):
-        nom_build.main(['nom_build', '--testFilter=foo'])
-        self.call_mock.assert_called_with([GRADLEW, '-P', 'testFilter=foo'])
+        nom_build.main(['nom_build', 'task-name', '--testFilter=foo'])
+        self.call_mock.assert_called_with([GRADLEW, '-P', 'testFilter=foo',
+                                          'task-name'])
 
     def test_gradle_flags(self):
-        nom_build.main(['nom_build', '-d', '-b', 'foo'])
+        nom_build.main(['nom_build', 'task-name', '-d', '-b', 'foo'])
         self.call_mock.assert_called_with([GRADLEW, '--build-file', 'foo',
-                                          '--debug'])
+                                          '--debug', 'task-name'])
+
+    def test_generate_golden_file(self):
+        self.call_mock.side_effect = [1, 0]
+        nom_build.main(['nom_build', ':nom:generate_golden_file'])
+        self.call_mock.assert_has_calls([
+            mock.call([GRADLEW, ':db:test']),
+            mock.call([GRADLEW, ':db:test'])
+        ])
+
+    def test_generate_golden_file_nofail(self):
+        self.call_mock.return_value = 0
+        nom_build.main(['nom_build', ':nom:generate_golden_file'])
+        self.call_mock.assert_has_calls([mock.call([GRADLEW, ':db:test'])])
 
 unittest.main()
 

config/presubmits.py

@@ -18,11 +18,12 @@ Error Prone) so we must write them manually.
 """
 
 import os
+from typing import List, Tuple
 import sys
 import re
 
 # We should never analyze any generated files
-UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/"}
+UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/"}
 # We can't rely on CI to have the Enum package installed so we do this instead.
 FORBIDDEN = 1
 REQUIRED = 2
@@ -77,9 +78,9 @@ PRESUBMITS = {
     PresubmitCheck(
         r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
         ("java", "js", "soy", "sql", "py", "sh", "gradle"), {
-            ".git", "/build/", "/generated/", "node_modules/",
-            "JUnitBackports.java", "registrar_bin.", "registrar_dbg.",
-            "google-java-format-diff.py",
+            ".git", "/build/", "/generated/", "/generated_tests/",
+            "node_modules/", "JUnitBackports.java", "registrar_bin.",
+            "registrar_dbg.", "google-java-format-diff.py",
             "nomulus.golden.sql", "soyutils_usegoog.js"
         }, REQUIRED):
         "File did not include the license header.",
@@ -93,12 +94,21 @@ PRESUBMITS = {
     PresubmitCheck(
         r".*\bSystem\.(out|err)\.print", "java", {
             "StackdriverDashboardBuilder.java", "/tools/", "/example/",
-            "RegistryTestServerMain.java", "TestServerRule.java",
+            "RegistryTestServerMain.java", "TestServerExtension.java",
             "FlowDocumentationTool.java"
         }):
         "System.(out|err).println is only allowed in tools/ packages. Please "
         "use a logger instead.",
 
+    # ObjectifyService.register is restricted to main/ or AppEngineExtension.
+    PresubmitCheck(
+        r".*\bObjectifyService\.register", "java", {
+            "/build/", "/generated/", "node_modules/", "src/main/",
+            "AppEngineExtension.java"
+        }):
+      "ObjectifyService.register(...) is not allowed in tests. Please use "
+      "AppEngineExtension.register(...) instead.",
+
     # PostgreSQLContainer instantiation must specify docker tag
     PresubmitCheck(
         r"[\s\S]*new\s+PostgreSQLContainer(<[\s\S]*>)?\(\s*\)[\s\S]*",
@@ -169,6 +179,90 @@ PRESUBMITS = {
         "JavaScript files should not include console logging."
 }
 
+# Note that this regex only works for one kind of Flyway file.  If we want to
+# start using "R" and "U" files we'll need to update this script.
+FLYWAY_FILE_RX = re.compile(r'V(\d+)__.*')
+
+
+def get_seqnum(filename: str, location: str) -> int:
+  """Extracts the sequence number from a filename."""
+  m = FLYWAY_FILE_RX.match(filename)
+  if m is None:
+    raise ValueError('Illegal Flyway filename: %s in %s' % (filename, location))
+  return int(m.group(1))
+
+
+def files_by_seqnum(files: List[str], location: str) -> List[Tuple[int, str]]:
+  """Returns the list of seqnum, filename sorted by sequence number."""
+  return [(get_seqnum(filename, location), filename) for filename in files]
+
+
+def has_valid_order(indexed_files: List[Tuple[int, str]], location: str) -> bool:
+  """Verify that sequence numbers are in order without gaps or duplicates.
+
+  Args:
+    files: List of seqnum, filename for a list of Flyway files.
+    location: Where the list of files came from (for error reporting).
+
+  Returns:
+    True if the file list is valid.
+  """
+  last_index = 0
+  valid = True
+  for seqnum, filename in indexed_files:
+    if seqnum == last_index:
+      print('duplicate Flyway file sequence number found in %s: %s' %
+            (location, filename))
+      valid = False
+    elif seqnum < last_index:
+      print('File %s in %s is out of order.' % (filename, location))
+      valid = False
+    elif seqnum != last_index + 1:
+      print('Missing Flyway sequence number %d in %s.  Next file is %s' %
+            (last_index + 1, location, filename))
+      valid = False
+    last_index = seqnum
+  return valid
+
+
+def verify_flyway_index():
+  """Verifies that the Flyway index file is in sync with the directory."""
+  success = True
+
+  # Sort the files in the Flyway directory by their sequence number.
+  files = sorted(
+      files_by_seqnum(os.listdir('db/src/main/resources/sql/flyway'),
+                      'Flyway directory'))
+
+  # Make sure that there are no gaps and no duplicate sequence numbers in the
+  # files themselves.
+  if not has_valid_order(files, 'Flyway directory'):
+    success = False
+
+  # Remove the sequence numbers and compare against the index file contents.
+  files = [filename[1] for filename in sorted(files)]
+  with open('db/src/main/resources/sql/flyway.txt') as index:
+    indexed_files = index.read().splitlines()
+  if files != indexed_files:
+    unindexed = set(files) - set(indexed_files)
+    if unindexed:
+      print('The following Flyway files are not in flyway.txt: %s' % unindexed)
+
+    nonexistent = set(indexed_files) - set(files)
+    if nonexistent:
+      print('The following files are in flyway.txt but not in the Flyway '
+            'directory: %s' % nonexistent)
+
+    # Do an ordering check on the index file (ignore the result, we're failing
+    # anyway).
+    has_valid_order(files_by_seqnum(indexed_files, 'flyway.txt'), 'flyway.txt')
+    success = False
+
+  if not success:
+    print('Please fix any conflicts and run "./nom_build :db:generateFlywayIndex"')
+
+  return not success
+
 
 def get_files():
   for root, dirnames, filenames in os.walk("."):
@@ -188,5 +282,10 @@ if __name__ == "__main__":
       failed = True
       print("%s had errors: \n  %s" % (file, "\n  ".join(error_messages)))
 
+  # And now for something completely different: check to see if the Flyway
+  # index is up-to-date.  It's quicker to do it here than in the unit tests:
+  # when we put it here it fails fast before all of the tests are run.
+  failed |= verify_flyway_index()
+
   if failed:
     sys.exit(1)

core/build.gradle

@@ -22,7 +22,7 @@ plugins {
 
 // Path to code generated by ad hoc tasks in this project. A separate path is
 // used for easy inspection.
-def generatedDir = "${project.buildDir}/generated/source/custom/main"
+def generatedDir = "${project.buildDir}/generated/sources/custom/java/main"
 def resourcesDir = "${project.buildDir}/resources/main"
 def screenshotsDir = "${project.buildDir}/screenshots"
 def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
@@ -82,11 +82,6 @@ sourceSets {
   main {
     java {
       srcDirs += generatedDir
-      // Javadoc API is deprecated in Java 11 and removed in Java 12.
-      // TODO(jianglai): re-enable after migrating to the new Javadoc API
-      if ((JavaVersion.current().majorVersion as Integer) >= 11) {
-        exclude 'google/registry/documentation/**'
-      }
     }
     resources {
       exclude '**/*.xjb'
@@ -230,14 +225,15 @@ dependencies {
   testRuntime deps['io.github.java-diff-utils:java-diff-utils']
   testCompile deps['javax.annotation:javax.annotation-api']
   testCompile deps['javax.annotation:jsr250-api']
-  compile deps['javax.inject:javax.inject']
   compile deps['javax.mail:mail']
+  compile deps['javax.inject:javax.inject']
   compile deps['javax.persistence:javax.persistence-api']
   compile deps['javax.servlet:servlet-api']
   compile deps['javax.xml.bind:jaxb-api']
   compile deps['jline:jline']
   compile deps['joda-time:joda-time']
   compile deps['org.apache.avro:avro']
+  testCompile deps['org.apache.beam:beam-runners-core-construction-java']
   testCompile deps['org.apache.beam:beam-runners-direct-java']
   compile deps['org.apache.beam:beam-runners-google-cloud-dataflow-java']
   compile deps['org.apache.beam:beam-sdks-java-core']
@@ -249,6 +245,7 @@ dependencies {
   testCompile deps['org.apache.ftpserver:ftpserver-core']
   compile deps['org.apache.httpcomponents:httpclient']
   compile deps['org.apache.httpcomponents:httpcore']
+  runtime deps['org.apache.logging.log4j:log4j-core']
   testCompile deps['org.apache.sshd:sshd-core']
   testCompile deps['org.apache.sshd:sshd-scp']
   testCompile deps['org.apache.sshd:sshd-sftp']
@@ -256,22 +253,23 @@ dependencies {
   compile deps['org.bouncycastle:bcpg-jdk15on']
   testCompile deps['org.bouncycastle:bcpkix-jdk15on']
   compile deps['org.bouncycastle:bcprov-jdk15on']
+  testCompile deps['com.fasterxml.jackson.core:jackson-databind']
   runtime deps['org.glassfish.jaxb:jaxb-runtime']
   compile deps['org.hibernate:hibernate-core']
   compile deps['org.joda:joda-money']
   compile deps['org.json:json']
   testCompile deps['org.mortbay.jetty:jetty']
-  runtimeOnly deps['org.postgresql:postgresql']
+  compile deps['org.postgresql:postgresql']
   testCompile deps['org.seleniumhq.selenium:selenium-api']
   testCompile deps['org.seleniumhq.selenium:selenium-chrome-driver']
   testCompile deps['org.seleniumhq.selenium:selenium-java']
   testCompile deps['org.seleniumhq.selenium:selenium-remote-driver']
   runtimeOnly deps['org.slf4j:slf4j-jdk14']
   testCompile deps['org.testcontainers:jdbc']
+  testCompile deps['org.testcontainers:junit-jupiter']
   compile deps['org.testcontainers:postgresql']
   testCompile deps['org.testcontainers:selenium']
   testCompile deps['org.testcontainers:testcontainers']
-  testCompile deps['pl.pragmatists:JUnitParams']
   compile deps['xerces:xmlParserAPIs']
   compile deps['xpp3:xpp3']
   // This dependency must come after javax.mail:mail as it would otherwise
@@ -295,6 +293,8 @@ dependencies {
   testAnnotationProcessor deps['com.google.auto.value:auto-value']
   annotationProcessor deps['com.google.dagger:dagger-compiler']
   testAnnotationProcessor deps['com.google.dagger:dagger-compiler']
+  annotationProcessor project(':processor')
+  testAnnotationProcessor project(':processor')
 
   testCompile deps['com.google.appengine:appengine-testing']
   testCompile deps['com.google.guava:guava-testlib']
@@ -309,10 +309,12 @@ dependencies {
   testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.jupiter:junit-jupiter-migrationsupport']
+  testCompile deps['org.junit.jupiter:junit-jupiter-params']
+  testCompile deps['org.junit-pioneer:junit-pioneer']
   testCompile deps['org.junit.platform:junit-platform-runner']
   testCompile deps['org.junit.platform:junit-platform-suite-api']
-  testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.mockito:mockito-core']
+  testCompile deps['org.mockito:mockito-junit-jupiter']
   runtime deps['org.postgresql:postgresql']
 
   // Indirect dependency found by undeclared-dependency check. Such
@@ -403,6 +405,9 @@ task jaxbToJava {
         }
       }
     }
+    execInBash(
+        'find . -name *.java -exec sed -i /\\*\\ \\<p\\>\\$/d {} +',
+        generatedDir)
   }
 }
 
@@ -629,6 +634,259 @@ artifacts {
   testRuntime testJar
 }
 
+task findGoldenImages(type: JavaExec) {
+  classpath = sourceSets.test.runtimeClasspath
+  main = 'google.registry.webdriver.GoldenImageFinder'
+
+  def arguments = []
+  arguments << "--screenshots_for_goldens_dir=${screenshotsForGoldensDir}"
+  arguments << "--new_goldens_dir=${newGoldensDir}"
+  arguments << "--existing_goldens_dir=${goldensDir}"
+  if (rootProject.findProperty("overrideExistingGoldens") == "true") {
+    arguments << "--override_existing_goldens=true"
+  }
+  args arguments
+}
+
+Optional<List<String>> getToolArgsList() {
+  // If "-PtoolArgs=..." is present in the command line, use it to set the args,
+  // otherwise use the default flag, which is "--args" to set the args.
+  def toolArgs = rootProject.findProperty("toolArgs")
+  if (toolArgs != null) {
+    def delimiter = '|'
+    toolArgs += delimiter
+    def argsList = []
+    def currArg = ''
+    for (def i = 0; i < toolArgs.length(); i++) {
+      def currChar = toolArgs[i]
+      if (currChar != delimiter) {
+        currArg += currChar
+      } else if (i != 0 && toolArgs[i - 1] == '\\') {
+        currArg = currArg.substring(0, currArg.length() - 1) + currChar
+      } else {
+        argsList.add(currArg)
+        currArg = ''
+      }
+    }
+    return Optional.of(argsList)
+  }
+  return Optional.empty()
+}
+
+
+// To run the nomulus tools with these command line tokens:
+// "--foo", "bar baz", "--qux=quz"
+//   gradle registryTool --args="--foo 'bar baz' --qux=quz"
+// or:
+//   gradle registryTool --PtoolArgs="--foo|bar baz|--qux=quz"
+// Note that the delimiting pipe can be backslash escaped if it is part of a
+// parameter.
+ext.createToolTask = {
+    taskName,
+    mainClass,
+    sourceSet = sourceSets.main ->
+  project.tasks.create(taskName, JavaExec) {
+    classpath = sourceSet.runtimeClasspath
+    main = mainClass
+
+    doFirst {
+      getToolArgsList().ifPresent {
+        args it
+      }
+    }
+  }
+}
+createToolTask('registryTool', 'google.registry.tools.RegistryTool')
+createToolTask(
+    'devTool',
+    'google.registry.tools.DevTool',
+    sourceSets.nonprod)
+
+project.tasks.create('initSqlPipeline', JavaExec) {
+  main = 'google.registry.beam.initsql.InitSqlPipeline'
+
+  doFirst {
+    getToolArgsList().ifPresent {
+      args it
+    }
+
+    def isDirectRunner =
+        args.contains('DirectRunner') || args.contains('--runner=DirectRunner')
+    // The dependency containing DirectRunner is intentionally excluded from the
+    // production binary, so that it won't be chosen by mistake: we definitely do
+    // not want to use it for the real jobs, yet DirectRunner is the default if
+    // the user forgets to override it.
+    // DirectRunner is required for tests and is already on testRuntimeClasspath.
+    // For simplicity, we add testRuntimeClasspath to this task's classpath instead
+    // of defining a new configuration just for the DirectRunner dependency.
+    classpath =
+        isDirectRunner
+            ? sourceSets.main.runtimeClasspath.plus(sourceSets.test.runtimeClasspath)
+            : sourceSets.main.runtimeClasspath
+  }
+}
+
+project.tasks.create('generateSqlSchema', JavaExec) {
+  classpath = sourceSets.nonprod.runtimeClasspath
+  main = 'google.registry.tools.DevTool'
+  args = [
+      '-e', 'alpha',
+      'generate_sql_schema', '--start_postgresql', '-o',
+      "${rootProject.projectRootDir}/db/src/main/resources/sql/schema/" +
+      "db-schema.sql.generated"
+  ]
+}
+
+task generateGoldenImages(type: FilteringTest) {
+  tests = ["**/webdriver/*"]
+
+  // Sets the maximum number of test executors that may exist at the same time.
+  maxParallelForks 5
+
+  systemProperty 'test.screenshot.dir', screenshotsForGoldensDir
+  systemProperty 'test.screenshot.runAllAttempts', 'true'
+  systemProperty 'test.screenshot.maxAttempts', '5'
+
+  doFirst {
+    new File(screenshotsForGoldensDir).deleteDir()
+  }
+}
+generateGoldenImages.finalizedBy(findGoldenImages)
+
+createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool')
+
+// 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
+// for excludes.
+task nomulusFossJar (type: Jar) {
+  archiveBaseName = 'nomulus'
+  archiveClassifier = 'public'
+  from (project.sourceSets.main.output) {
+    exclude 'google/registry/config/files/**'
+    exclude 'google/registry/proxy/config/**'
+  }
+  from (project.sourceSets.main.output) {
+    include 'google/registry/config/files/default-config.yaml'
+    include 'google/registry/config/files/nomulus-config-unittest.yaml'
+  }
+}
+
+// An UberJar of registry test classes, resources and all dependencies.
+// See comments on configurations.nomulus_test above for details.
+createUberJar(
+    'testUberJar',
+    'nomulus-tests',
+    '',
+    [project.configurations.testRuntimeClasspath],
+    [project.sourceSets.test.output],
+    [
+        // Exclude SQL schema, which is a test dependency.
+        'sql/flyway/**',
+        // ShadowJar includes java source files when used on
+        // sourceSets.test.output.
+        '**/*.java'
+    ])
+tasks.testUberJar {
+  archiveClassifier = 'alldeps'
+}
+
+artifacts {
+  nomulus_test nomulusFossJar
+  nomulus_test testUberJar
+}
+
+publishing {
+  repositories {
+    maven {
+      url project.publish_repo
+    }
+  }
+  publications {
+    nomulusTestsPublication(MavenPublication) {
+      groupId 'google.registry'
+      artifactId 'nomulus_test'
+      version project.nomulus_version
+      artifact nomulusFossJar
+      artifact testUberJar
+    }
+  }
+}
+
+task buildToolImage(dependsOn: nomulus, type: Exec) {
+  commandLine 'docker', 'build', '-t', 'nomulus-tool', '.'
+}
+
+task generateInitSqlPipelineGraph(type: Test) {
+  include "**/InitSqlPipelineGraphTest.*"
+  testNameIncludePatterns = ["**createPipeline_compareGraph"]
+  ignoreFailures = true
+}
+
+task updateInitSqlPipelineGraph(type: Copy) {
+  def graphRelativePath = 'google/registry/beam/initsql/'
+  from ("${projectDir}/build/resources/test/${graphRelativePath}") {
+    include 'pipeline_curr.dot'
+    rename 'curr', 'golden'
+  }
+  into "src/test/resources/${graphRelativePath}"
+
+  dependsOn generateInitSqlPipelineGraph
+
+  doLast {
+    if (com.google.common.base.Strings.isNullOrEmpty(project.dot_path)) {
+      getLogger().info('Property dot_path is null. Not creating image for pipeline graph.')
+    }
+    def dotPath = project.dot_path
+    if (!new File(dotPath).exists()) {
+      throw new RuntimeException(
+          """\
+              ${dotPath} not found. Make sure graphviz is installed
+              and the dot_path property is set correctly."""
+              .stripIndent())
+    }
+    def goldenGraph = "src/test/resources/${graphRelativePath}/pipeline_golden.dot"
+    def goldenImage = "src/test/resources/${graphRelativePath}/pipeline_golden.png"
+    def cmd = "${dotPath} -Tpng -o \"${goldenImage}\" \"${goldenGraph}\""
+    try {
+      rootProject.ext.execInBash(cmd, projectDir)
+    } catch (Throwable throwable) {
+      throw new RuntimeException(
+          """\
+              Failed to generate golden image with command ${cmd}
+              Error: ${throwable.getMessage()}
+          """)
+    }
+  }
+}
+
+// Build the devtool jar.
+createUberJar(
+    'devtool',
+    'devtool',
+    'google.registry.tools.DevTool',
+    [ project.configurations.nonprodRuntimeClasspath ],
+    [ project.sourceSets.nonprod.output, sourceSets.main.output ],
+    [ '**/*.java' ])
+
+artifacts {
+  devtool devtool
+}
+
+task copyJsFilesForTestServer(dependsOn: assemble, type: Copy) {
+  // Unfortunately the test server relies on having some compiled JS/CSS
+  // in place, so copy it over here
+  from "${resourcesDir}/google/registry/ui/"
+  include '**/*.js'
+  include '**/*.css'
+  into "${project.projectDir}/src/main/resources/google/registry/ui/"
+}
+
+task runTestServer(dependsOn: copyJsFilesForTestServer, type: JavaExec) {
+  main = 'google.registry.server.RegistryTestServerMain'
+  classpath = sourceSets.test.runtimeClasspath
+}
+
 /**
  * We have to break out the test suites because some of the tests conflict
  * with one another, but unfortunately this breaks the "--tests" flag.  The
@@ -701,40 +959,20 @@ task fragileTest(type: FilteringTest) {
 
   // Run every test class in a freshly started process.
   forkEvery 1
+
+  doFirst {
+    new File(screenshotsDir).deleteDir()
+  }
 }
 
 task outcastTest(type: FilteringTest) {
   tests = outcastTestPatterns
 
   // Sets the maximum number of test executors that may exist at the same time.
-  maxParallelForks 5
-}
-
-// Whitebox test verifying that RegistryTool can be instantiated. Note the
-// use of runtimeClasspath. This test emulates the logic in RegistryCli#run.
-// A to-do is added there to refactor.
-// TODO(weiminyu): Need a similar test for Registry server.
-task registryToolIntegrationTest {
-  dependsOn compileJava
-  doLast {
-    def classLoader =
-        new URLClassLoader(sourceSets.main.runtimeClasspath.collect {
-            it.toURI().toURL()
-        } as URL[])
-    def commandClasses =
-        (classLoader.loadClass('google.registry.tools.RegistryTool')
-            .getDeclaredField('COMMAND_MAP').get(null) as Map).values()
-
-    commandClasses.each {
-      try {
-        Constructor<?> c = ((Class<?>) it).getDeclaredConstructor()
-        c.setAccessible(true)
-        c.newInstance()
-      } catch (Throwable e) {
-        throw new RuntimeException("Failed to instantiate ${it}:\n ${e}")
-      }
-    }
-  }
+  // Note that this number appears to contribute to NoClassDefFoundError
+  // exceptions on certain machines and distros. The root cause is unclear.
+  // Try reducing this number if you experience similar problems.
+  maxParallelForks 3
 }
 
 // Dedicated test suite for schema-dependent tests.
@@ -747,121 +985,22 @@ task sqlIntegrationTest(type: FilteringTest) {
   tests = ['google/registry/schema/integration/SqlIntegrationTestSuite.*']
 }
 
-task findGoldenImages(type: JavaExec) {
-  classpath = sourceSets.test.runtimeClasspath
-  main = 'google.registry.webdriver.GoldenImageFinder'
-
-  def arguments = []
-  arguments << "--screenshots_for_goldens_dir=${screenshotsForGoldensDir}"
-  arguments << "--new_goldens_dir=${newGoldensDir}"
-  arguments << "--existing_goldens_dir=${goldensDir}"
-  if (rootProject.findProperty("overrideExistingGoldens") == "true") {
-    arguments << "--override_existing_goldens=true"
-  }
-  args arguments
-}
-
-Optional<List<String>> getToolArgsList() {
-  // If "-PtoolArgs=..." is present in the command line, use it to set the args,
-  // otherwise use the default flag, which is "--args" to set the args.
-  def toolArgs = rootProject.findProperty("toolArgs")
-  if (toolArgs != null) {
-    def delimiter = '|'
-    toolArgs += delimiter
-    def argsList = []
-    def currArg = ''
-    for (def i = 0; i < toolArgs.length(); i++) {
-      def currChar = toolArgs[i]
-      if (currChar != delimiter) {
-        currArg += currChar
-      } else if (i != 0 && toolArgs[i - 1] == '\\') {
-        currArg = currArg.substring(0, currArg.length() - 1) + currChar
-      } else {
-        argsList.add(currArg)
-        currArg = ''
-      }
-    }
-    return Optional.of(argsList)
-  }
-  return Optional.empty()
-}
-
-
-// To run the nomulus tools with these command line tokens:
-// "--foo", "bar baz", "--qux=quz"
-//   gradle registryTool --args="--foo 'bar baz' --qux=quz"
-// or:
-//   gradle registryTool --PtoolArgs="--foo|bar baz|--qux=quz"
-// Note that the delimiting pipe can be backslash escaped if it is part of a
-// parameter.
-ext.createToolTask = {
-    taskName,
-    mainClass,
-    sourceSet = sourceSets.main ->
-  project.tasks.create(taskName, JavaExec) {
-    classpath = sourceSet.runtimeClasspath
-    main = mainClass
-
-    doFirst {
-      getToolArgsList().ifPresent {
-        args it
-      }
-    }
-  }
-}
-createToolTask('registryTool', 'google.registry.tools.RegistryTool')
-createToolTask(
-    'devTool',
-    'google.registry.tools.DevTool',
-    sourceSets.nonprod)
-
-project.tasks.create('generateSqlSchema', JavaExec) {
-  classpath = sourceSets.nonprod.runtimeClasspath
-  main = 'google.registry.tools.DevTool'
-  args = [
-      '-e', 'alpha',
-      'generate_sql_schema', '--start_postgresql', '-o',
-      "${rootProject.projectRootDir}/db/src/main/resources/sql/schema/" +
-      "db-schema.sql.generated"
-  ]
-}
-
-task generateGoldenImages(type: FilteringTest) {
-  tests = ["**/webdriver/*"]
-
-  // Sets the maximum number of test executors that may exist at the same time.
-  maxParallelForks 5
-
-  systemProperty 'test.screenshot.dir', screenshotsForGoldensDir
-  systemProperty 'test.screenshot.runAllAttempts', 'true'
-  systemProperty 'test.screenshot.maxAttempts', '5'
-
-  doFirst {
-    new File(screenshotsForGoldensDir).deleteDir()
-  }
-}
-generateGoldenImages.finalizedBy(findGoldenImages)
-
-task flowDocsTool(type: JavaExec) {
-  systemProperty 'test.projectRoot', rootProject.projectRootDir
-  systemProperty 'test.resourcesDir', resourcesDir
-
-  classpath = sourceSets.main.runtimeClasspath
-  main = 'google.registry.documentation.FlowDocumentationTool'
-
-  def arguments = []
-  if (rootProject.flowDocsFile) {
-    arguments << "--output_file=${rootProject.flowDocsFile}"
-  } else {
-    arguments << "--output_file=${rootProject.projectRootDir}/docs/flows.md"
-  }
-  args arguments
+// Verifies that RegistryTool can be instantiated:
+// - All dependencies are packaged in nomulus.jar
+// - JPA setup succeeds.
+task registryToolIntegrationTest(dependsOn: nomulus, type: FilteringTest) {
+  tests = ['google/registry/tools/RegistryToolTest.*']
+  testClassesDirs = sourceSets.test.output.classesDirs
+  classpath = nomulus.outputs.files.plus(configurations.testRuntimeClasspath)
+      .plus(files(testClassesDirs))
 }
 
 task standardTest(type: FilteringTest) {
   includeAllTests()
   exclude fragileTestPatterns
   exclude outcastTestPatterns
+  // See SqlIntegrationTestSuite.java
+  exclude '**/*BeforeSuiteTest.*', '**/*AfterSuiteTest.*'
 
   if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
     exclude dockerIncompatibleTestPatterns
@@ -873,14 +1012,13 @@ task standardTest(type: FilteringTest) {
   // forkEvery 1
 
   // Sets the maximum number of test executors that may exist at the same time.
+  // Also, Gradle executes tests in 1 thread and some of our test infrastructures
+  // depend on that, e.g. DualDatabaseTestInvocationContextProvider injects
+  // different implementation of TransactionManager into TransactionManagerFactory.
   maxParallelForks 5
 
   systemProperty 'test.projectRoot', rootProject.projectRootDir
   systemProperty 'test.resourcesDir', resourcesDir
-
-  doFirst {
-    new File(screenshotsDir).deleteDir()
-  }
 }
 
 test {
@@ -890,94 +1028,6 @@ test {
   // TODO(weiminyu): Remove dependency on sqlIntegrationTest
 }.dependsOn(fragileTest, outcastTest, standardTest, registryToolIntegrationTest, sqlIntegrationTest)
 
-createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool')
-
-// A jar with classes and resources from main sourceSet, excluding internal
-// data. See comments on configurations.nomulus_test above for details.
-task nomulusFossJar (type: Jar) {
-  archiveBaseName = 'nomulus'
-  archiveClassifier = 'public'
-  from (project.sourceSets.main.output) {
-    exclude 'google/registry/config/files/**'
-  }
-  from (project.sourceSets.main.output) {
-    include 'google/registry/config/files/default-config.yaml'
-    include 'google/registry/config/files/nomulus-config-unittest.yaml'
-  }
-}
-
-// An UberJar of registry test classes, resources and all dependencies.
-// See comments on configurations.nomulus_test above for details.
-createUberJar(
-    'testUberJar',
-    'nomulus-tests',
-    '',
-    [project.configurations.testRuntimeClasspath],
-    [project.sourceSets.test.output],
-    [
-        // Exclude SQL schema, which is a test dependency.
-        'sql/flyway/**',
-        // ShadowJar includes java source files when used on
-        // sourceSets.test.output.
-        '**/*.java'
-    ])
-tasks.testUberJar {
-  archiveClassifier = 'alldeps'
-}
-
-artifacts {
-  nomulus_test nomulusFossJar
-  nomulus_test testUberJar
-}
-
-publishing {
-  repositories {
-    maven {
-      url project.publish_repo
-    }
-  }
-  publications {
-    nomulusTestsPublication(MavenPublication) {
-      groupId 'google.registry'
-      artifactId 'nomulus_test'
-      version project.nomulus_version
-      artifact nomulusFossJar
-      artifact testUberJar
-    }
-  }
-}
-
-task buildToolImage(dependsOn: nomulus, type: Exec) {
-  commandLine 'docker', 'build', '-t', 'nomulus-tool', '.'
-}
-
-// Build the devtool jar.
-createUberJar(
-    'devtool',
-    'devtool',
-    'google.registry.tools.DevTool',
-    [ project.configurations.nonprodRuntimeClasspath ],
-    [ project.sourceSets.nonprod.output, sourceSets.main.output ],
-    [ '**/*.java' ])
-
-artifacts {
-  devtool devtool
-}
-
-task copyJsFilesForTestServer(dependsOn: assemble, type: Copy) {
-  // Unfortunately the test server relies on having some compiled JS/CSS
-  // in place, so copy it over here
-  from "${resourcesDir}/google/registry/ui/"
-  include '**/*.js'
-  include '**/*.css'
-  into "${project.projectDir}/src/main/resources/google/registry/ui/"
-}
-
-task runTestServer(dependsOn: copyJsFilesForTestServer, type: JavaExec) {
-  main = 'google.registry.server.RegistryTestServerMain'
-  classpath = sourceSets.test.runtimeClasspath
-}
-
 project.build.dependsOn devtool
 project.build.dependsOn buildToolImage
 project.build.dependsOn ':stage'

core/gradle/dependency-locks/annotationProcessor.lockfile

@@ -7,29 +7,34 @@ com.google.auto.value:auto-value:1.6.3
 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.21
-com.google.dagger:dagger-producers:2.21
-com.google.dagger:dagger-spi:2.21
-com.google.dagger:dagger:2.21
+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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
+com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_check_api:2.3.3
 com.google.errorprone:error_prone_core:2.3.3
 com.google.errorprone:error_prone_type_annotations:2.3.3
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
+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.11.1
+com.squareup:javapoet:1.12.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
+javax.persistence:javax.persistence-api:2.2
+net.ltgt.gradle.incap:incap:0.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:2.5.3
+org.checkerframework:checker-qual:2.11.1
 org.checkerframework:dataflow:2.5.3
 org.checkerframework:javacutil:2.5.3
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib:1.3.61
+org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0
+org.jetbrains:annotations:13.0
 org.pcollections:pcollections:2.1.2

core/gradle/dependency-locks/compile.lockfile

@@ -1,105 +1,104 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -107,13 +106,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -128,39 +126,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -175,69 +174,77 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.6.2
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/compileClasspath.lockfile

@@ -1,104 +1,103 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -106,13 +105,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -127,38 +125,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -173,66 +173,75 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+joda-time:joda-time:2.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.6.2
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/default.lockfile

@@ -1,106 +1,105 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud.sql:postgres-socket-factory:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -108,13 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,39 +127,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -176,71 +175,79 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
+org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/deploy_jar.lockfile

@@ -1,106 +1,105 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud.sql:postgres-socket-factory:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -108,13 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,39 +127,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -176,68 +175,77 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+joda-time:joda-time:2.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
+org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/errorproneJavac.lockfile

@@ -1,4 +1,3 @@
 # 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.errorprone:javac:9+181-r4173-1

core/gradle/dependency-locks/nonprodCompile.lockfile

@@ -1,105 +1,104 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -107,13 +106,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -128,39 +126,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -175,69 +174,77 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.6.2
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/nonprodCompileClasspath.lockfile

@@ -1,104 +1,103 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -106,13 +105,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -127,38 +125,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -173,69 +173,77 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.6.2
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/nonprodRuntime.lockfile

@@ -1,105 +1,104 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -107,13 +106,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -128,39 +126,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -175,70 +174,78 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile

@@ -1,105 +1,104 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -107,13 +106,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -128,39 +126,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -175,70 +174,78 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/runtime.lockfile

@@ -1,105 +1,104 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -107,13 +106,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -128,39 +126,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -175,70 +174,78 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.12
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -1,106 +1,105 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
-args4j:args4j:2.0.23
+args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-databind:2.10.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud.sql:postgres-socket-factory:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -108,13 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,39 +127,40 @@ com.sun.istack:istack-commons-runtime:3.0.7
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -176,68 +175,77 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+joda-time:joda-time:2.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.5
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.checkerframework:checker-qual:2.10.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 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:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
-org.slf4j:slf4j-api:1.7.28
+org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4

core/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -7,29 +7,34 @@ com.google.auto.value:auto-value:1.6.3
 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.21
-com.google.dagger:dagger-producers:2.21
-com.google.dagger:dagger-spi:2.21
-com.google.dagger:dagger:2.21
+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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
+com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_check_api:2.3.3
 com.google.errorprone:error_prone_core:2.3.3
 com.google.errorprone:error_prone_type_annotations:2.3.3
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:29.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
+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.11.1
+com.squareup:javapoet:1.12.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
+javax.persistence:javax.persistence-api:2.2
+net.ltgt.gradle.incap:incap:0.2
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:2.5.3
+org.checkerframework:checker-qual:2.11.1
 org.checkerframework:dataflow:2.5.3
 org.checkerframework:javacutil:2.5.3
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
+org.jetbrains.kotlin:kotlin-stdlib:1.3.61
+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

@@ -1,107 +1,106 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
-com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-annotations:2.11.2
+com.fasterxml.jackson.core:jackson-core:2.11.2
+com.fasterxml.jackson.core:jackson-databind:2.11.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-api-stubs:1.9.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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-testlib:28.2-jre
-com.google.guava:guava:28.2-jre
+com.google.guava:guava-testlib:29.0-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -110,13 +109,12 @@ 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -136,40 +134,40 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -184,26 +182,31 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-direct-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-direct-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
@@ -211,6 +214,7 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+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
 org.apache.sshd:sshd-scp:2.0.0
@@ -221,11 +225,12 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
@@ -234,36 +239,39 @@ org.hamcrest:hamcrest-all:1.3
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.jupiter:junit-jupiter-migrationsupport:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.platform:junit-platform-launcher:1.6.1
-org.junit.platform:junit-platform-runner:1.6.1
-org.junit.platform:junit-platform-suite-api:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit-pioneer:junit-pioneer:0.7.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2
+org.junit.jupiter:junit-jupiter-params:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit.platform:junit-platform-launcher:1.6.2
+org.junit.platform:junit-platform-runner:1.6.2
+org.junit.platform:junit-platform-suite-api:1.6.2
+org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:2.25.0
+org.mockito:mockito-core:3.3.3
+org.mockito:mockito-junit-jupiter:3.3.3
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
@@ -278,17 +286,17 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:selenium:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:junit-jupiter:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:selenium:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,106 +1,105 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
-com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-annotations:2.11.2
+com.fasterxml.jackson.core:jackson-core:2.11.2
+com.fasterxml.jackson.core:jackson-databind:2.11.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-api-stubs:1.9.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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:28.2-jre
-com.google.guava:guava:28.2-jre
+com.google.guava:guava-testlib:29.0-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -109,13 +108,12 @@ 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -135,39 +133,40 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -182,26 +181,31 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-direct-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-direct-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
@@ -209,6 +213,7 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+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
 org.apache.sshd:sshd-scp:2.0.0
@@ -219,11 +224,12 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.1
+org.dom4j:dom4j:2.1.3
 org.easymock:easymock:3.0
 org.flywaydb:flyway-core:5.2.4
 org.glassfish.jaxb:jaxb-runtime:2.3.1
@@ -232,36 +238,39 @@ org.hamcrest:hamcrest-all:1.3
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.jupiter:junit-jupiter-migrationsupport:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.platform:junit-platform-launcher:1.6.1
-org.junit.platform:junit-platform-runner:1.6.1
-org.junit.platform:junit-platform-suite-api:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit-pioneer:junit-pioneer:0.7.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2
+org.junit.jupiter:junit-jupiter-params:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit.platform:junit-platform-launcher:1.6.2
+org.junit.platform:junit-platform-runner:1.6.2
+org.junit.platform:junit-platform-suite-api:1.6.2
+org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:2.25.0
+org.mockito:mockito-core:3.3.3
+org.mockito:mockito-junit-jupiter:3.3.3
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
@@ -276,17 +285,17 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:selenium:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:junit-jupiter:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:selenium:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testRuntime.lockfile

@@ -1,108 +1,107 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
-com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-annotations:2.11.2
+com.fasterxml.jackson.core:jackson-core:2.11.2
+com.fasterxml.jackson.core:jackson-databind:2.11.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-api-stubs:1.9.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud.sql:postgres-socket-factory:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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-testlib:28.2-jre
-com.google.guava:guava:28.2-jre
+com.google.guava:guava-testlib:29.0-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -111,13 +110,12 @@ 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -137,41 +135,41 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
+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-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -186,26 +184,31 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-direct-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-direct-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
@@ -213,6 +216,8 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
@@ -223,11 +228,12 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.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
@@ -237,37 +243,39 @@ org.hamcrest:hamcrest-all:1.3
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.jupiter:junit-jupiter-migrationsupport:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.platform:junit-platform-launcher:1.6.1
-org.junit.platform:junit-platform-runner:1.6.1
-org.junit.platform:junit-platform-suite-api:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit-pioneer:junit-pioneer:0.7.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2
+org.junit.jupiter:junit-jupiter-params:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit.platform:junit-platform-launcher:1.6.2
+org.junit.platform:junit-platform-runner:1.6.2
+org.junit.platform:junit-platform-suite-api:1.6.2
+org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:2.25.0
+org.mockito:mockito-core:3.3.3
+org.mockito:mockito-junit-jupiter:3.3.3
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
@@ -282,17 +290,17 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-org.slf4j:slf4j-api:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:selenium:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.slf4j:slf4j-api:1.7.30
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:junit-jupiter:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:selenium:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -1,108 +1,107 @@
 # 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.
-androidx.annotation:annotation:1.1.0
 antlr:antlr:2.7.7
 aopalliance:aopalliance:1.0
 args4j:args4j:2.33
 cglib:cglib-nodep:2.2
 com.beust:jcommander:1.60
-com.fasterxml.jackson.core:jackson-annotations:2.9.10
-com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
-com.fasterxml:classmate:1.3.4
-com.github.jnr:jffi:1.2.17
+com.fasterxml.jackson.core:jackson-annotations:2.11.2
+com.fasterxml.jackson.core:jackson-core:2.11.2
+com.fasterxml.jackson.core:jackson-databind:2.11.2
+com.fasterxml:classmate:1.5.1
+com.github.jnr:jffi:1.2.23
 com.github.jnr:jnr-a64asm:1.0.0
-com.github.jnr:jnr-constants:0.9.11
-com.github.jnr:jnr-enxio:0.19
-com.github.jnr:jnr-ffi:2.1.9
-com.github.jnr:jnr-posix:3.0.47
-com.github.jnr:jnr-unixsocket:0.21
+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-x86asm:1.0.2
+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-jackson2:1.27.0
-com.google.api-client:google-api-client-java6:1.27.0
+com.google.api-client:google-api-client-jackson2:1.30.9
+com.google.api-client:google-api-client-java6:1.30.9
 com.google.api-client:google-api-client-servlet:1.30.8
-com.google.api-client:google-api-client:1.30.8
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0
-com.google.api.grpc:grpc-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0
-com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0
-com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.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-grpc:1.38.0
-com.google.api:gax-httpjson:0.52.0
-com.google.api:gax:1.38.0
+com.google.api-client:google-api-client:1.30.9
+com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:grpc-google-common-protos:1.17.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.90.0
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.90.0
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.85.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.49.1
+com.google.api.grpc:proto-google-cloud-spanner-v1:1.49.1
+com.google.api.grpc:proto-google-common-protos:1.18.0
+com.google.api.grpc:proto-google-iam-v1:0.13.0
+com.google.api:api-common:1.8.1
+com.google.api:gax-grpc:1.54.0
+com.google.api:gax-httpjson:0.70.1
+com.google.api:gax:1.54.0
 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.apis:google-api-services-bigquery:v2-rev20181104-1.27.0
-com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0
+com.google.apis:google-api-services-bigquery:v2-rev20191211-1.30.9
+com.google.apis:google-api-services-clouddebugger:v2-rev20200313-1.30.9
 com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0
-com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20200311-1.30.9
+com.google.apis:google-api-services-dataflow:v1b3-rev20200305-1.30.9
 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-healthcare:v1beta1-rev20200525-1.30.9
 com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0
-com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0
+com.google.apis:google-api-services-pubsub:v1-rev20200312-1.30.9
 com.google.apis:google-api-services-sheets:v4-rev483-1.22.0
-com.google.apis:google-api-services-sqladmin:v1beta4-rev56-1.23.0
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20190827-1.30.1
+com.google.apis:google-api-services-storage:v1-rev20200326-1.30.9
 com.google.appengine.tools:appengine-gcs-client:0.6
 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.48
-com.google.appengine:appengine-api-stubs:1.9.48
-com.google.appengine:appengine-remote-api:1.9.48
-com.google.appengine:appengine-testing:1.9.58
-com.google.auth:google-auth-library-credentials:0.16.1
-com.google.auth:google-auth-library-oauth2-http:0.16.1
-com.google.auto.value:auto-value-annotations:1.6.3
+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.20.0
+com.google.auth:google-auth-library-oauth2-http:0.20.0
+com.google.auto.value:auto-value-annotations:1.7.1
 com.google.auto.value:auto-value:1.6.3
-com.google.cloud.bigdataoss:gcsio:1.9.16
-com.google.cloud.bigdataoss:util:1.9.16
-com.google.cloud.bigtable:bigtable-client-core:1.8.0
-com.google.cloud.datastore:datastore-v1-proto-client:1.6.0
-com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
-com.google.cloud.sql:postgres-socket-factory:1.0.12
-com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha
-com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha
-com.google.cloud:google-cloud-bigtable:0.73.0-alpha
-com.google.cloud:google-cloud-core-grpc:1.61.0
-com.google.cloud:google-cloud-core-http:1.55.0
-com.google.cloud:google-cloud-core:1.61.0
-com.google.cloud:google-cloud-spanner:1.6.0
+com.google.cloud.bigdataoss:gcsio:2.1.3
+com.google.cloud.bigdataoss:util:2.1.3
+com.google.cloud.bigtable:bigtable-client-core:1.13.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:google-cloud-bigquery:1.106.0
+com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta
+com.google.cloud:google-cloud-bigtable:1.9.1
+com.google.cloud:google-cloud-core-grpc:1.92.2
+com.google.cloud:google-cloud-core-http:1.92.4
+com.google.cloud:google-cloud-core:1.92.5
+com.google.cloud:google-cloud-spanner:1.49.1
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.5
+com.google.code.gson:gson:2.8.6
 com.google.common.html.types:types:1.0.4
-com.google.dagger:dagger:2.21
+com.google.dagger:dagger:2.28
 com.google.errorprone:error_prone_annotations:2.3.4
-com.google.flogger:flogger-system-backend:0.3.1
-com.google.flogger:flogger:0.3.1
-com.google.flogger:google-extensions:0.3.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-testlib:28.2-jre
-com.google.guava:guava:28.2-jre
+com.google.guava:guava-testlib:29.0-jre
+com.google.guava:guava:29.0-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.34.1
-com.google.http-client:google-http-client-jackson2:1.34.1
-com.google.http-client:google-http-client-jackson:1.20.0
-com.google.http-client:google-http-client-protobuf:1.20.0
-com.google.http-client:google-http-client:1.34.1
+com.google.http-client:google-http-client-jackson2:1.34.2
+com.google.http-client:google-http-client-protobuf:1.33.0
+com.google.http-client:google-http-client:1.34.2
 com.google.inject.extensions:guice-multibindings:4.1.0
 com.google.inject:guice:4.1.0
 com.google.j2objc:j2objc-annotations:1.3
@@ -111,13 +110,12 @@ 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.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 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.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -137,41 +135,41 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
+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-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.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
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -186,26 +184,31 @@ javax.transaction:transaction-api:1.1
 javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
-joda-time:joda-time:2.10.3
+joda-time:joda-time:2.10.5
 junit:junit:4.13
-net.bytebuddy:byte-buddy-agent:1.9.7
-net.bytebuddy:byte-buddy:1.9.11
-net.java.dev.jna:jna-platform:5.3.1
-net.java.dev.jna:jna:5.3.1
+net.bytebuddy:byte-buddy-agent:1.10.5
+net.bytebuddy:byte-buddy:1.10.10
+net.java.dev.jna:jna-platform:5.5.0
+net.java.dev.jna:jna:5.5.0
 org.apache.avro:avro:1.8.2
-org.apache.beam:beam-model-job-management:2.16.0
-org.apache.beam:beam-model-pipeline:2.16.0
-org.apache.beam:beam-runners-core-construction-java:2.16.0
-org.apache.beam:beam-runners-direct-java:2.16.0
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0
-org.apache.beam:beam-sdks-java-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0
-org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
-org.apache.beam:beam-vendor-grpc-1_21_0:0.1
+org.apache.beam:beam-model-fn-execution:2.23.0
+org.apache.beam:beam-model-job-management:2.23.0
+org.apache.beam:beam-model-pipeline:2.23.0
+org.apache.beam:beam-runners-core-construction-java:2.23.0
+org.apache.beam:beam-runners-direct-java:2.23.0
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.23.0
+org.apache.beam:beam-runners-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-core:2.23.0
+org.apache.beam:beam-sdks-java-expansion-service:2.23.0
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.23.0
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.23.0
+org.apache.beam:beam-sdks-java-fn-execution:2.23.0
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.23.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.commons:commons-compress:1.19
+org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-exec:1.3
 org.apache.commons:commons-lang3:3.8.1
 org.apache.commons:commons-text:1.6
@@ -213,6 +216,8 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
@@ -223,11 +228,12 @@ 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:2.10.0
+org.checkerframework:checker-qual:2.11.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.17
-org.dom4j:dom4j:2.1.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.conscrypt:conscrypt-openjdk-uber:2.2.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
@@ -237,37 +243,39 @@ org.hamcrest:hamcrest-all:1.3
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
-org.hibernate:hibernate-core:5.4.4.Final
-org.hibernate:hibernate-hikaricp:5.4.4.Final
+org.hibernate:hibernate-core:5.4.17.Final
+org.hibernate:hibernate-hikaricp:5.4.17.Final
 org.javassist:javassist:3.24.0-GA
 org.jboss.logging:jboss-logging:3.3.2.Final
 org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final
-org.jboss:jandex:2.0.5.Final
-org.jetbrains:annotations:17.0.0
+org.jboss:jandex:2.1.3.Final
+org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
-org.junit.jupiter:junit-jupiter-api:5.6.1
-org.junit.jupiter:junit-jupiter-engine:5.6.1
-org.junit.jupiter:junit-jupiter-migrationsupport:5.6.1
-org.junit.platform:junit-platform-commons:1.6.1
-org.junit.platform:junit-platform-engine:1.6.1
-org.junit.platform:junit-platform-launcher:1.6.1
-org.junit.platform:junit-platform-runner:1.6.1
-org.junit.platform:junit-platform-suite-api:1.6.1
-org.junit.vintage:junit-vintage-engine:5.6.1
-org.junit:junit-bom:5.6.1
+org.junit-pioneer:junit-pioneer:0.7.0
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2
+org.junit.jupiter:junit-jupiter-params:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit.platform:junit-platform-launcher:1.6.2
+org.junit.platform:junit-platform-runner:1.6.2
+org.junit.platform:junit-platform-suite-api:1.6.2
+org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:2.25.0
+org.mockito:mockito-core:3.3.3
+org.mockito:mockito-junit-jupiter:3.3.3
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:2.6
 org.opentest4j:opentest4j:1.2.0
-org.ow2.asm:asm-analysis:7.0
-org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm:7.0
-org.postgresql:postgresql:42.2.6
+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.postgresql:postgresql:42.2.14
 org.rnorth.duct-tape:duct-tape:1.0.8
 org.rnorth.visible-assertions:visible-assertions:2.1.2
 org.rnorth:tcp-unix-socket-proxy:1.0.2
@@ -282,18 +290,18 @@ org.seleniumhq.selenium:selenium-opera-driver:3.141.59
 org.seleniumhq.selenium:selenium-remote-driver:3.141.59
 org.seleniumhq.selenium:selenium-safari-driver:3.141.59
 org.seleniumhq.selenium:selenium-support:3.141.59
-org.slf4j:slf4j-api:1.7.28
+org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
-org.testcontainers:database-commons:1.12.1
-org.testcontainers:jdbc:1.12.1
-org.testcontainers:postgresql:1.12.1
-org.testcontainers:selenium:1.12.1
-org.testcontainers:testcontainers:1.12.1
-org.threeten:threetenbp:1.3.3
+org.testcontainers:database-commons:1.14.3
+org.testcontainers:jdbc:1.14.3
+org.testcontainers:junit-jupiter:1.14.3
+org.testcontainers:postgresql:1.14.3
+org.testcontainers:selenium:1.14.3
+org.testcontainers:testcontainers:1.14.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/karma.conf.js

@@ -39,7 +39,7 @@ module.exports = function(config) {
         included: false
       },
       {
-        pattern: 'core/build/generated/source/custom/main/**/*.soy.js',
+        pattern: 'core/build/generated/sources/custom/java/main/**/*.soy.js',
         included: false
       },
       {
@@ -65,7 +65,7 @@ module.exports = function(config) {
       '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/source/custom/main/**/*.soy.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/AppEngineEnvironment.java

@@ -0,0 +1,81 @@
+// 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.backup;
+
+import com.google.apphosting.api.ApiProxy;
+import com.google.apphosting.api.ApiProxy.Environment;
+import com.google.common.collect.ImmutableMap;
+import java.io.Closeable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * Sets up a fake {@link Environment} so that the following operations can be performed without the
+ * Datastore service:
+ *
+ * <ul>
+ *   <li>Create Objectify {@code Keys}.
+ *   <li>Instantiate Objectify objects.
+ *   <li>Convert Datastore {@code Entities} to their corresponding Objectify objects.
+ * </ul>
+ *
+ * <p>User has the option to specify their desired {@code appId} string, which forms part of an
+ * Objectify {@code Key} and is included in the equality check. This feature makes it easy to
+ * compare a migrated object in SQL with the original in Objectify.
+ *
+ * <p>Note that conversion from Objectify objects to Datastore {@code Entities} still requires the
+ * Datastore service.
+ */
+public class AppEngineEnvironment implements Closeable {
+
+  private boolean isPlaceHolderNeeded;
+
+  public AppEngineEnvironment() {
+    this("PlaceholderAppId");
+  }
+
+  public AppEngineEnvironment(String appId) {
+    isPlaceHolderNeeded = ApiProxy.getCurrentEnvironment() == null;
+    // isPlaceHolderNeeded may be true when we are invoked in a test with AppEngineRule.
+    if (isPlaceHolderNeeded) {
+      ApiProxy.setEnvironmentForCurrentThread(createAppEngineEnvironment(appId));
+    }
+  }
+
+  @Override
+  public void close() {
+    if (isPlaceHolderNeeded) {
+      ApiProxy.setEnvironmentForCurrentThread(null);
+    }
+  }
+
+  /** Returns a placeholder {@link Environment} that can return hardcoded AppId and Attributes. */
+  private static Environment createAppEngineEnvironment(String appId) {
+    return (Environment)
+        Proxy.newProxyInstance(
+            Environment.class.getClassLoader(),
+            new Class[] {Environment.class},
+            (Object proxy, Method method, Object[] args) -> {
+              switch (method.getName()) {
+                case "getAppId":
+                  return appId;
+                case "getAttributes":
+                  return ImmutableMap.<String, Object>of();
+                default:
+                  throw new UnsupportedOperationException(method.getName());
+              }
+            });
+  }
+}

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

@@ -0,0 +1,95 @@
+// 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.backup;
+
+import static com.google.common.base.Preconditions.checkState;
+import static google.registry.backup.BackupUtils.createDeserializingIterator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
+import google.registry.model.ImmutableObject;
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.CommitLogMutation;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Iterator;
+import java.util.stream.Stream;
+
+/**
+ * Helpers for reading CommitLog records from a file.
+ *
+ * <p>This class is adapted from {@link RestoreCommitLogsAction}, and will be used in the initial
+ * population of the Cloud SQL database.
+ */
+public final class CommitLogImports {
+
+  private CommitLogImports() {}
+
+  /**
+   * Returns entities in an {@code inputStream} (from a single CommitLog file) as an {@link
+   * ImmutableList} of {@link VersionedEntity} records. Upon completion the {@code inputStream} is
+   * closed.
+   *
+   * <p>The returned list may be empty, since CommitLogs are written at fixed intervals regardless
+   * if actual changes exist.
+   *
+   * <p>A CommitLog file starts with a {@link CommitLogCheckpoint}, followed by (repeated)
+   * subsequences of [{@link CommitLogManifest}, [{@link CommitLogMutation}] ...]. Each subsequence
+   * represents the changes in one transaction. The {@code CommitLogManifest} contains deleted
+   * entity keys, whereas each {@code CommitLogMutation} contains one whole entity.
+   */
+  public static ImmutableList<VersionedEntity> loadEntities(InputStream inputStream) {
+    try (AppEngineEnvironment appEngineEnvironment = new AppEngineEnvironment();
+        InputStream input = new BufferedInputStream(inputStream)) {
+      Iterator<ImmutableObject> commitLogs = createDeserializingIterator(input);
+      checkState(commitLogs.hasNext());
+      checkState(commitLogs.next() instanceof CommitLogCheckpoint);
+
+      return Streams.stream(commitLogs)
+          .map(
+              e ->
+                  e instanceof CommitLogManifest
+                      ? VersionedEntity.fromManifest((CommitLogManifest) e)
+                      : Stream.of(VersionedEntity.fromMutation((CommitLogMutation) e)))
+          .flatMap(s -> s)
+          .collect(ImmutableList.toImmutableList());
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /** Covenience method that adapts {@link #loadEntities(InputStream)} to a {@link File}. */
+  public static ImmutableList<VersionedEntity> loadEntities(File commitLogFile) {
+    try {
+      return loadEntities(new FileInputStream(commitLogFile));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Covenience method that adapts {@link #loadEntities(InputStream)} to a {@link
+   * ReadableByteChannel}.
+   */
+  public static ImmutableList<VersionedEntity> loadEntities(ReadableByteChannel channel) {
+    return loadEntities(Channels.newInputStream(channel));
+  }
+}

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

@@ -0,0 +1,198 @@
+// 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.backup;
+
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.EntityTranslator;
+import com.google.appengine.api.datastore.Key;
+import com.google.auto.value.AutoValue;
+import com.google.auto.value.extension.memoized.Memoized;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.CommitLogMutation;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+
+/**
+ * A Datastore {@link Entity Entity's} serialized state with timestamp. The intended use case is a
+ * multi-stage pipeline where an Entity's Java form is not needed in most stages.
+ *
+ * <p>For a new or updated Entity, its serialized bytes are stored along with its Datastore {@link
+ * Key}. For a deleted entity, only its Datastore {@link Key} is stored, and the {@link
+ * #entityProtoBytes} field is left unset.
+ *
+ * <p>Storing raw bytes is motivated by two factors. First, since I/O is frequent and the Java
+ * objects are rarely needed in our target use case, storing raw bytes is the most efficient
+ * approach. More importantly, due to our data model and our customization of {@link
+ * google.registry.model.ofy.ObjectifyService ObjectifyService}, it is challenging to implement a
+ * serializer for Objectify entities that preserves the value of all properties. Without such
+ * serializers, Objectify entities cannot be used in a pipeline.
+ *
+ * <p>Objectify entities do not implement {@link Serializable}, serialization of such objects is as
+ * follows:
+ *
+ * <ul>
+ *   <li>Convert an Objectify entity to a Datastore {@link Entity}: {@code
+ *       ofy().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.
+ * </ul>
+ *
+ * <p>When the first conversion above is applied to an Objectify entity, a property value in the
+ * output may differ from the input in two situations:
+ *
+ * <ul>
+ *   <li>If a property is of an assign-on-persist data type, e.g., {@link
+ *       google.registry.model.UpdateAutoTimestamp}.
+ *   <li>If it is related to CommitLog management, e.g., {@link google.registry.model.EppResource
+ *       EppResource.revisions}.
+ * </ul>
+ *
+ * <p>Working around the side effects caused by our customization is difficult. Any solution would
+ * likely rely on Objectify's stack of context. However, many Objectify invocations in our code base
+ * are hardcoded to call the customized version of ObjectifyService, rendering Objectify's stack
+ * useless.
+ *
+ * <p>For now, this inability to use Objectify entities in pipelines is mostly a testing problem: we
+ * can not perform {@link org.apache.beam.sdk.testing.PAssert BEAM pipeline assertions} on Objectify
+ * entities. {@code InitSqlTestUtils.assertContainsExactlyElementsIn} is an example of a workaround.
+ *
+ * <p>Note that {@link Optional java.util.Optional} is not serializable, therefore cannot be used as
+ * property type in this class.
+ */
+@AutoValue
+public abstract class VersionedEntity implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  public abstract long commitTimeMills();
+
+  /** The {@link Key} of the {@link Entity}. */
+  public abstract Key key();
+
+  /** Serialized form of the {@link Entity}. This property is {@code null} for a deleted Entity. */
+  @Nullable
+  abstract ImmutableBytes entityProtoBytes();
+
+  @Memoized
+  public Optional<Entity> getEntity() {
+    return Optional.ofNullable(entityProtoBytes())
+        .map(ImmutableBytes::getBytes)
+        .map(EntityTranslator::createFromPbBytes);
+  }
+
+  public boolean isDelete() {
+    return entityProtoBytes() == null;
+  }
+
+  /**
+   * Converts deleted entity keys in {@code manifest} into a {@link Stream} of {@link
+   * VersionedEntity VersionedEntities}. See {@link CommitLogImports#loadEntities} for more
+   * information.
+   */
+  public static Stream<VersionedEntity> fromManifest(CommitLogManifest manifest) {
+    long commitTimeMillis = manifest.getCommitTime().getMillis();
+    return manifest.getDeletions().stream()
+        .map(com.googlecode.objectify.Key::getRaw)
+        .map(key -> builder().commitTimeMills(commitTimeMillis).key(key).build());
+  }
+
+  /* Converts a {@link CommitLogMutation} to a {@link VersionedEntity}. */
+  public static VersionedEntity fromMutation(CommitLogMutation mutation) {
+    return from(
+        com.googlecode.objectify.Key.create(mutation).getParent().getId(),
+        mutation.getEntityProtoBytes());
+  }
+
+  public static VersionedEntity from(long commitTimeMillis, byte[] entityProtoBytes) {
+    return builder()
+        .entityProtoBytes(entityProtoBytes)
+        .key(EntityTranslator.createFromPbBytes(entityProtoBytes).getKey())
+        .commitTimeMills(commitTimeMillis)
+        .build();
+  }
+
+  static Builder builder() {
+    return new AutoValue_VersionedEntity.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder commitTimeMills(long commitTimeMillis);
+
+    abstract Builder entityProtoBytes(ImmutableBytes bytes);
+
+    public abstract Builder key(Key key);
+
+    public abstract VersionedEntity build();
+
+    public Builder entityProtoBytes(byte[] bytes) {
+      return entityProtoBytes(new ImmutableBytes(bytes));
+    }
+  }
+
+  /**
+   * Wraps a byte array and prevents it from being modified by its original owner.
+   *
+   * <p>While this class seems an overkill, it exists for two reasons:
+   *
+   * <ul>
+   *   <li>It is easier to override the {@link #equals} method here (for value-equivalence check)
+   *       than to override the AutoValue-generated {@code equals} method.
+   *   <li>To appease the style checker, which forbids arrays as AutoValue property.
+   * </ul>
+   */
+  static final class ImmutableBytes implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final byte[] bytes;
+
+    ImmutableBytes(byte[] bytes) {
+      this.bytes = Arrays.copyOf(bytes, bytes.length);
+    }
+
+    /**
+     * Returns the saved byte array. Invocation is restricted to trusted callers, who must not
+     * modify the array.
+     */
+    byte[] getBytes() {
+      return bytes;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (!(o instanceof ImmutableBytes)) {
+        return false;
+      }
+      ImmutableBytes that = (ImmutableBytes) o;
+      // Do not use Objects.equals, which checks reference identity instead of data in array.
+      return Arrays.equals(bytes, that.bytes);
+    }
+
+    @Override
+    public int hashCode() {
+      // Do not use Objects.hashCode, which hashes the reference, not the data in array.
+      return Arrays.hashCode(bytes);
+    }
+  }
+}

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

@@ -150,7 +150,7 @@ public final class AsyncTaskEnqueuer {
 
   /** Enqueues a task to asynchronously refresh DNS for a renamed host. */
   public void enqueueAsyncDnsRefresh(HostResource host, DateTime now) {
-    VKey<HostResource> hostKey = host.createKey();
+    VKey<HostResource> hostKey = host.createVKey();
     logger.atInfo().log("Enqueuing async DNS refresh for renamed host %s.", hostKey);
     addTaskToQueueWithRetry(
         asyncDnsRefreshPullQueue,
@@ -169,14 +169,20 @@ public final class AsyncTaskEnqueuer {
         lock.getRelockDuration().isPresent(),
         "Lock with ID %s not configured for relock",
         lock.getRevisionId());
+    enqueueDomainRelock(lock.getRelockDuration().get(), lock.getRevisionId(), 0);
+  }
+
+  /** Enqueues a task to asynchronously re-lock a registry-locked domain after it was unlocked. */
+  void enqueueDomainRelock(Duration countdown, long lockRevisionId, int previousAttempts) {
+    String backendHostname = appEngineServiceUtils.getServiceHostname("backend");
     addTaskToQueueWithRetry(
         asyncActionsPushQueue,
         TaskOptions.Builder.withUrl(RelockDomainAction.PATH)
             .method(Method.POST)
-            .param(
-                RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM,
-                String.valueOf(lock.getRevisionId()))
-            .countdownMillis(lock.getRelockDuration().get().getMillis()));
+            .header("Host", backendHostname)
+            .param(RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM, String.valueOf(lockRevisionId))
+            .param(RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM, String.valueOf(previousAttempts))
+            .countdownMillis(countdown.getMillis()));
   }
 
   /**

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

@@ -21,6 +21,7 @@ import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESOURCE_KEY;
 import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_ACTIONS;
 import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_DELETE;
 import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_HOST_RENAME;
+import static google.registry.request.RequestParameters.extractIntParameter;
 import static google.registry.request.RequestParameters.extractLongParameter;
 import static google.registry.request.RequestParameters.extractOptionalBooleanParameter;
 import static google.registry.request.RequestParameters.extractOptionalIntParameter;
@@ -94,9 +95,15 @@ public class BatchModule {
   }
 
   @Provides
-  @Parameter("oldUnlockRevisionId")
+  @Parameter(RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM)
   static long provideOldUnlockRevisionId(HttpServletRequest req) {
-    return extractLongParameter(req, "oldUnlockRevisionId");
+    return extractLongParameter(req, RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM);
+  }
+
+  @Provides
+  @Parameter(RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM)
+  static int providePreviousAttempts(HttpServletRequest req) {
+    return extractIntParameter(req, RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM);
   }
 
   @Provides

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

@@ -283,11 +283,11 @@ public class DeleteContactsAndHostsAction implements Runnable {
     /** Determine whether the target resource is a linked resource on the domain. */
     private boolean isLinked(DomainBase domain, Key<? extends EppResource> resourceKey) {
       if (resourceKey.getKind().equals(KIND_CONTACT)) {
-        return domain.getReferencedContacts().contains(resourceKey);
-      } else if (resourceKey.getKind().equals(KIND_HOST)) {
         return domain
-            .getNameservers()
-            .contains(VKey.createOfy(HostResource.class, (Key<HostResource>) resourceKey));
+            .getReferencedContacts()
+            .contains(VKey.from((Key<ContactResource>) resourceKey));
+      } else if (resourceKey.getKind().equals(KIND_HOST)) {
+        return domain.getNameservers().contains(VKey.from((Key<HostResource>) resourceKey));
       } else {
         throw new IllegalStateException("EPP resource key of unknown type: " + resourceKey);
       }
@@ -345,7 +345,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
       String resourceClientId = resource.getPersistedCurrentSponsorClientId();
       if (resource instanceof HostResource && ((HostResource) resource).isSubordinate()) {
         resourceClientId =
-            ofy().load().key(((HostResource) resource).getSuperordinateDomain()).now()
+            tm().load(((HostResource) resource).getSuperordinateDomain())
                 .cloneProjectedAtTime(now)
                 .getCurrentSponsorClientId();
       }
@@ -424,7 +424,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
       if (resource instanceof HostResource) {
         return ImmutableList.of(
             HostPendingActionNotificationResponse.create(
-                ((HostResource) resource).getFullyQualifiedHostName(), deleteAllowed, trid, now));
+                ((HostResource) resource).getHostName(), deleteAllowed, trid, now));
       } else if (resource instanceof ContactResource) {
         return ImmutableList.of(
             ContactPendingActionNotificationResponse.create(
@@ -463,11 +463,12 @@ public class DeleteContactsAndHostsAction implements Runnable {
       } else if (existingResource instanceof HostResource) {
         HostResource host = (HostResource) existingResource;
         if (host.isSubordinate()) {
-          dnsQueue.addHostRefreshTask(host.getFullyQualifiedHostName());
-          ofy().save().entity(
-              ofy().load().key(host.getSuperordinateDomain()).now().asBuilder()
-                  .removeSubordinateHost(host.getFullyQualifiedHostName())
-                  .build());
+          dnsQueue.addHostRefreshTask(host.getHostName());
+          tm().put(
+                  tm().load(host.getSuperordinateDomain())
+                      .asBuilder()
+                      .removeSubordinateHost(host.getHostName())
+                      .build());
         }
       } else {
         throw new IllegalStateException(
@@ -531,7 +532,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
           resource.getClass().getSimpleName());
       return new AutoValue_DeleteContactsAndHostsAction_DeletionRequest.Builder()
           .setKey(resourceKey)
-          .setLastUpdateTime(resource.getUpdateAutoTimestamp().getTimestamp())
+          .setLastUpdateTime(resource.getUpdateTimestamp().getTimestamp())
           .setRequestingClientId(
               checkNotNull(
                   params.get(PARAM_REQUESTING_CLIENT_ID), "Requesting client id not specified"))

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

@@ -177,7 +177,7 @@ public class DeleteProberDataAction implements Runnable {
         return;
       }
 
-      String domainName = domain.getFullyQualifiedDomainName();
+      String domainName = domain.getDomainName();
       if (domainName.equals("nic." + domain.getTld())) {
         getContext().incrementCounter("skipped, NIC domain");
         return;
@@ -246,28 +246,32 @@ public class DeleteProberDataAction implements Runnable {
     }
 
     private void softDeleteDomain(final DomainBase domain) {
-      tm().transactNew(() -> {
-          DomainBase deletedDomain = domain
-              .asBuilder()
-              .setDeletionTime(tm().getTransactionTime())
-              .setStatusValues(null)
-              .build();
-          HistoryEntry historyEntry = new HistoryEntry.Builder()
-              .setParent(domain)
-              .setType(DOMAIN_DELETE)
-              .setModificationTime(tm().getTransactionTime())
-              .setBySuperuser(true)
-              .setReason("Deletion of prober data")
-              .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);
-          updateForeignKeyIndexDeletionTime(deletedDomain);
-          dnsQueue.addDomainRefreshTask(deletedDomain.getFullyQualifiedDomainName());
-        }
-      );
+      tm().transactNew(
+              () -> {
+                DomainBase deletedDomain =
+                    domain
+                        .asBuilder()
+                        .setDeletionTime(tm().getTransactionTime())
+                        .setStatusValues(null)
+                        .build();
+                HistoryEntry historyEntry =
+                    new HistoryEntry.Builder()
+                        .setParent(domain)
+                        .setType(DOMAIN_DELETE)
+                        .setModificationTime(tm().getTransactionTime())
+                        .setBySuperuser(true)
+                        .setReason("Deletion of prober data")
+                        .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);
+                updateForeignKeyIndexDeletionTime(deletedDomain);
+                dnsQueue.addDomainRefreshTask(deletedDomain.getDomainName());
+              });
     }
   }
 }

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

@@ -155,89 +155,100 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
       }
       int numBillingEventsSaved = 0;
       try {
-        numBillingEventsSaved = tm().transactNew(() -> {
-          ImmutableSet.Builder<OneTime> syntheticOneTimesBuilder =
-              new ImmutableSet.Builder<>();
-          final Registry tld = Registry.get(getTldFromDomainName(recurring.getTargetId()));
+        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)));
+                      // 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);
+                      // 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);
+                      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);
+                      // 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);
+                      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(Key.create(recurring))
-                .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();
-        });
+                        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();
+                    });
       } catch (Throwable t) {
         getContext().incrementCounter("error: " + t.getClass().getSimpleName());
         getContext().incrementCounter(ERROR_COUNTER);
@@ -279,7 +290,8 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
       return Streams.stream(oneTimesForDomain)
           .filter(
               billingEvent ->
-                  Key.create(recurringEvent)
+                  recurringEvent
+                      .createVKey()
                       .equals(billingEvent.getCancellationMatchingBillingEvent()))
           .map(OneTime::getBillingTime)
           .collect(toImmutableSet());

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

@@ -207,20 +207,18 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
       Key<HostResource> referencingHostKey = null;
       for (DnsRefreshRequest request : refreshRequests) {
         if (isActive(domain, request.lastUpdateTime())
-            && domain
-                .getNameservers()
-                .contains(VKey.createOfy(HostResource.class, request.hostKey()))) {
+            && domain.getNameservers().contains(VKey.from(request.hostKey()))) {
           referencingHostKey = request.hostKey();
           break;
         }
       }
       if (referencingHostKey != null) {
         retrier.callWithRetry(
-            () -> dnsQueue.addDomainRefreshTask(domain.getFullyQualifiedDomainName()),
+            () -> dnsQueue.addDomainRefreshTask(domain.getDomainName()),
             TransientFailureException.class);
         logger.atInfo().log(
             "Enqueued DNS refresh for domain %s referenced by host %s.",
-            domain.getFullyQualifiedDomainName(), referencingHostKey);
+            domain.getDomainName(), referencingHostKey);
         getContext().incrementCounter("domains refreshed");
       } else {
         getContext().incrementCounter("domains not refreshed");
@@ -321,13 +319,13 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
       HostResource host =
           checkNotNull(ofy().load().key(hostKey).now(), "Host to refresh doesn't exist");
       boolean isHostDeleted =
-          isDeleted(host, latestOf(now, host.getUpdateAutoTimestamp().getTimestamp()));
+          isDeleted(host, latestOf(now, host.getUpdateTimestamp().getTimestamp()));
       if (isHostDeleted) {
         logger.atInfo().log("Host %s is already deleted, not refreshing DNS.", hostKey);
       }
       return new AutoValue_RefreshDnsOnHostRenameAction_DnsRefreshRequest.Builder()
           .setHostKey(hostKey)
-          .setLastUpdateTime(host.getUpdateAutoTimestamp().getTimestamp())
+          .setLastUpdateTime(host.getUpdateTimestamp().getTimestamp())
           .setRequestedTime(
               DateTime.parse(
                   checkNotNull(params.get(PARAM_REQUESTED_TIME), "Requested time not specified")))

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

@@ -15,19 +15,23 @@
 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;
 import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES;
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
+import google.registry.config.RegistryConfig.Config;
 import google.registry.model.domain.DomainBase;
 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.request.Action;
 import google.registry.request.Parameter;
@@ -36,11 +40,15 @@ import google.registry.request.auth.Auth;
 import google.registry.schema.domain.RegistryLock;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.DateTimeUtils;
+import google.registry.util.EmailMessage;
+import google.registry.util.SendEmailService;
+import java.util.Optional;
 import javax.inject.Inject;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import org.joda.time.Duration;
 
-/**
- * Task that relocks a previously-Registry-Locked domain after some predetermined period of time.
- */
+/** Task that re-locks a previously-Registry-Locked domain after a predetermined period of time. */
 @Action(
     service = Action.Service.BACKEND,
     path = RelockDomainAction.PATH,
@@ -51,30 +59,78 @@ public class RelockDomainAction implements Runnable {
 
   public static final String PATH = "/_dr/task/relockDomain";
   public static final String OLD_UNLOCK_REVISION_ID_PARAM = "oldUnlockRevisionId";
+  public static final String PREVIOUS_ATTEMPTS_PARAM = "previousAttempts";
+
+  static final int ATTEMPTS_BEFORE_SLOWDOWN = 36; // every ten minutes for six hours then every hour
+  static final int FAILURES_BEFORE_EMAIL = 2; // email after three failures, one half hour
+  private static final Duration TEN_MINUTES = Duration.standardMinutes(10);
+  private static final Duration ONE_HOUR = Duration.standardHours(1);
+
+  private static final String RELOCK_SUCCESS_EMAIL_TEMPLATE =
+      "The domain %s was successfully re-locked.\n\nPlease contact support at %s if you have any "
+          + "questions.";
+  private static final String RELOCK_NON_RETRYABLE_FAILURE_EMAIL_TEMPLATE =
+      "There was an error when automatically re-locking %s. Error message: %s\n\nPlease contact "
+          + "support at %s if you have any questions.";
+  private static final String RELOCK_TRANSIENT_FAILURE_EMAIL_TEMPLATE =
+      "There was an unexpected error when automatically re-locking %s. We will continue retrying "
+          + "the lock for five hours. Please contact support at %s if you have any questions";
+  private static final String RELOCK_UNKNOWN_ID_FAILURE_EMAIL_TEMPLATE =
+      "The old lock with revision ID %d is not present or is not accessible";
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   private final long oldUnlockRevisionId;
+  private final int previousAttempts;
+  private final InternetAddress alertRecipientAddress;
+  private final InternetAddress gSuiteOutgoingEmailAddress;
+  private final String supportEmail;
+  private final SendEmailService sendEmailService;
   private final DomainLockUtils domainLockUtils;
   private final Response response;
+  private final AsyncTaskEnqueuer asyncTaskEnqueuer;
 
   @Inject
   public RelockDomainAction(
       @Parameter(OLD_UNLOCK_REVISION_ID_PARAM) long oldUnlockRevisionId,
+      @Parameter(PREVIOUS_ATTEMPTS_PARAM) int previousAttempts,
+      @Config("alertRecipientEmailAddress") InternetAddress alertRecipientAddress,
+      @Config("gSuiteOutgoingEmailAddress") InternetAddress gSuiteOutgoingEmailAddress,
+      @Config("supportEmail") String supportEmail,
+      SendEmailService sendEmailService,
       DomainLockUtils domainLockUtils,
-      Response response) {
+      Response response,
+      AsyncTaskEnqueuer asyncTaskEnqueuer) {
     this.oldUnlockRevisionId = oldUnlockRevisionId;
+    this.previousAttempts = previousAttempts;
+    this.alertRecipientAddress = alertRecipientAddress;
+    this.gSuiteOutgoingEmailAddress = gSuiteOutgoingEmailAddress;
+    this.supportEmail = supportEmail;
+    this.sendEmailService = sendEmailService;
     this.domainLockUtils = domainLockUtils;
     this.response = response;
+    this.asyncTaskEnqueuer = asyncTaskEnqueuer;
   }
 
   @Override
   public void run() {
-    jpaTm().transact(this::relockDomain);
+    /* We wish to manually control our retry behavior, in order to limit the number of retries
+     * and/or notify registrars / support only after a certain number of retries, or only
+     * with a certain type of failure. AppEngine will automatically retry on any non-2xx status
+     * code, so return SC_NO_CONTENT (204) by default to avoid this auto-retry.
+     *
+     * See https://cloud.google.com/appengine/docs/standard/java/taskqueue/push/retrying-tasks
+     * for more details on retry behavior. */
+    response.setStatus(SC_NO_CONTENT);
+    response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
+
+    // nb: DomainLockUtils relies on the JPA transaction being the outermost transaction
+    jpaTm().transact(() -> tm().transact(this::relockDomain));
   }
 
   private void relockDomain() {
-    RegistryLock oldLock;
+    RegistryLock oldLock = null;
+    DomainBase domain;
     try {
       oldLock =
           RegistryLockDao.getByRevisionId(oldUnlockRevisionId)
@@ -82,87 +138,187 @@ public class RelockDomainAction implements Runnable {
                   () ->
                       new IllegalArgumentException(
                           String.format("Unknown revision ID %d", oldUnlockRevisionId)));
-      DomainBase domain =
+      domain =
           ofy()
               .load()
               .type(DomainBase.class)
               .id(oldLock.getRepoId())
               .now()
               .cloneProjectedAtTime(jpaTm().getTransactionTime());
-
-      if (domain.getStatusValues().containsAll(REGISTRY_LOCK_STATUSES)
-          || oldLock.getRelock() != null) {
-        // The domain was manually locked, so we shouldn't worry about relocking
-        String message =
-            String.format(
-                "Domain %s is already manually relocked, skipping automated relock.",
-                domain.getFullyQualifiedDomainName());
-        logger.atInfo().log(message);
-        // SC_NO_CONTENT (204) skips retry -- see the comment below
-        response.setStatus(SC_NO_CONTENT);
-        response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
-        response.setPayload(message);
-        return;
-      }
-      verifyDomainAndLockState(oldLock, domain);
     } catch (Throwable t) {
-      /* If there's a bad verification code or the domain is in a bad state, we won't want to retry.
-       * AppEngine will retry on non-2xx error codes, so we return SC_NO_CONTENT (204) to avoid it.
-       *
-       * See https://cloud.google.com/appengine/docs/standard/java/taskqueue/push/retrying-tasks
-       * for more details on retry behavior. */
-      logger.atWarning().withCause(t).log(
-          "Exception when attempting to relock domain with old revision ID %d.",
-          oldUnlockRevisionId);
-      response.setStatus(SC_NO_CONTENT);
-      response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
-      response.setPayload(String.format("Relock failed: %s", t.getMessage()));
+      handleTransientFailure(Optional.ofNullable(oldLock), t);
       return;
     }
-    applyRelock(oldLock);
+
+    if (domain.getStatusValues().containsAll(REGISTRY_LOCK_STATUSES)
+        || oldLock.getRelock() != null) {
+      // The domain was manually locked, so we shouldn't worry about re-locking
+      String message =
+          String.format(
+              "Domain %s is already manually re-locked, skipping automated re-lock.",
+              domain.getDomainName());
+      logger.atInfo().log(message);
+      response.setPayload(message);
+      return;
+    }
+    try {
+      verifyDomainAndLockState(oldLock, domain);
+    } catch (Throwable t) {
+      // If the domain was, for example, transferred, then notify the old registrar and don't retry.
+      handleNonRetryableFailure(oldLock, t);
+      return;
+    }
+    try {
+      applyRelock(oldLock);
+    } catch (Throwable t) {
+      handleTransientFailure(Optional.of(oldLock), t);
+    }
   }
 
   private void applyRelock(RegistryLock oldLock) {
-    try {
-      domainLockUtils.administrativelyApplyLock(
-          oldLock.getDomainName(),
-          oldLock.getRegistrarId(),
-          oldLock.getRegistrarPocId(),
-          oldLock.isSuperuser());
-      logger.atInfo().log("Relocked domain %s.", oldLock.getDomainName());
-      response.setStatus(SC_OK);
-    } catch (Throwable t) {
-      // Any errors that occur here are unexpected, so we should retry. Return a non-2xx
-      // error code to get AppEngine to retry
-      logger.atSevere().withCause(t).log(
-          "Exception when attempting to relock domain %s.", oldLock.getDomainName());
-      response.setStatus(SC_INTERNAL_SERVER_ERROR);
-      response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
-      response.setPayload(String.format("Relock failed: %s", t.getMessage()));
+    domainLockUtils.administrativelyApplyLock(
+        oldLock.getDomainName(),
+        oldLock.getRegistrarId(),
+        oldLock.getRegistrarPocId(),
+        oldLock.isSuperuser());
+    logger.atInfo().log("Re-locked domain %s.", oldLock.getDomainName());
+    response.setStatus(SC_OK);
+    // Only send a success email if we previously sent a failure email
+    if (previousAttempts > FAILURES_BEFORE_EMAIL) {
+      sendSuccessEmail(oldLock);
     }
   }
 
   private void verifyDomainAndLockState(RegistryLock oldLock, DomainBase domain) {
     // Domain shouldn't be deleted or have a pending transfer/delete
-    String domainName = domain.getFullyQualifiedDomainName();
-    checkArgument(
-        !DateTimeUtils.isAtOrAfter(jpaTm().getTransactionTime(), domain.getDeletionTime()),
-        "Domain %s has been deleted",
-        domainName);
+    String domainName = domain.getDomainName();
     ImmutableSet<StatusValue> statusValues = domain.getStatusValues();
     checkArgument(
         !statusValues.contains(StatusValue.PENDING_DELETE),
-        "Domain %s has a pending delete",
+        "Domain %s has a pending delete.",
+        domainName);
+    checkArgument(
+        !DateTimeUtils.isAtOrAfter(jpaTm().getTransactionTime(), domain.getDeletionTime()),
+        "Domain %s has been deleted.",
         domainName);
     checkArgument(
         !statusValues.contains(StatusValue.PENDING_TRANSFER),
-        "Domain %s has a pending transfer",
+        "Domain %s has a pending transfer.",
         domainName);
     checkArgument(
         domain.getCurrentSponsorClientId().equals(oldLock.getRegistrarId()),
-        "Domain %s has been transferred from registrar %s to registrar %s since the unlock",
+        "Domain %s has been transferred from registrar %s to registrar %s since the unlock.",
         domainName,
         oldLock.getRegistrarId(),
         domain.getCurrentSponsorClientId());
   }
+
+  private void handleNonRetryableFailure(RegistryLock oldLock, Throwable t) {
+    logger.atWarning().withCause(t).log(
+        "Exception thrown when attempting to re-lock domain with old revision ID %d.",
+        oldUnlockRevisionId);
+    response.setPayload(String.format("Re-lock failed: %s", t.getMessage()));
+
+    String body =
+        String.format(
+            RELOCK_NON_RETRYABLE_FAILURE_EMAIL_TEMPLATE,
+            oldLock.getDomainName(),
+            t.getMessage(),
+            supportEmail);
+    sendEmailService.sendEmail(
+        EmailMessage.newBuilder()
+            .setFrom(gSuiteOutgoingEmailAddress)
+            .setBody(body)
+            .setSubject(String.format("Error re-locking domain %s", oldLock.getDomainName()))
+            .setRecipients(getEmailRecipients(oldLock.getRegistrarId()))
+            .build());
+  }
+
+  private void handleTransientFailure(Optional<RegistryLock> oldLock, Throwable t) {
+    String message = String.format("Re-lock failed: %s", t.getMessage());
+    logger.atSevere().withCause(t).log(message);
+    response.setPayload(message);
+
+    if (previousAttempts == FAILURES_BEFORE_EMAIL) {
+      if (oldLock.isPresent()) {
+        sendGenericTransientFailureEmail(oldLock.get());
+      } else {
+        // if the old lock isn't present, something has gone horribly wrong
+        sendUnknownRevisionIdAlertEmail();
+      }
+    }
+    Duration timeBeforeRetry = previousAttempts < ATTEMPTS_BEFORE_SLOWDOWN ? TEN_MINUTES : ONE_HOUR;
+    asyncTaskEnqueuer.enqueueDomainRelock(
+        timeBeforeRetry, oldUnlockRevisionId, previousAttempts + 1);
+  }
+
+  private void sendSuccessEmail(RegistryLock oldLock) {
+    String body =
+        String.format(RELOCK_SUCCESS_EMAIL_TEMPLATE, oldLock.getDomainName(), supportEmail);
+
+    sendEmailService.sendEmail(
+        EmailMessage.newBuilder()
+            .setFrom(gSuiteOutgoingEmailAddress)
+            .setBody(body)
+            .setSubject(String.format("Successful re-lock of domain %s", oldLock.getDomainName()))
+            .setRecipients(getEmailRecipients(oldLock.getRegistrarId()))
+            .build());
+  }
+
+  private void sendGenericTransientFailureEmail(RegistryLock oldLock) {
+    String body =
+        String.format(
+            RELOCK_TRANSIENT_FAILURE_EMAIL_TEMPLATE, oldLock.getDomainName(), supportEmail);
+    // For an unexpected failure, notify both the lock-enabled contacts and our alerting email
+    ImmutableSet<InternetAddress> allRecipients =
+        new ImmutableSet.Builder<InternetAddress>()
+            .addAll(getEmailRecipients(oldLock.getRegistrarId()))
+            .add(alertRecipientAddress)
+            .build();
+    sendEmailService.sendEmail(
+        EmailMessage.newBuilder()
+            .setFrom(gSuiteOutgoingEmailAddress)
+            .setBody(body)
+            .setSubject(String.format("Error re-locking domain %s", oldLock.getDomainName()))
+            .setRecipients(allRecipients)
+            .build());
+  }
+
+  private void sendUnknownRevisionIdAlertEmail() {
+    sendEmailService.sendEmail(
+        EmailMessage.newBuilder()
+            .setFrom(gSuiteOutgoingEmailAddress)
+            .setBody(String.format(RELOCK_UNKNOWN_ID_FAILURE_EMAIL_TEMPLATE, oldUnlockRevisionId))
+            .setSubject("Error re-locking domain")
+            .setRecipients(ImmutableSet.of(alertRecipientAddress))
+            .build());
+  }
+
+  private ImmutableSet<InternetAddress> getEmailRecipients(String registrarId) {
+    Registrar registrar =
+        Registrar.loadByClientIdCached(registrarId)
+            .orElseThrow(
+                () ->
+                    new IllegalStateException(String.format("Unknown registrar %s", registrarId)));
+
+    ImmutableSet<String> registryLockEmailAddresses =
+        registrar.getContacts().stream()
+            .filter(RegistrarContact::isRegistryLockAllowed)
+            .map(RegistrarContact::getRegistryLockEmailAddress)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .collect(toImmutableSet());
+
+    ImmutableSet.Builder<InternetAddress> builder = new ImmutableSet.Builder<>();
+    // can't use streams due to the 'throws' in the InternetAddress constructor
+    for (String registryLockEmailAddress : registryLockEmailAddresses) {
+      try {
+        builder.add(new InternetAddress(registryLockEmailAddress));
+      } catch (AddressException e) {
+        // This shouldn't stop any other emails going out, so swallow it
+        logger.atWarning().log("Invalid email address %s", registryLockEmailAddress);
+      }
+    }
+    return builder.build();
+  }
 }

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

@@ -0,0 +1,117 @@
+// 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.checkNotNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Streams;
+import org.joda.time.DateTime;
+
+/**
+ * Helpers for determining the fully qualified paths to Nomulus backup files. A backup consists of a
+ * Datastore export and Nomulus CommitLogs that overlap with the export.
+ */
+public final class BackupPaths {
+
+  private BackupPaths() {}
+
+  private static final String WILDCARD_CHAR = "*";
+  private static final String EXPORT_PATTERN_TEMPLATE = "%s/all_namespaces/kind_%s/output-%s";
+
+  public static final String COMMIT_LOG_NAME_PREFIX = "commit_diff_until_";
+  private static final String COMMIT_LOG_PATTERN_TEMPLATE = "%s/" + COMMIT_LOG_NAME_PREFIX + "*";
+
+  /**
+   * Pattern of the per-project file with Cloud SQL connection information. To get a concrete path,
+   * user needs to provide the name of the environment, alpha, crash, sandbox, or production. This
+   * file is meant for applications without access to secrets stored in Datastore.
+   *
+   * <p>In production, this is an base-64 encoded encrypted file with one line, which contains
+   * space-separated values of Cloud SQL instance name, login, and password.
+   *
+   * <p>A plain text may be used for tests to a local database. Replace Cloud SQL instance name with
+   * JDBC URL.
+   */
+  private static final String SQL_CONN_INFO_FILE_PATTERN =
+      "gs://domain-registry-dev-deploy/cloudsql-credentials/%s/admin_credential.enc";
+
+  private static final ImmutableSet<String> ALLOWED_ENV =
+      ImmutableSet.of("alpha", "crash", "sandbox", "production");
+
+  /**
+   * Returns a regex pattern that matches all Datastore export files of a given {@code kind}.
+   *
+   * @param exportDir path to the top directory of a Datastore export
+   * @param kind the 'kind' of the Datastore entity
+   */
+  public static String getExportFileNamePattern(String exportDir, String kind) {
+    checkArgument(!isNullOrEmpty(exportDir), "Null or empty exportDir.");
+    checkArgument(!isNullOrEmpty(kind), "Null or empty kind.");
+    return String.format(EXPORT_PATTERN_TEMPLATE, exportDir, kind, WILDCARD_CHAR);
+  }
+
+  /**
+   * Returns an {@link ImmutableList} of regex patterns that match all Datastore export files of the
+   * given {@code kinds}.
+   *
+   * @param exportDir path to the top directory of a Datastore export
+   * @param kinds all entity 'kinds' to be matched
+   */
+  public static ImmutableList<String> getExportFilePatterns(
+      String exportDir, Iterable<String> kinds) {
+    checkNotNull(kinds, "kinds");
+    return Streams.stream(kinds)
+        .map(kind -> getExportFileNamePattern(exportDir, kind))
+        .collect(ImmutableList.toImmutableList());
+  }
+
+  /**
+   * Returns the fully qualified path of a Datastore export file with the given {@code kind} and
+   * {@code shard}.
+   *
+   * @param exportDir path to the top directory of a Datastore export
+   * @param kind the 'kind' of the Datastore entity
+   * @param shard an integer suffix of the file name
+   */
+  public static String getExportFileNameByShard(String exportDir, String kind, int shard) {
+    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));
+  }
+
+  /** Returns an {@link ImmutableList} of regex patterns that match all CommitLog files. */
+  public static ImmutableList<String> getCommitLogFilePatterns(String commitLogDir) {
+    return ImmutableList.of(String.format(COMMIT_LOG_PATTERN_TEMPLATE, commitLogDir));
+  }
+
+  /** Gets the Commit timestamp from a CommitLog file name. */
+  public static DateTime getCommitLogTimestamp(String fileName) {
+    checkArgument(!isNullOrEmpty(fileName), "Null or empty fileName.");
+    int start = fileName.lastIndexOf(COMMIT_LOG_NAME_PREFIX);
+    checkArgument(start >= 0, "Illegal file name %s.", fileName);
+    return DateTime.parse(fileName.substring(start + COMMIT_LOG_NAME_PREFIX.length()));
+  }
+
+  public static ImmutableList<String> getCloudSQLCredentialFilePatterns(String environmentName) {
+    checkArgument(
+        ALLOWED_ENV.contains(environmentName), "Invalid environment name %s", environmentName);
+    return ImmutableList.of(String.format(SQL_CONN_INFO_FILE_PATTERN, environmentName));
+  }
+}

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

@@ -0,0 +1,180 @@
+// 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.transaction.JpaTransactionManager;
+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;
+
+  /**
+   * 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.
+   */
+  public BeamJpaModule(@Nullable String sqlAccessInfoFile, @Nullable String cloudKmsProjectId) {
+    this.sqlAccessInfoFile = sqlAccessInfoFile;
+    this.cloudKmsProjectId = cloudKmsProjectId;
+  }
+
+  /** 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("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,
+        UtilsModule.class
+      })
+  public interface JpaTransactionManagerComponent {
+    @SocketFactoryJpaTm
+    JpaTransactionManager cloudSqlJpaTransactionManager();
+
+    @JdbcJpaTm
+    JpaTransactionManager localDbJpaTransactionManager();
+  }
+}

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

@@ -0,0 +1,50 @@
+// 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 com.google.api.services.cloudkms.v1.model.DecryptRequest;
+import com.google.common.base.Strings;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.keyring.kms.KmsConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import javax.inject.Inject;
+
+/**
+ * Decrypts data using Cloud KMS, with the same crypto key with which Cloud SQL credential files on
+ * GCS was encrypted. See {@link BackupPaths#getCloudSQLCredentialFilePatterns} for more
+ * information.
+ */
+public class CloudSqlCredentialDecryptor {
+
+  private static final String CRYPTO_KEY_NAME = "nomulus-tool-key";
+  private final KmsConnection kmsConnection;
+
+  @Inject
+  CloudSqlCredentialDecryptor(@Config("beamKmsConnection") KmsConnection kmsConnection) {
+    this.kmsConnection = kmsConnection;
+  }
+
+  public String decrypt(String data) {
+    checkArgument(!Strings.isNullOrEmpty(data), "Null or empty data.");
+    byte[] ciphertext = Base64.getDecoder().decode(data);
+    // Re-encode for Cloud KMS JSON REST API, invoked through kmsConnection.
+    String urlSafeCipherText = new DecryptRequest().encodeCiphertext(ciphertext).getCiphertext();
+    return new String(
+        kmsConnection.decrypt(CRYPTO_KEY_NAME, urlSafeCipherText), StandardCharsets.UTF_8);
+  }
+}

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

@@ -0,0 +1,75 @@
+// 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.checkNotNull;
+
+import com.google.appengine.api.datastore.Entity;
+import java.util.Objects;
+
+/** Helper for manipulating {@code DomainBase} when migrating from Datastore to SQL database */
+final class DomainBaseUtil {
+
+  private DomainBaseUtil() {}
+
+  /**
+   * Removes {@link google.registry.model.billing.BillingEvent.Recurring}, {@link
+   * google.registry.model.poll.PollMessage PollMessages} and {@link
+   * google.registry.model.host.HostResource name servers} from a Datastore {@link Entity} that
+   * represents an Ofy {@link google.registry.model.domain.DomainBase}. This breaks the cycle of
+   * foreign key constraints between these entity kinds, allowing {@code DomainBases} to be inserted
+   * into the SQL database. See {@link InitSqlPipeline} for a use case, where the full {@code
+   * DomainBases} are written again during the last stage of the pipeline.
+   *
+   * <p>The returned object may be in bad state. Specifically, {@link
+   * google.registry.model.eppcommon.StatusValue#INACTIVE} is not added after name servers are
+   * removed. This only impacts tests.
+   *
+   * <p>This operation is performed on an Datastore {@link Entity} instead of Ofy Java object
+   * because Objectify requires access to a Datastore service when converting an Ofy object to a
+   * Datastore {@code Entity}. If we insist on working with Objectify objects, we face a few
+   * unsatisfactory options:
+   *
+   * <ul>
+   *   <li>Connect to our production Datastore, which incurs unnecessary security and code health
+   *       risk.
+   *   <li>Connect to a separate real Datastore instance, which is a waster and overkill.
+   *   <li>Use an in-memory test Datastore, which is a project health risk in that the test
+   *       Datastore would be added to Nomulus' production binary unless we create a separate
+   *       project for this pipeline.
+   * </ul>
+   *
+   * <p>Given our use case, operating on Datastore entities is the best option.
+   *
+   * @throws IllegalArgumentException if input does not represent a DomainBase
+   */
+  static Entity removeBillingAndPollAndHosts(Entity domainBase) {
+    checkNotNull(domainBase, "domainBase");
+    checkArgument(
+        Objects.equals(domainBase.getKind(), "DomainBase"),
+        "Expecting DomainBase, got %s",
+        domainBase.getKind());
+    Entity clone = domainBase.clone();
+    clone.removeProperty("autorenewBillingEvent");
+    clone.removeProperty("autorenewPollMessage");
+    clone.removeProperty("deletePollMessage");
+    clone.removeProperty("nsHosts");
+    domainBase.getProperties().keySet().stream()
+        .filter(s -> s.startsWith("transferData."))
+        .forEach(s -> clone.removeProperty(s));
+    return clone;
+  }
+}

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

@@ -0,0 +1,244 @@
+// 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 com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+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.initsql.Transforms.RemoveDomainBaseForeignKeys;
+import google.registry.model.billing.BillingEvent;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.token.AllocationToken;
+import google.registry.model.host.HostResource;
+import google.registry.model.poll.PollMessage;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.model.registry.Registry;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.transaction.JpaTransactionManager;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Optional;
+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;
+import org.apache.beam.sdk.values.TupleTag;
+import org.joda.time.DateTime;
+
+/**
+ * A BEAM pipeline that populates a SQL database with data from a Datastore backup.
+ *
+ * <p>This pipeline migrates EPP resources and related entities that cross-reference each other. To
+ * avoid violating foreign key constraints, writes to SQL are ordered by entity kinds. In addition,
+ * the {@link DomainBase} kind is written twice (see details below). The write order is presented
+ * below. Although some kinds can be written concurrently, e.g. {@code ContactResource} and {@code
+ * RegistrarContact}, we do not expect any performance benefit since the limiting resource is the
+ * number of JDBC connections. Google internal users may refer to <a
+ * href="http://go/registry-r3-init-sql">the design doc</a> for more information.
+ *
+ * <ol>
+ *   <li>{@link Registry}: Assumes that {@code PremiumList} and {@code ReservedList} have been set
+ *       up in the SQL database.
+ *   <li>{@link Registrar}: Logically depends on {@code Registry}, Foreign key not modeled yet.
+ *   <li>{@link ContactResource}: references {@code Registrar}
+ *   <li>{@link RegistrarContact}: references {@code Registrar}.
+ *   <li>Cleansed {@link DomainBase}: with references to {@code BillingEvent}, {@code Recurring},
+ *       {@code Cancellation} and {@code HostResource} removed, still references {@code Registrar}
+ *       and {@code ContactResource}. The removal breaks circular Foreign Key references.
+ *   <li>{@link HostResource}: references {@code DomainBase}.
+ *   <li>{@link HistoryEntry}: maps to one of three SQL entity types and may reference {@code
+ *       Registrar}, {@code ContactResource}, {@code HostResource}, and {@code DomainBase}.
+ *   <li>{@link AllocationToken}: references {@code HistoryEntry}.
+ *   <li>{@link BillingEvent.Recurring}: references {@code Registrar}, {@code DomainBase} and {@code
+ *       HistoryEntry}.
+ *   <li>{@link BillingEvent.OneTime}: references {@code Registrar}, {@code DomainBase}, {@code
+ *       BillingEvent.Recurring}, {@code HistoryEntry} and {@code AllocationToken}.
+ *   <li>{@link BillingEvent.Modification}: SQL model TBD. Will reference {@code Registrar}, {@code
+ *       DomainBase} and {@code BillingEvent.OneTime}.
+ *   <li>{@link BillingEvent.Cancellation}: references {@code Registrar}, {@code DomainBase}, {@code
+ *       BillingEvent.Recurring}, {@code BillingEvent.OneTime}, and {@code HistoryEntry}.
+ *   <li>{@link PollMessage}: references {@code Registrar}, {@code DomainBase}, {@code
+ *       ContactResource}, {@code HostResource}, and {@code HistoryEntry}.
+ *   <li>{@link DomainBase}, original copy from Datastore.
+ * </ol>
+ */
+public class InitSqlPipeline implements Serializable {
+
+  /**
+   * Datastore kinds to be written to the SQL database before the cleansed version of {@link
+   * DomainBase}.
+   */
+  // TODO(weiminyu): include Registry.class when it is modeled in JPA.
+  private static final ImmutableList<Class<?>> PHASE_ONE_ORDERED =
+      ImmutableList.of(Registrar.class, ContactResource.class);
+
+  /**
+   * Datastore kinds to be written to the SQL database after the cleansed version of {@link
+   * DomainBase}.
+   *
+   * <p>The following entities are missing from the list:
+   *
+   * <ul>
+   *   <li>Those not modeled in JPA yet, e.g., {@code BillingEvent.Modification}.
+   *   <li>Those waiting for sanitation, e.g., {@code HistoryEntry}, which would have duplicate keys
+   *       after converting to SQL model.
+   *   <li>Those that have foreign key constraints on the above.
+   * </ul>
+   */
+  // TODO(weiminyu): add more entities when available.
+  private static final ImmutableList<Class<?>> PHASE_TWO_ORDERED =
+      ImmutableList.of(HostResource.class);
+
+  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;
+  }
+
+  @VisibleForTesting
+  InitSqlPipeline(InitSqlPipelineOptions options, Pipeline pipeline) {
+    this.options = options;
+    this.pipeline = pipeline;
+    jpaGetter = JpaTransactionManagerComponent::localDbJpaTransactionManager;
+  }
+
+  public PipelineResult run() {
+    setupPipeline();
+    return pipeline.run();
+  }
+
+  @VisibleForTesting
+  void setupPipeline() {
+    PCollectionTuple datastoreSnapshot =
+        pipeline.apply(
+            "Load Datastore snapshot",
+            Transforms.loadDatastoreSnapshot(
+                options.getDatastoreExportDir(),
+                options.getCommitLogDir(),
+                DateTime.parse(options.getCommitLogStartTimestamp()),
+                DateTime.parse(options.getCommitLogEndTimestamp()),
+                ImmutableSet.<String>builder()
+                    .add("DomainBase")
+                    .addAll(toKindStrings(PHASE_ONE_ORDERED))
+                    .addAll(toKindStrings(PHASE_TWO_ORDERED))
+                    .build()));
+
+    // Set up the pipeline to write entity kinds from PHASE_ONE_ORDERED to SQL. Return a object
+    // that signals the completion of the phase.
+    PCollection<Void> blocker =
+        scheduleOnePhaseWrites(datastoreSnapshot, PHASE_ONE_ORDERED, Optional.empty(), null);
+    blocker =
+        writeToSql(
+            "DomainBase without circular foreign keys",
+            removeDomainBaseForeignKeys(datastoreSnapshot)
+                .apply("Wait on phase one", Wait.on(blocker)));
+    // Set up the pipeline to write entity kinds from PHASE_TWO_ORDERED to SQL. This phase won't
+    // start until all cleansed DomainBases have been written (started by line above).
+    scheduleOnePhaseWrites(
+        datastoreSnapshot, PHASE_TWO_ORDERED, Optional.of(blocker), "DomainBaseNoFkeys");
+  }
+
+  private PCollection<VersionedEntity> removeDomainBaseForeignKeys(
+      PCollectionTuple datastoreSnapshot) {
+    PCollection<VersionedEntity> domainBases =
+        datastoreSnapshot.get(Transforms.createTagForKind("DomainBase"));
+    return domainBases.apply(
+        "Remove circular foreign keys from DomainBase",
+        ParDo.of(new RemoveDomainBaseForeignKeys()));
+  }
+
+  /**
+   * Sets up the pipeline to write entities in {@code entityClasses} to SQL. Entities are written
+   * one kind at a time based on each kind's position in {@code entityClasses}. Concurrency exists
+   * within each kind.
+   *
+   * @param datastoreSnapshot the Datastore snapshot of all data to be migrated to SQL
+   * @param entityClasses the entity types in write order
+   * @param blockingPCollection the pipeline stage that blocks this phase
+   * @param blockingTag description of the stage (if exists) that blocks this phase. Needed for
+   *     generating unique transform ids
+   * @return the output {@code PCollection} from the writing of the last entity kind. Other parts of
+   *     the pipeline can {@link Wait} on this object
+   */
+  private PCollection<Void> scheduleOnePhaseWrites(
+      PCollectionTuple datastoreSnapshot,
+      Collection<Class<?>> entityClasses,
+      Optional<PCollection<Void>> blockingPCollection,
+      String blockingTag) {
+    checkArgument(!entityClasses.isEmpty(), "Each phase must have at least one kind.");
+    ImmutableList<TupleTag<VersionedEntity>> tags =
+        toKindStrings(entityClasses).stream()
+            .map(Transforms::createTagForKind)
+            .collect(ImmutableList.toImmutableList());
+
+    PCollection<Void> prev = blockingPCollection.orElse(null);
+    String prevTag = blockingTag;
+    for (TupleTag<VersionedEntity> tag : tags) {
+      PCollection<VersionedEntity> curr = datastoreSnapshot.get(tag);
+      if (prev != null) {
+        curr = curr.apply("Wait on " + prevTag, Wait.on(prev));
+      }
+      prev = writeToSql(tag.getId(), curr);
+      prevTag = tag.getId();
+    }
+    return prev;
+  }
+
+  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)));
+  }
+
+  private static ImmutableList<String> toKindStrings(Collection<Class<?>> entityClasses) {
+    try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+      return entityClasses.stream().map(Key::getKind).collect(ImmutableList.toImmutableList());
+    }
+  }
+
+  public static void main(String[] args) {
+    InitSqlPipelineOptions options =
+        PipelineOptionsFactory.fromArgs(args).withValidation().as(InitSqlPipelineOptions.class);
+    new InitSqlPipeline(options).run();
+  }
+}

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

@@ -0,0 +1,91 @@
+// 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 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;
+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);
+
+  @Description("The root directory of the export to load.")
+  String getDatastoreExportDir();
+
+  void setDatastoreExportDir(String datastoreExportDir);
+
+  @Description("The directory that contains all CommitLog files.")
+  String getCommitLogDir();
+
+  void setCommitLogDir(String commitLogDir);
+
+  @Description("The earliest CommitLogs to load, in ISO8601 format.")
+  @Validation.Required
+  String getCommitLogStartTimestamp();
+
+  void setCommitLogStartTimestamp(String commitLogStartTimestamp);
+
+  @Description("The latest CommitLogs to load, in ISO8601 format.")
+  @Validation.Required
+  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

@@ -0,0 +1,48 @@
+// 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.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;
+
+  public JpaSupplierFactory(
+      String credentialFileUrl,
+      @Nullable String cloudKmsProjectId,
+      SerializableFunction<JpaTransactionManagerComponent, JpaTransactionManager> jpaGetter) {
+    this.credentialFileUrl = credentialFileUrl;
+    this.cloudKmsProjectId = cloudKmsProjectId;
+    this.jpaGetter = jpaGetter;
+  }
+
+  @Override
+  public JpaTransactionManager get() {
+    return jpaGetter.apply(
+        DaggerBeamJpaModule_JpaTransactionManagerComponent.builder()
+            .beamJpaModule(new BeamJpaModule(credentialFileUrl, cloudKmsProjectId))
+            .build());
+  }
+}

core/src/main/java/google/registry/beam/initsql/README.md

@@ -0,0 +1,17 @@
+## Summary
+
+This package contains a BEAM pipeline that populates a Cloud SQL database from a
+Datastore backup. The pipeline uses an unsynchronized Datastore export and
+overlapping CommitLogs generated by the Nomulus server to recreate a consistent
+Datastore snapshot, and writes the data to a Cloud SQL instance.
+
+## Pipeline Visualization
+
+The golden flow graph of the InitSqlPipeline is saved both as a text-base
+[DOT file](../../../../../../test/resources/google/registry/beam/initsql/pipeline_golden.dot)
+and a
+[.png file](../../../../../../test/resources/google/registry/beam/initsql/pipeline_golden.png).
+A test compares the flow graph of the current pipeline with the golden graph,
+and will fail if changes are detected. When this happens, run the Gradle task
+':core:updateInitSqlPipelineGraph' to update the golden files and review the
+changes.

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

@@ -0,0 +1,45 @@
+// 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 com.google.auto.value.AutoValue;
+import java.util.Optional;
+
+/**
+ * Information needed to connect to a database, including JDBC URL, user name, password, and in the
+ * case of Cloud SQL, the database instance's name.
+ */
+@AutoValue
+abstract class SqlAccessInfo {
+
+  abstract String jdbcUrl();
+
+  abstract String user();
+
+  abstract String password();
+
+  abstract Optional<String> cloudSqlInstanceName();
+
+  public static SqlAccessInfo createCloudSqlAccessInfo(
+      String sqlInstanceName, String username, String password) {
+    return new AutoValue_SqlAccessInfo(
+        "jdbc:postgresql://google/postgres", username, password, Optional.of(sqlInstanceName));
+  }
+
+  public static SqlAccessInfo createLocalSqlAccessInfo(
+      String jdbcUrl, String username, String password) {
+    return new AutoValue_SqlAccessInfo(jdbcUrl, username, password, Optional.empty());
+  }
+}

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

@@ -0,0 +1,491 @@
+// 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.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static google.registry.beam.initsql.BackupPaths.getCommitLogTimestamp;
+import static google.registry.beam.initsql.BackupPaths.getExportFilePatterns;
+import static google.registry.persistence.JpaRetries.isFailedTxnRetriable;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.setJpaTm;
+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;
+
+import avro.shaded.com.google.common.collect.Iterators;
+import com.google.appengine.api.datastore.Entity;
+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.Streams;
+import google.registry.backup.AppEngineEnvironment;
+import google.registry.backup.CommitLogImports;
+import google.registry.backup.VersionedEntity;
+import google.registry.model.domain.DomainBase;
+import google.registry.model.ofy.ObjectifyService;
+import google.registry.model.ofy.Ofy;
+import google.registry.persistence.transaction.JpaTransactionManager;
+import google.registry.tools.LevelDbLogReader;
+import google.registry.util.SystemSleeper;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.Supplier;
+import org.apache.beam.sdk.coders.StringUtf8Coder;
+import org.apache.beam.sdk.io.Compression;
+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.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.values.KV;
+import org.apache.beam.sdk.values.PBegin;
+import org.apache.beam.sdk.values.PCollection;
+import org.apache.beam.sdk.values.PCollectionList;
+import org.apache.beam.sdk.values.PCollectionTuple;
+import org.apache.beam.sdk.values.TupleTag;
+import org.apache.beam.sdk.values.TupleTagList;
+import org.apache.beam.sdk.values.TypeDescriptor;
+import org.joda.time.DateTime;
+import org.joda.time.Duration;
+
+/**
+ * {@link PTransform Pipeline transforms} used in pipelines that load from both Datastore export
+ * files and Nomulus CommitLog files.
+ */
+public final class Transforms {
+
+  private Transforms() {}
+
+  /**
+   * The commitTimestamp assigned to all entities loaded from a Datastore export file. The exact
+   * value does not matter, but it must be lower than the timestamps of real CommitLog records.
+   */
+  @VisibleForTesting static final long EXPORT_ENTITY_TIME_STAMP = START_OF_TIME.getMillis();
+
+  /**
+   * Returns a {@link TupleTag} that can be used to retrieve entities of the given {@code kind} from
+   * the Datastore snapshot returned by {@link #loadDatastoreSnapshot}.
+   */
+  public static TupleTag<VersionedEntity> createTagForKind(String kind) {
+    // When used with PCollectionTuple the result must retain generic type information.
+    // Both the Generic param and the empty bracket below are important.
+    return new TupleTag<VersionedEntity>(Transforms.class.getSimpleName() + ":" + kind) {};
+  }
+
+  /**
+   * Composite {@link PTransform transform} that loads the Datastore snapshot at {@code
+   * commitLogToTime} for caller specified {@code kinds}.
+   *
+   * <p>Caller must provide the location of a Datastore export that started AFTER {@code
+   * commitLogFromTime} and completed BEFORE {@code commitLogToTime}, as well as the root directory
+   * of all CommitLog files.
+   *
+   * <p>Selection of {@code commitLogFromTime} and {@code commitLogToTime} should follow the
+   * guidelines below to ensure that all incremental changes concurrent with the export are covered:
+   *
+   * <ul>
+   *   <li>Two or more CommitLogs should exist between {@code commitLogFromTime} and the starting
+   *       time of the Datastore export. This ensures that the earlier CommitLog file was complete
+   *       before the export started.
+   *   <li>Two or more CommitLogs should exit between the export completion time and {@code
+   *       commitLogToTime}.
+   * </ul>
+   *
+   * <p>The output from the returned transform is a {@link PCollectionTuple} consisting of {@link
+   * VersionedEntity VersionedEntities} grouped into {@link PCollection PCollections} by {@code
+   * kind}.
+   */
+  public static PTransform<PBegin, PCollectionTuple> loadDatastoreSnapshot(
+      String exportDir,
+      String commitLogDir,
+      DateTime commitLogFromTime,
+      DateTime commitLogToTime,
+      Set<String> kinds) {
+    checkArgument(kinds != null && !kinds.isEmpty(), "At least one kind is expected.");
+
+    // Create tags to collect entities by kind in final step.
+    final ImmutableMap<String, TupleTag<VersionedEntity>> outputTags =
+        kinds.stream()
+            .collect(ImmutableMap.toImmutableMap(kind -> kind, Transforms::createTagForKind));
+    // Arbitrarily select one tag as mainOutTag and put the remaining ones in a TupleTagList.
+    // This separation is required by ParDo's config API.
+    Iterator<TupleTag<VersionedEntity>> tagsIt = outputTags.values().iterator();
+    final TupleTag<VersionedEntity> mainOutputTag = tagsIt.next();
+    final TupleTagList additionalTags = TupleTagList.of(ImmutableList.copyOf(tagsIt));
+
+    return new PTransform<PBegin, PCollectionTuple>() {
+      @Override
+      public PCollectionTuple expand(PBegin input) {
+        PCollection<VersionedEntity> exportedEntities =
+            input
+                .apply("Get export file patterns", getDatastoreExportFilePatterns(exportDir, kinds))
+                .apply("Find export files", getFilesByPatterns())
+                .apply("Load export data", loadExportDataFromFiles());
+        PCollection<VersionedEntity> commitLogEntities =
+            input
+                .apply("Get commitlog file patterns", getCommitLogFilePatterns(commitLogDir))
+                .apply("Find commitlog files", getFilesByPatterns())
+                .apply(
+                    "Filter commitLog by time",
+                    filterCommitLogsByTime(commitLogFromTime, commitLogToTime))
+                .apply("Load commitlog data", loadCommitLogsFromFiles(kinds));
+        return PCollectionList.of(exportedEntities)
+            .and(commitLogEntities)
+            .apply("Merge exports and CommitLogs", Flatten.pCollections())
+            .apply(
+                "Key entities by Datastore Keys",
+                // Converting to KV<String, VE> instead of KV<Key, VE> b/c default coder for Key
+                // (SerializableCoder) is not deterministic and cannot be used with GroupBy.
+                MapElements.into(kvs(strings(), TypeDescriptor.of(VersionedEntity.class)))
+                    .via((VersionedEntity e) -> KV.of(e.key().toString(), e)))
+            .apply("Gather entities by key", GroupByKey.create())
+            .apply(
+                "Output latest version per entity",
+                ParDo.of(
+                        new DoFn<KV<String, Iterable<VersionedEntity>>, VersionedEntity>() {
+                          @ProcessElement
+                          public void processElement(
+                              @Element KV<String, Iterable<VersionedEntity>> kv,
+                              MultiOutputReceiver out) {
+                            Optional<VersionedEntity> latest =
+                                Streams.stream(kv.getValue())
+                                    .sorted(comparing(VersionedEntity::commitTimeMills).reversed())
+                                    .findFirst();
+                            // Throw to abort (after default retries). Investigate, fix, and rerun.
+                            checkState(
+                                latest.isPresent(), "Unexpected key with no data", kv.getKey());
+                            if (latest.get().isDelete()) {
+                              return;
+                            }
+                            String kind = latest.get().getEntity().get().getKind();
+                            out.get(outputTags.get(kind)).output(latest.get());
+                          }
+                        })
+                    .withOutputTags(mainOutputTag, additionalTags));
+      }
+    };
+  }
+
+  /**
+   * Returns a {@link PTransform transform} that can generate a collection of patterns that match
+   * all Datastore CommitLog files.
+   */
+  public static PTransform<PBegin, PCollection<String>> getCommitLogFilePatterns(
+      String commitLogDir) {
+    return toStringPCollection(BackupPaths.getCommitLogFilePatterns(commitLogDir));
+  }
+
+  /**
+   * Returns a {@link PTransform transform} that can generate a collection of patterns that match
+   * all Datastore export files of the given {@code kinds}.
+   */
+  public static PTransform<PBegin, PCollection<String>> getDatastoreExportFilePatterns(
+      String exportDir, Collection<String> kinds) {
+    return toStringPCollection(getExportFilePatterns(exportDir, kinds));
+  }
+
+  public static PTransform<PBegin, PCollection<String>> getCloudSqlConnectionInfoFilePatterns(
+      String gcpProjectName) {
+    return toStringPCollection(BackupPaths.getCloudSQLCredentialFilePatterns(gcpProjectName));
+  }
+
+  /**
+   * Returns a {@link PTransform} from file name patterns to file {@link Metadata Metadata records}.
+   */
+  public static PTransform<PCollection<String>, PCollection<Metadata>> getFilesByPatterns() {
+    return new PTransform<PCollection<String>, PCollection<Metadata>>() {
+      @Override
+      public PCollection<Metadata> expand(PCollection<String> input) {
+        return input.apply(FileIO.matchAll().withEmptyMatchTreatment(EmptyMatchTreatment.ALLOW));
+      }
+    };
+  }
+
+  /**
+   * Returns CommitLog files with timestamps between {@code fromTime} (inclusive) and {@code
+   * endTime} (exclusive).
+   */
+  public static PTransform<PCollection<? extends Metadata>, PCollection<Metadata>>
+      filterCommitLogsByTime(DateTime fromTime, DateTime toTime) {
+    return ParDo.of(new FilterCommitLogFileByTime(fromTime, toTime));
+  }
+
+  /** Returns a {@link PTransform} from file {@link Metadata} to {@link VersionedEntity}. */
+  public static PTransform<PCollection<Metadata>, PCollection<VersionedEntity>>
+      loadExportDataFromFiles() {
+    return processFiles(
+        new BackupFileReader(
+            file ->
+                Iterators.transform(
+                    LevelDbLogReader.from(file.open()),
+                    (byte[] bytes) -> VersionedEntity.from(EXPORT_ENTITY_TIME_STAMP, bytes))));
+  }
+
+  /** Returns a {@link PTransform} from file {@link Metadata} to {@link VersionedEntity}. */
+  public static PTransform<PCollection<Metadata>, PCollection<VersionedEntity>>
+      loadCommitLogsFromFiles(Set<String> kinds) {
+    return processFiles(
+        new BackupFileReader(
+            file ->
+                CommitLogImports.loadEntities(file.open()).stream()
+                    .filter(e -> kinds.contains(e.key().getKind()))
+                    .iterator()));
+  }
+
+  /**
+   * 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>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 new PTransform<PCollection<VersionedEntity>, PCollection<Void>>() {
+      @Override
+      public PCollection<Void> expand(PCollection<VersionedEntity> input) {
+        return input
+            .apply(
+                "Shard data for " + transformId,
+                MapElements.into(kvs(integers(), TypeDescriptor.of(VersionedEntity.class)))
+                    .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(jpaSupplier)));
+      }
+    };
+  }
+
+  /** Interface for serializable {@link Supplier suppliers}. */
+  public interface SerializableSupplier<T> extends Supplier<T>, Serializable {}
+
+  /**
+   * Returns a {@link PTransform} that produces a {@link PCollection} containing all elements in the
+   * given {@link Iterable}.
+   */
+  static PTransform<PBegin, PCollection<String>> toStringPCollection(Iterable<String> strings) {
+    return Create.of(strings).withCoder(StringUtf8Coder.of());
+  }
+
+  /**
+   * Returns a {@link PTransform} from file {@link Metadata} to {@link VersionedEntity} using
+   * caller-provided {@code transformer}.
+   */
+  static PTransform<PCollection<Metadata>, PCollection<VersionedEntity>> processFiles(
+      DoFn<ReadableFile, VersionedEntity> transformer) {
+    return new PTransform<PCollection<Metadata>, PCollection<VersionedEntity>>() {
+      @Override
+      public PCollection<VersionedEntity> expand(PCollection<Metadata> input) {
+        return input
+            .apply(FileIO.readMatches().withCompression(Compression.UNCOMPRESSED))
+            .apply(transformer.getClass().getSimpleName(), ParDo.of(transformer));
+      }
+    };
+  }
+
+  private static class FilterCommitLogFileByTime extends DoFn<Metadata, Metadata> {
+    private final DateTime fromTime;
+    private final DateTime toTime;
+
+    public FilterCommitLogFileByTime(DateTime fromTime, DateTime toTime) {
+      checkNotNull(fromTime, "fromTime");
+      checkNotNull(toTime, "toTime");
+      checkArgument(
+          fromTime.isBefore(toTime),
+          "Invalid time range: fromTime (%s) is before endTime (%s)",
+          fromTime,
+          toTime);
+      this.fromTime = fromTime;
+      this.toTime = toTime;
+    }
+
+    @ProcessElement
+    public void processElement(@Element Metadata fileMeta, OutputReceiver<Metadata> out) {
+      DateTime timestamp = getCommitLogTimestamp(fileMeta.resourceId().toString());
+      if (isBeforeOrAt(fromTime, timestamp) && timestamp.isBefore(toTime)) {
+        out.output(fileMeta);
+      }
+    }
+  }
+
+  /**
+   * Reads from a Datastore backup file and converts its content into {@link VersionedEntity
+   * VersionedEntities}.
+   *
+   * <p>The input file may be either a LevelDb file from a Datastore export or a CommitLog file
+   * generated by the Nomulus server. In either case, the file contains variable-length records and
+   * must be read sequentially from the beginning. If the read fails, the file needs to be retried
+   * from the beginning.
+   */
+  private static class BackupFileReader extends DoFn<ReadableFile, VersionedEntity> {
+    private final ProcessFunction<ReadableFile, Iterator<VersionedEntity>> reader;
+
+    private BackupFileReader(ProcessFunction<ReadableFile, Iterator<VersionedEntity>> reader) {
+      this.reader = reader;
+    }
+
+    @ProcessElement
+    public void processElement(@Element ReadableFile file, OutputReceiver<VersionedEntity> out) {
+      try {
+        reader.apply(file).forEachRemaining(out::output);
+      } catch (Exception e) {
+        // Let the pipeline use default retry strategy on the whole file. For GCP Dataflow this
+        // means retrying up to 4 times (may include other files grouped with this one), and failing
+        // the pipeline if no success.
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  /**
+   * 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 extends DoFn<KV<Integer, Iterable<VersionedEntity>>, Void> {
+
+    private static int instanceCount = 0;
+    private static JpaTransactionManager originalJpa;
+
+    private final SerializableSupplier<JpaTransactionManager> jpaSupplier;
+
+    private transient Ofy ofy;
+    private transient SystemSleeper sleeper;
+
+    SqlBatchWriter(SerializableSupplier<JpaTransactionManager> jpaSupplier) {
+      this.jpaSupplier = jpaSupplier;
+    }
+
+    @Setup
+    public void setup() {
+      sleeper = new SystemSleeper();
+
+      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+        ObjectifyService.initOfy();
+        ofy = ObjectifyService.ofy();
+      }
+
+      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<VersionedEntity>> kv) {
+      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+        ImmutableList<Object> ofyEntities =
+            Streams.stream(kv.getValue())
+                .map(VersionedEntity::getEntity)
+                .map(Optional::get)
+                .map(ofy::toPojo)
+                .collect(ImmutableList.toImmutableList());
+        retry(() -> jpaTm().transact(() -> jpaTm().putAll(ofyEntities)));
+      }
+    }
+
+    // TODO(b/160632289): Enhance Retrier and use it here.
+    private void retry(Runnable runnable) {
+      int maxAttempts = 5;
+      int initialDelayMillis = 100;
+      double jitterRatio = 0.2;
+
+      for (int attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+          runnable.run();
+          return;
+        } catch (Throwable throwable) {
+          if (!isFailedTxnRetriable(throwable)) {
+            throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+          }
+          int sleepMillis = (1 << attempt) * initialDelayMillis;
+          int jitter =
+              ThreadLocalRandom.current().nextInt((int) (sleepMillis * jitterRatio))
+                  - (int) (sleepMillis * jitterRatio / 2);
+          sleeper.sleepUninterruptibly(Duration.millis(sleepMillis + jitter));
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes BillingEvents, {@link google.registry.model.poll.PollMessage PollMessages} and {@link
+   * google.registry.model.host.HostResource} from a {@link DomainBase}. These are circular foreign
+   * key constraints that prevent migration of {@code DomainBase} to SQL databases.
+   *
+   * <p>See {@link InitSqlPipeline} for more information.
+   */
+  static class RemoveDomainBaseForeignKeys extends DoFn<VersionedEntity, VersionedEntity> {
+
+    @ProcessElement
+    public void processElement(
+        @Element VersionedEntity domainBase, OutputReceiver<VersionedEntity> out) {
+      checkArgument(
+          domainBase.getEntity().isPresent(), "Unexpected delete entity %s", domainBase.key());
+      Entity outputEntity =
+          DomainBaseUtil.removeBillingAndPollAndHosts(domainBase.getEntity().get());
+      out.output(
+          VersionedEntity.from(
+              domainBase.commitTimeMills(),
+              EntityTranslator.convertToPb(outputEntity).toByteArray()));
+    }
+  }
+}

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

@@ -235,6 +235,7 @@ public abstract class BillingEvent implements Serializable {
                 DATE_TIME_FORMATTER.format(eventTime()),
                 registrarId(),
                 billingId(),
+                poNumber(),
                 tld(),
                 action(),
                 domain(),

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

@@ -59,6 +59,7 @@ import org.apache.beam.sdk.values.TypeDescriptors;
 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;
@@ -69,6 +70,7 @@ public class InvoicingPipeline implements Serializable {
   @Inject
   public InvoicingPipeline(
       @Config("projectId") String projectId,
+      @Config("defaultJobRegion") String beamJobRegion,
       @Config("apacheBeamBucketUrl") String beamBucketUrl,
       @Config("invoiceTemplateUrl") String invoiceTemplateUrl,
       @Config("beamStagingUrl") String beamStagingUrl,
@@ -76,6 +78,7 @@ public class InvoicingPipeline implements Serializable {
       @Config("invoiceFilePrefix") String invoiceFilePrefix,
       @LocalCredential GoogleCredentialsBundle googleCredentialsBundle) {
     this.projectId = projectId;
+    this.beamJobRegion = beamJobRegion;
     this.beamBucketUrl = beamBucketUrl;
     this.invoiceTemplateUrl = invoiceTemplateUrl;
     this.beamStagingUrl = beamStagingUrl;
@@ -103,6 +106,7 @@ public class InvoicingPipeline implements Serializable {
     // 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);

core/src/main/java/google/registry/beam/invoicing/sql/billing_events.sql

@@ -55,8 +55,7 @@ FROM (
     FROM
       `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRY_TABLE%`
     WHERE
-    -- TODO(b/18092292): Add a filter for tldState (not PDT/PREDELEGATION)
-      tldType = 'REAL') ) AS BillingEvent
+      invoicingEnabled IS TRUE) ) AS BillingEvent
   -- Gather billing ID from registrar table
   -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out
   -- non-billable registrars

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

@@ -141,7 +141,7 @@ public class SafeBrowsingTransforms {
     @ProcessElement
     public void processElement(ProcessContext context) {
       Subdomain subdomain = context.element();
-      subdomainBuffer.put(subdomain.fullyQualifiedDomainName(), subdomain);
+      subdomainBuffer.put(subdomain.domainName(), subdomain);
       if (subdomainBuffer.size() >= BATCH_SIZE) {
         ImmutableSet<KV<Subdomain, ThreatMatch>> results = evaluateAndFlush();
         results.forEach(context::output);
@@ -239,7 +239,7 @@ public class SafeBrowsingTransforms {
             String url = match.getJSONObject("threat").getString("url");
             Subdomain subdomain = subdomainBuffer.get(url);
             resultBuilder.add(
-                KV.of(subdomain, ThreatMatch.create(match, subdomain.fullyQualifiedDomainName())));
+                KV.of(subdomain, ThreatMatch.create(match, subdomain.domainName())));
           }
         }
       }

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

@@ -19,9 +19,15 @@ 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.backup.AppEngineEnvironment;
+import google.registry.beam.initsql.Transforms.SerializableSupplier;
 import google.registry.beam.spec11.SafeBrowsingTransforms.EvaluateSafeBrowsingFn;
 import google.registry.config.CredentialModule.LocalCredential;
 import google.registry.config.RegistryConfig.Config;
+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;
@@ -37,6 +43,7 @@ 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.DoFn;
 import org.apache.beam.sdk.transforms.GroupByKey;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -46,6 +53,7 @@ import org.apache.beam.sdk.values.TypeDescriptor;
 import org.apache.beam.sdk.values.TypeDescriptors;
 import org.joda.time.LocalDate;
 import org.joda.time.YearMonth;
+import org.joda.time.format.ISODateTimeFormat;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -77,29 +85,34 @@ public class Spec11Pipeline implements Serializable {
   public static final String REGISTRAR_EMAIL_FIELD = "registrarEmailAddress";
   /** The JSON object field into which we put the registrar's name for Spec11 reports. */
   public static final String REGISTRAR_CLIENT_ID_FIELD = "registrarClientId";
-  /** The JSON object field we put the threat match array for Spec11 reports. */
+  /** 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;
 
   @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
-  ) {
+      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;
   }
@@ -136,6 +149,7 @@ public class Spec11Pipeline implements Serializable {
     // 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);
@@ -177,18 +191,48 @@ public class Spec11Pipeline implements Serializable {
       PCollection<Subdomain> domains,
       EvaluateSafeBrowsingFn evaluateSafeBrowsingFn,
       ValueProvider<String> dateProvider) {
-    PCollection<KV<Subdomain, ThreatMatch>> subdomains =
+
+    PCollection<KV<Subdomain, ThreatMatch>> subdomainsSql =
+        domains.apply("Run through SafeBrowsing API", ParDo.of(evaluateSafeBrowsingFn));
+    /* Store ThreatMatch objects in SQL. */
+    subdomainsSql.apply(
+        ParDo.of(
+            new DoFn<KV<Subdomain, ThreatMatch>, Void>() {
+              @ProcessElement
+              public void processElement(ProcessContext context) {
+                // create the Spec11ThreatMatch from Subdomain and ThreatMatch
+                try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+                  Subdomain subdomain = context.element().getKey();
+                  Spec11ThreatMatch threatMatch =
+                      new Spec11ThreatMatch.Builder()
+                          .setThreatTypes(
+                              ImmutableSet.of(
+                                  ThreatType.valueOf(context.element().getValue().threatType())))
+                          .setCheckDate(
+                              LocalDate.parse(dateProvider.get(), ISODateTimeFormat.date()))
+                          .setDomainName(subdomain.domainName())
+                          .setDomainRepoId(subdomain.domainRepoId())
+                          .setRegistrarId(subdomain.registrarId())
+                          .build();
+                  JpaTransactionManager jpaTransactionManager = jpaSupplierFactory.get();
+                  jpaTransactionManager.transact(() -> jpaTransactionManager.insert(threatMatch));
+                }
+              }
+            }));
+
+    /* Store ThreatMatch objects in JSON. */
+    PCollection<KV<Subdomain, ThreatMatch>> subdomainsJson =
         domains.apply("Run through SafeBrowsingAPI", ParDo.of(evaluateSafeBrowsingFn));
-    subdomains
+    subdomainsJson
         .apply(
-            "Map registrar client ID to email/ThreatMatch pair",
+            "Map registrar ID to email/ThreatMatch pair",
             MapElements.into(
                     TypeDescriptors.kvs(
                         TypeDescriptors.strings(), TypeDescriptor.of(EmailAndThreatMatch.class)))
                 .via(
                     (KV<Subdomain, ThreatMatch> kv) ->
                         KV.of(
-                            kv.getKey().registrarClientId(),
+                            kv.getKey().registrarId(),
                             EmailAndThreatMatch.create(
                                 kv.getKey().registrarEmailAddress(), kv.getValue()))))
         .apply("Group by registrar client ID", GroupByKey.create())

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

@@ -36,12 +36,14 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
 public abstract class Subdomain implements Serializable {
 
   private static final ImmutableList<String> FIELD_NAMES =
-      ImmutableList.of("fullyQualifiedDomainName", "registrarClientId", "registrarEmailAddress");
+      ImmutableList.of("domainName", "domainRepoId", "registrarId", "registrarEmailAddress");
 
   /** Returns the fully qualified domain name. */
-  abstract String fullyQualifiedDomainName();
-  /** Returns the client ID of the associated registrar for this domain. */
-  abstract String registrarClientId();
+  abstract String domainName();
+  /** Returns the domain repo ID (the primary key of the domain table). */
+  abstract String domainRepoId();
+  /** Returns the registrar ID of the associated registrar for this domain. */
+  abstract String registrarId();
   /** Returns the email address of the registrar associated with this domain. */
   abstract String registrarEmailAddress();
 
@@ -56,8 +58,9 @@ public abstract class Subdomain implements Serializable {
     checkFieldsNotNull(FIELD_NAMES, schemaAndRecord);
     GenericRecord record = schemaAndRecord.getRecord();
     return create(
-        extractField(record, "fullyQualifiedDomainName"),
-        extractField(record, "registrarClientId"),
+        extractField(record, "domainName"),
+        extractField(record, "domainRepoId"),
+        extractField(record, "registrarId"),
         extractField(record, "registrarEmailAddress"));
   }
 
@@ -69,9 +72,11 @@ public abstract class Subdomain implements Serializable {
    */
   @VisibleForTesting
   static Subdomain create(
-      String fullyQualifiedDomainName, String registrarClientId, String registrarEmailAddress) {
+      String domainName,
+      String domainRepoId,
+      String registrarId,
+      String registrarEmailAddress) {
     return new AutoValue_Subdomain(
-        fullyQualifiedDomainName, registrarClientId, registrarEmailAddress);
+        domainName, domainRepoId, registrarId, registrarEmailAddress);
   }
 }
-

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

@@ -24,22 +24,10 @@ import org.json.JSONObject;
 public abstract class ThreatMatch implements Serializable {
 
   private static final String THREAT_TYPE_FIELD = "threatType";
-  private static final String PLATFORM_TYPE_FIELD = "platformType";
-  private static final String METADATA_FIELD = "threatEntryMetadata";
   private static final String DOMAIN_NAME_FIELD = "fullyQualifiedDomainName";
 
   /** Returns what kind of threat it is (malware, phishing etc.) */
   public abstract String threatType();
-  /** Returns what platforms it affects (Windows, Linux etc.) */
-  abstract String platformType();
-  /**
-   * Returns a String representing a JSON Object containing arbitrary metadata associated with this
-   * threat, or "NONE" if there is no metadata to retrieve.
-   *
-   * <p>This ideally would be a {@link JSONObject} type, but can't be due to serialization
-   * requirements.
-   */
-  abstract String metadata();
   /** Returns the fully qualified domain name [SLD].[TLD] of the matched threat. */
   public abstract String fullyQualifiedDomainName();
 
@@ -52,29 +40,19 @@ public abstract class ThreatMatch implements Serializable {
   static ThreatMatch create(JSONObject threatMatchJSON, String fullyQualifiedDomainName)
       throws JSONException {
     return new AutoValue_ThreatMatch(
-        threatMatchJSON.getString(THREAT_TYPE_FIELD),
-        threatMatchJSON.getString(PLATFORM_TYPE_FIELD),
-        threatMatchJSON.has(METADATA_FIELD)
-            ? threatMatchJSON.getJSONObject(METADATA_FIELD).toString()
-            : "NONE",
-        fullyQualifiedDomainName);
+        threatMatchJSON.getString(THREAT_TYPE_FIELD), fullyQualifiedDomainName);
   }
 
   /** Returns a {@link JSONObject} representing a subset of this object's data. */
   JSONObject toJSON() throws JSONException {
     return new JSONObject()
         .put(THREAT_TYPE_FIELD, threatType())
-        .put(PLATFORM_TYPE_FIELD, platformType())
-        .put(METADATA_FIELD, metadata())
         .put(DOMAIN_NAME_FIELD, fullyQualifiedDomainName());
   }
 
   /** Parses a {@link JSONObject} and returns an equivalent {@link ThreatMatch}. */
   public static ThreatMatch fromJSON(JSONObject threatMatch) throws JSONException {
     return new AutoValue_ThreatMatch(
-        threatMatch.getString(THREAT_TYPE_FIELD),
-        threatMatch.getString(PLATFORM_TYPE_FIELD),
-        threatMatch.getString(METADATA_FIELD),
-        threatMatch.getString(DOMAIN_NAME_FIELD));
+        threatMatch.getString(THREAT_TYPE_FIELD), threatMatch.getString(DOMAIN_NAME_FIELD));
   }
 }

core/src/main/java/google/registry/beam/spec11/sql/subdomains.sql

@@ -19,11 +19,13 @@
   -- email address.
 
 SELECT
-  domain.fullyQualifiedDomainName AS fullyQualifiedDomainName,
-  registrar.clientId AS registrarClientId,
+  domain.fullyQualifiedDomainName AS domainName,
+  domain.__key__.name AS domainRepoId,
+  registrar.clientId AS registrarId,
   COALESCE(registrar.emailAddress, '') AS registrarEmailAddress
 FROM ( (
     SELECT
+      __key__,
       fullyQualifiedDomainName,
       currentSponsorClientId,
       creationTime

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

@@ -442,10 +442,8 @@ public class BigqueryConnection implements AutoCloseable {
    * Returns the result of calling queryToLocalTable, but synchronously to avoid spawning new
    * background threads, which App Engine doesn't support.
    *
-   * @see <a href="https://cloud.google.com/appengine/docs/standard/java/runtime#Threads">
-   *   App Engine Runtime</a>
-   *
-   * <p>Returns the results of the query in an ImmutableTable on success.
+   * @see <a href="https://cloud.google.com/appengine/docs/standard/java/runtime#Threads">App Engine
+   *     Runtime</a>
    */
   public ImmutableTable<Integer, TableFieldSchema, Object> queryToLocalTableSync(String querySql) {
     Job job = new Job()
@@ -576,8 +574,6 @@ public class BigqueryConnection implements AutoCloseable {
 
   /**
    * Launch a job, wait for it to complete, but <i>do not</i> check for errors.
-   *
-   * @throws BigqueryJobFailureException
    */
   public Job runJob(Job job, @Nullable AbstractInputStreamContent data) {
     return checkJob(waitForJob(launchJob(job, data)));

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

@@ -615,6 +615,18 @@ public final class RegistryConfig {
       return config.registryPolicy.requireSslCertificates;
     }
 
+    /**
+     * Returns the default job region to run Apache Beam (Cloud Dataflow) jobs in.
+     *
+     * @see google.registry.beam.invoicing.InvoicingPipeline
+     * @see google.registry.beam.spec11.Spec11Pipeline
+     */
+    @Provides
+    @Config("defaultJobRegion")
+    public static String provideDefaultJobRegion(RegistryConfigSettings config) {
+      return config.beam.defaultJobRegion;
+    }
+
     /**
      * Returns the default job zone to run Apache Beam (Cloud Dataflow) jobs in.
      *
@@ -1527,6 +1539,21 @@ public final class RegistryConfig {
     return CONFIG_SETTINGS.get().hibernate.hikariIdleTimeout;
   }
 
+  /**
+   * Returns whether to replicate cloud SQL transactions to datastore.
+   *
+   * <p>If true, all cloud SQL transactions will be persisted as TransactionEntity objects in the
+   * Transaction table and replayed against datastore in a cron job.
+   */
+  public static boolean getCloudSqlReplicateTransactions() {
+    return CONFIG_SETTINGS.get().cloudSql.replicateTransactions;
+  }
+
+  @VisibleForTesting
+  public static void overrideCloudSqlReplicateTransactions(boolean replicateTransactions) {
+    CONFIG_SETTINGS.get().cloudSql.replicateTransactions = replicateTransactions;
+  }
+
   /** 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

@@ -122,10 +122,12 @@ public class RegistryConfigSettings {
     public String jdbcUrl;
     public String username;
     public String instanceConnectionName;
+    public boolean replicateTransactions;
   }
 
   /** Configuration for Apache Beam (Cloud Dataflow). */
   public static class Beam {
+    public String defaultJobRegion;
     public String defaultJobZone;
   }
 

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

@@ -207,8 +207,20 @@ hibernate:
 
   # Connection pool configurations.
   hikariConnectionTimeout: 20000
-  hikariMinimumIdle: 0
-  hikariMaximumPoolSize: 20
+  # 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.
+  hikariMinimumIdle: 1
+  hikariMaximumPoolSize: 10
   hikariIdleTimeout: 300000
 
 cloudSql:
@@ -218,6 +230,9 @@ cloudSql:
   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
 
 cloudDns:
   # Set both properties to null in Production.
@@ -404,7 +419,10 @@ misc:
   transientFailureRetries: 12
 
 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
 
 keyring:

core/src/main/java/google/registry/dns/DnsQueue.java

@@ -119,35 +119,31 @@ public class DnsQueue {
             .param(PARAM_TLD, tld));
   }
 
-  /**
-   * Adds a task to the queue to refresh the DNS information for the specified subordinate host.
-   */
-  public TaskHandle addHostRefreshTask(String fullyQualifiedHostName) {
-    Optional<InternetDomainName> tld =
-        Registries.findTldForName(InternetDomainName.from(fullyQualifiedHostName));
-    checkArgument(tld.isPresent(),
-        String.format("%s is not a subordinate host to a known tld", fullyQualifiedHostName));
-    return addToQueue(TargetType.HOST, fullyQualifiedHostName, tld.get().toString(), Duration.ZERO);
+  /** Adds a task to the queue to refresh the DNS information for the specified subordinate host. */
+  public TaskHandle addHostRefreshTask(String hostName) {
+    Optional<InternetDomainName> tld = Registries.findTldForName(InternetDomainName.from(hostName));
+    checkArgument(
+        tld.isPresent(), String.format("%s is not a subordinate host to a known tld", hostName));
+    return addToQueue(TargetType.HOST, hostName, tld.get().toString(), Duration.ZERO);
   }
 
   /** Enqueues a task to refresh DNS for the specified domain now. */
-  public TaskHandle addDomainRefreshTask(String fullyQualifiedDomainName) {
-    return addDomainRefreshTask(fullyQualifiedDomainName, Duration.ZERO);
+  public TaskHandle addDomainRefreshTask(String domainName) {
+    return addDomainRefreshTask(domainName, Duration.ZERO);
   }
 
   /** Enqueues a task to refresh DNS for the specified domain at some point in the future. */
-  public TaskHandle addDomainRefreshTask(String fullyQualifiedDomainName, Duration countdown) {
+  public TaskHandle addDomainRefreshTask(String domainName, Duration countdown) {
     return addToQueue(
         TargetType.DOMAIN,
-        fullyQualifiedDomainName,
-        assertTldExists(getTldFromDomainName(fullyQualifiedDomainName)),
+        domainName,
+        assertTldExists(getTldFromDomainName(domainName)),
         countdown);
   }
 
   /** Adds a task to the queue to refresh the DNS information for the specified zone. */
-  public TaskHandle addZoneRefreshTask(String fullyQualifiedZoneName) {
-    return addToQueue(
-        TargetType.ZONE, fullyQualifiedZoneName, fullyQualifiedZoneName, Duration.ZERO);
+  public TaskHandle addZoneRefreshTask(String zoneName) {
+    return addToQueue(TargetType.ZONE, zoneName, zoneName, Duration.ZERO);
   }
 
   /**

core/src/main/java/google/registry/dns/RefreshDnsAction.java

@@ -89,7 +89,7 @@ public final class RefreshDnsAction implements Runnable {
   private static void verifyHostIsSubordinate(HostResource host) {
     if (!host.isSubordinate()) {
       throw new BadRequestException(
-          String.format("%s isn't a subordinate hostname", host.getFullyQualifiedHostName()));
+          String.format("%s isn't a subordinate hostname", host.getHostName()));
     }
   }
 }

core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java

@@ -154,7 +154,7 @@ public class CloudDnsWriter extends BaseDnsWriter {
     }
 
     // Construct NS records (if any).
-    Set<String> nameserverData = domainBase.get().loadNameserverFullyQualifiedHostNames();
+    Set<String> nameserverData = domainBase.get().loadNameserverHostNames();
     Set<String> subordinateHosts = domainBase.get().getSubordinateHosts();
     if (!nameserverData.isEmpty()) {
       HashSet<String> nsRrData = new HashSet<>();

core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java

@@ -84,7 +84,7 @@ public class DnsMessageTransport {
    * @param query a message to send
    * @return the response received from the server
    * @throws IOException if the Socket input/output streams throws one
-   * @throws IllegalArgumentException if the query is too large to be sent (> 65535 bytes)
+   * @throws IllegalArgumentException if the query is too large to be sent (> 65535 bytes)
    */
   public Message send(Message query) throws IOException {
     try (Socket socket = factory.createSocket(InetAddress.getByName(updateHost), DNS_PORT)) {

core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java

@@ -189,7 +189,7 @@ public class DnsUpdateWriter extends BaseDnsWriter {
     for (DelegationSignerData signerData : domain.getDsData()) {
       DSRecord dsRecord =
           new DSRecord(
-              toAbsoluteName(domain.getFullyQualifiedDomainName()),
+              toAbsoluteName(domain.getDomainName()),
               DClass.IN,
               dnsDefaultDsTtl.getStandardSeconds(),
               signerData.getKeyTag(),
@@ -215,8 +215,7 @@ public class DnsUpdateWriter extends BaseDnsWriter {
 
   private void addInBailiwickNameServerSet(DomainBase domain, Update update) {
     for (String hostName :
-        intersection(
-            domain.loadNameserverFullyQualifiedHostNames(), domain.getSubordinateHosts())) {
+        intersection(domain.loadNameserverHostNames(), domain.getSubordinateHosts())) {
       Optional<HostResource> host = loadByForeignKey(HostResource.class, hostName, clock.nowUtc());
       checkState(host.isPresent(), "Host %s cannot be loaded", hostName);
       update.add(makeAddressSet(host.get()));
@@ -226,10 +225,10 @@ public class DnsUpdateWriter extends BaseDnsWriter {
 
   private RRset makeNameServerSet(DomainBase domain) {
     RRset nameServerSet = new RRset();
-    for (String hostName : domain.loadNameserverFullyQualifiedHostNames()) {
+    for (String hostName : domain.loadNameserverHostNames()) {
       NSRecord record =
           new NSRecord(
-              toAbsoluteName(domain.getFullyQualifiedDomainName()),
+              toAbsoluteName(domain.getDomainName()),
               DClass.IN,
               dnsDefaultNsTtl.getStandardSeconds(),
               toAbsoluteName(hostName));
@@ -244,7 +243,7 @@ public class DnsUpdateWriter extends BaseDnsWriter {
       if (address instanceof Inet4Address) {
         ARecord record =
             new ARecord(
-                toAbsoluteName(host.getFullyQualifiedHostName()),
+                toAbsoluteName(host.getHostName()),
                 DClass.IN,
                 dnsDefaultATtl.getStandardSeconds(),
                 address);
@@ -260,7 +259,7 @@ public class DnsUpdateWriter extends BaseDnsWriter {
       if (address instanceof Inet6Address) {
         AAAARecord record =
             new AAAARecord(
-                toAbsoluteName(host.getFullyQualifiedHostName()),
+                toAbsoluteName(host.getHostName()),
                 DClass.IN,
                 dnsDefaultATtl.getStandardSeconds(),
                 address);