Add a build task to upload ER diagrams to GCS (#844)

* Add a build task to upload ER diagrams to GCS

* Merge ER diagram task into cloudbuild-javadoc

.gitignore

@@ -97,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"

build.gradle

@@ -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'
@@ -194,7 +191,7 @@ allprojects {
 }
 
 task runPresubmits(type: Exec) {
-  executable '/usr/bin/python'
+  executable '/usr/bin/python3'
   args('config/presubmits.py')
 }
 
@@ -263,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()
         }
       }
@@ -290,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"
@@ -304,18 +295,12 @@ subprojects {
 
   sourceSets {
     main {
-      java {
-        srcDirs += aptGeneratedDir
-      }
       resources {
         srcDirs += project.ext.javaDir
         exclude commonlyExcludedResources
       }
     }
     test {
-      java {
-        srcDirs += aptGeneratedTestDir
-      }
       resources {
         srcDirs += project.ext.javaTestDir
         exclude commonlyExcludedResources
@@ -323,9 +308,14 @@ subprojects {
     }
   }
 
-  javadocSource << project.sourceSets.main.allJava
-  javadocClasspath << project.sourceSets.main.compileClasspath
-  javadocDependentTasks << project.tasks.compileJava
+  // 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

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/annotationProcessor.lockfile

@@ -1,25 +1,28 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

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/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/testAnnotationProcessor.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

buildSrc/gradle/dependency-locks/testCompile.lockfile

@@ -49,7 +49,7 @@ 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
+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
@@ -65,7 +65,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6

buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -49,7 +49,7 @@ 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
+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
@@ -65,7 +65,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6

buildSrc/gradle/dependency-locks/testRuntime.lockfile

@@ -49,7 +49,7 @@ 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
+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
@@ -65,7 +65,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6

buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -49,7 +49,7 @@ 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
+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
@@ -65,7 +65,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.mockito:mockito-core:3.3.3
 org.objenesis:objenesis:2.6

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

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/annotationProcessor.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

common/gradle/dependency-locks/errorprone.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

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/testAnnotationProcessor.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

common/gradle/dependency-locks/testCompile.lockfile

@@ -14,7 +14,7 @@ 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.11.1
@@ -24,6 +24,5 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -14,7 +14,7 @@ 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.11.1
@@ -24,6 +24,5 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testRuntime.lockfile

@@ -15,7 +15,7 @@ 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.11.1
@@ -25,6 +25,5 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -15,7 +15,7 @@ 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.11.1
@@ -25,6 +25,5 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.opentest4j:opentest4j:1.2.0

common/gradle/dependency-locks/testingAnnotationProcessor.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

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

@@ -24,6 +24,7 @@ import java.time.ZonedDateTime;
 import java.util.TimeZone;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
 
 /** Utilities methods and constants related to Joda {@link DateTime} objects. */
 public class DateTimeUtils {
@@ -108,4 +109,12 @@ public class DateTimeUtils {
         zonedDateTime.toInstant().toEpochMilli(),
         DateTimeZone.forTimeZone(TimeZone.getTimeZone(zonedDateTime.getZone())));
   }
+
+  public static java.sql.Date toSqlDate(LocalDate localDate) {
+    return new java.sql.Date(localDate.toDateTimeAtStartOfDay().getMillis());
+  }
+
+  public static LocalDate toLocalDate(java.sql.Date date) {
+    return new LocalDate(date.getTime(), DateTimeZone.UTC);
+  }
 }

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

@@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 import org.joda.time.ReadableDuration;
@@ -41,6 +40,6 @@ public final class SystemSleeper implements Sleeper, Serializable {
   @Override
   public void sleepUninterruptibly(ReadableDuration duration) {
     checkArgument(duration.getMillis() >= 0);
-    Uninterruptibles.sleepUninterruptibly(duration.getMillis(), TimeUnit.MILLISECONDS);
+    Uninterruptibles.sleepUninterruptibly(java.time.Duration.ofMillis(duration.getMillis()));
   }
 }

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

@@ -16,15 +16,16 @@
 """
 
 import argparse
-import attr
+import dataclasses
 import io
 import os
+import shutil
 import subprocess
 import sys
 from typing import List, Union
 
 
-@attr.s(auto_attribs=True)
+@dataclasses.dataclass
 class Property:
     name : str = ''
     desc : str = ''
@@ -38,7 +39,7 @@ class Property:
                 raise ValidationError('value of {self.name} must be "true" or '
                                       '"false".')
 
-@attr.s(auto_attribs=True)
+@dataclasses.dataclass
 class GradleFlag:
     flags : Union[str, List[str]]
     desc : str
@@ -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
@@ -93,20 +94,20 @@ 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 AppEngineRule.
+    # ObjectifyService.register is restricted to main/ or AppEngineExtension.
     PresubmitCheck(
         r".*\bObjectifyService\.register", "java", {
             "/build/", "/generated/", "node_modules/", "src/main/",
-            "AppEngineRule.java"
+            "AppEngineExtension.java"
         }):
-      "ObjectifyService.register is not allowed in tests. Please use "
-      "AppengineRule.register instead.",
+      "ObjectifyService.register(...) is not allowed in tests. Please use "
+      "AppEngineExtension.register(...) instead.",
 
     # PostgreSQLContainer instantiation must specify docker tag
     PresubmitCheck(
@@ -178,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("."):
@@ -197,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'
@@ -226,18 +221,20 @@ dependencies {
   compile deps['com.jcraft:jsch']
   testCompile deps['com.thoughtworks.qdox:qdox']
   compile deps['dnsjava:dnsjava']
+  runtime deps['guru.nidi:graphviz-java-all-j2v8']
   testCompile deps['io.github.classgraph:classgraph']
   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 +246,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,12 +254,14 @@ 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']
+  compile deps['org.jsoup:jsoup']
   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']
@@ -272,7 +272,10 @@ dependencies {
   compile deps['org.testcontainers:postgresql']
   testCompile deps['org.testcontainers:selenium']
   testCompile deps['org.testcontainers:testcontainers']
-  testCompile deps['pl.pragmatists:JUnitParams']
+  compile deps['us.fatehi:schemacrawler']
+  compile deps['us.fatehi:schemacrawler-api']
+  compile deps['us.fatehi:schemacrawler-diagram']
+  compile deps['us.fatehi:schemacrawler-tools']
   compile deps['xerces:xmlParserAPIs']
   compile deps['xpp3:xpp3']
   // This dependency must come after javax.mail:mail as it would otherwise
@@ -313,9 +316,9 @@ dependencies {
   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']
@@ -408,6 +411,9 @@ task jaxbToJava {
         }
       }
     }
+    execInBash(
+        'find . -name *.java -exec sed -i /\\*\\ \\<p\\>\\$/d {} +',
+        generatedDir)
   }
 }
 
@@ -634,6 +640,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
@@ -706,6 +965,10 @@ task fragileTest(type: FilteringTest) {
 
   // Run every test class in a freshly started process.
   forkEvery 1
+
+  doFirst {
+    new File(screenshotsDir).deleteDir()
+  }
 }
 
 task outcastTest(type: FilteringTest) {
@@ -718,33 +981,6 @@ task outcastTest(type: FilteringTest) {
   maxParallelForks 3
 }
 
-// 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}")
-      }
-    }
-  }
-}
-
 // Dedicated test suite for schema-dependent tests.
 task sqlIntegrationTest(type: FilteringTest) {
   // TestSuite still requires a JUnit 4 runner, which knows how to handle JUnit 5 tests.
@@ -755,115 +991,14 @@ 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) {
@@ -890,10 +1025,6 @@ task standardTest(type: FilteringTest) {
 
   systemProperty 'test.projectRoot', rootProject.projectRootDir
   systemProperty 'test.resourcesDir', resourcesDir
-
-  doFirst {
-    new File(screenshotsDir).deleteDir()
-  }
 }
 
 test {
@@ -903,97 +1034,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.
-// 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', '.'
-}
-
-// 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

@@ -1,8 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.auto.value:auto-value:1.6.3
 com.google.auto:auto-common:0.10
 com.google.code.findbugs:jFormatString:3.0.0
@@ -11,11 +11,11 @@ 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_annotation:2.3.4
 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:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
@@ -30,11 +30,14 @@ 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.11.1
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
 org.jetbrains.kotlin:kotlin-stdlib:1.3.61
 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0
 org.jetbrains:annotations:13.0
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

core/gradle/dependency-locks/compile.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,87 +18,87 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,43 +126,44 @@ 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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -175,33 +174,42 @@ 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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -218,8 +226,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -228,6 +236,7 @@ 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
@@ -237,10 +246,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/compileClasspath.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,86 +18,86 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,42 +125,44 @@ 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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -173,32 +173,41 @@ 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
 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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -214,6 +223,7 @@ 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.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
@@ -223,6 +233,7 @@ 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
@@ -232,10 +243,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/default.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,88 +22,88 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +111,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,43 +131,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -176,33 +182,45 @@ 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.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -219,8 +237,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -234,16 +252,24 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/deploy_jar.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,88 +22,88 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +111,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,43 +131,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -176,32 +182,44 @@ 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
+net.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -217,6 +235,7 @@ 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.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
@@ -231,16 +250,24 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/errorprone.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

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/nonprodAnnotationProcessor.lockfile

@@ -1,24 +1,27 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 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.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-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:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.4.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

core/gradle/dependency-locks/nonprodCompile.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,87 +18,87 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,43 +126,44 @@ 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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -175,33 +174,42 @@ 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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -218,8 +226,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -228,6 +236,7 @@ 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
@@ -237,10 +246,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/nonprodCompileClasspath.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,86 +18,86 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,42 +125,44 @@ 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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -173,33 +173,42 @@ 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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -216,8 +225,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -226,6 +235,7 @@ 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
@@ -235,10 +245,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/nonprodRuntime.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,87 +22,87 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +110,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,43 +130,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -175,33 +181,45 @@ 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.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -218,8 +236,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -233,15 +251,23 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,87 +22,87 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +110,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,43 +130,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -175,33 +181,45 @@ 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.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -218,8 +236,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -233,15 +251,23 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/runtime.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,87 +22,87 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +110,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,43 +130,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -175,33 +181,45 @@ 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.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -218,8 +236,8 @@ 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.jsoup:jsoup:1.13.1
 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
@@ -233,15 +251,23 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.10.2
 com.fasterxml.jackson.core:jackson-core:2.10.2
-com.fasterxml.jackson.core:jackson-databind:2.9.10
+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
@@ -19,88 +22,88 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +111,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,43 +131,47 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
+io.grpc:grpc-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
-javax.annotation:javax.annotation-api:1.2
+javax.annotation:javax.annotation-api:1.3.2
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 javax.jdo:jdo2-api:2.3-eb
@@ -176,32 +182,44 @@ 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
+net.arnx:nashorn-promise:0.1.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.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.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:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+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.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
@@ -217,6 +235,7 @@ 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.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
@@ -231,16 +250,24 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
 org.testcontainers:postgresql:1.14.3
 org.testcontainers:testcontainers:1.14.3
-org.threeten:threetenbp:1.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -1,8 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
 com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.auto.value:auto-value:1.6.3
 com.google.auto:auto-common:0.10
 com.google.code.findbugs:jFormatString:3.0.0
@@ -11,11 +11,11 @@ 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_annotation:2.3.4
 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:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
 com.google.errorprone:javac-shaded:9-dev-r4023-3
 com.google.googlejavaformat:google-java-format:1.5
 com.google.guava:failureaccess:1.0.1
@@ -30,11 +30,14 @@ 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.11.1
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61
 org.jetbrains.kotlin:kotlin-stdlib:1.3.61
 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0
 org.jetbrains:annotations:13.0
 org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0

core/gradle/dependency-locks/testApt.lockfile

@@ -1,3 +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.

core/gradle/dependency-locks/testCompile.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,89 +18,89 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,25 +182,30 @@ 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.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.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
@@ -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
@@ -224,7 +228,8 @@ 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.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
@@ -243,6 +248,8 @@ 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.jsoup:jsoup:1.13.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
@@ -252,7 +259,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
 org.mockito:mockito-core:3.3.3
@@ -266,6 +272,7 @@ 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
@@ -287,11 +294,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -1,15 +1,14 @@
 # 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.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
@@ -19,88 +18,88 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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,25 +181,30 @@ 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.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.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
@@ -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
@@ -222,7 +227,8 @@ 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.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
@@ -241,6 +247,8 @@ 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.jsoup:jsoup:1.13.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
@@ -250,7 +258,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
 org.mockito:mockito-core:3.3.3
@@ -264,6 +271,7 @@ 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
@@ -285,11 +293,15 @@ 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.3.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
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testRuntime.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.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
@@ -19,90 +22,90 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +114,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 +139,44 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
 io.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-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,25 +191,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.arnx:nashorn-promise:0.1.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.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
@@ -213,6 +224,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
@@ -226,7 +239,8 @@ 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.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
@@ -246,6 +260,8 @@ 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.jsoup:jsoup:1.13.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
@@ -255,7 +271,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
 org.mockito:mockito-core:3.3.3
@@ -284,6 +299,8 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.testcontainers:database-commons:1.14.3
 org.testcontainers:jdbc:1.14.3
@@ -291,11 +308,16 @@ 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.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.1
 xerces:xmlParserAPIs:2.6.2
 xpp3:xpp3:1.1.4c

core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -1,15 +1,18 @@
 # 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.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0
+com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0
+com.fasterxml.jackson.core:jackson-annotations:2.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
@@ -19,90 +22,90 @@ 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-rev20190827-1.30.1
-com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0
+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.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
+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.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-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: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.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: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 +114,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 +139,44 @@ 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
+guru.nidi.com.kitfox:svgSalamander:1.1.3
+guru.nidi:graphviz-java-all-j2v8:0.17.0
+guru.nidi:graphviz-java:0.17.0
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
 io.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-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,25 +191,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.arnx:nashorn-promise:0.1.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.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
@@ -213,6 +224,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
@@ -226,7 +239,8 @@ 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.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
@@ -246,6 +260,8 @@ 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.jsoup:jsoup:1.13.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
@@ -255,7 +271,6 @@ 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.vintage:junit-vintage-engine:5.6.2
 org.junit:junit-bom:5.6.2
 org.jvnet.staxex:stax-ex:1.8
 org.mockito:mockito-core:3.3.3
@@ -284,6 +299,8 @@ 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:jcl-over-slf4j:1.7.30
+org.slf4j:jul-to-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-jdk14:1.7.28
 org.testcontainers:database-commons:1.14.3
@@ -292,11 +309,16 @@ 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.3.3
+org.threeten:threetenbp:1.4.1
 org.tukaani:xz:1.8
 org.w3c.css:sac:1.3
+org.webjars.npm:viz.js-for-graphviz-java:2.1.3
 org.xerial.snappy:snappy-java:1.1.4
 org.yaml:snakeyaml:1.17
-pl.pragmatists:JUnitParams:1.1.1
+us.fatehi:schemacrawler-api:16.10.1
+us.fatehi:schemacrawler-diagram:16.10.1
+us.fatehi:schemacrawler-tools:16.10.1
+us.fatehi:schemacrawler-utility:16.10.1
+us.fatehi:schemacrawler:16.10.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

@@ -22,21 +22,35 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
 /**
- * Sets up a placeholder {@link Environment} on a non-AppEngine platform so that Datastore Entities
- * can be converted from/to Objectify entities. See {@code DatastoreEntityExtension} in test source
- * for more information.
+ * 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 static final Environment PLACEHOLDER_ENV = createAppEngineEnvironment();
-
   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(PLACEHOLDER_ENV);
+      ApiProxy.setEnvironmentForCurrentThread(createAppEngineEnvironment(appId));
     }
   }
 
@@ -48,7 +62,7 @@ public class AppEngineEnvironment implements Closeable {
   }
 
   /** Returns a placeholder {@link Environment} that can return hardcoded AppId and Attributes. */
-  private static Environment createAppEngineEnvironment() {
+  private static Environment createAppEngineEnvironment(String appId) {
     return (Environment)
         Proxy.newProxyInstance(
             Environment.class.getClassLoader(),
@@ -56,7 +70,7 @@ public class AppEngineEnvironment implements Closeable {
             (Object proxy, Method method, Object[] args) -> {
               switch (method.getName()) {
                 case "getAppId":
-                  return "PlaceholderAppId";
+                  return appId;
                 case "getAttributes":
                   return ImmutableMap.<String, Object>of();
                 default:

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

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

@@ -464,7 +464,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
         HostResource host = (HostResource) existingResource;
         if (host.isSubordinate()) {
           dnsQueue.addHostRefreshTask(host.getHostName());
-          tm().saveNewOrUpdate(
+          tm().put(
                   tm().load(host.getSuperordinateDomain())
                       .asBuilder()
                       .removeSubordinateHost(host.getHostName())

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.getDomainName());
-        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.getDomainName();
-    checkArgument(
-        !DateTimeUtils.isAtOrAfter(jpaTm().getTransactionTime(), domain.getDeletionTime()),
-        "Domain %s has been deleted",
-        domainName);
     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

@@ -32,7 +32,7 @@ public final class BackupPaths {
   private BackupPaths() {}
 
   private static final String WILDCARD_CHAR = "*";
-  private static final String EXPORT_PATTERN_TEMPLATE = "%s/all_namespaces/kind_%s/input-%s";
+  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 + "*";

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

@@ -54,37 +54,39 @@ public class BeamJpaModule {
 
   private static final String GCS_SCHEME = "gs://";
 
-  @Nullable private final String credentialFilePath;
+  @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
-   * credentialFilePath in {@link #provideCloudSqlAccessInfo} rather than in the constructor.
+   * 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 credentialFilePath the path to a Cloud SQL credential file. This must refer to either a
+   * @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 credentialFilePath) {
-    this.credentialFilePath = credentialFilePath;
+  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 credentialFilePath.startsWith(GCS_SCHEME);
+    return sqlAccessInfoFile.startsWith(GCS_SCHEME);
   }
 
   @Provides
   @Singleton
   SqlAccessInfo provideCloudSqlAccessInfo(Lazy<CloudSqlCredentialDecryptor> lazyDecryptor) {
-    checkArgument(!isNullOrEmpty(credentialFilePath), "Null or empty credentialFilePath");
+    checkArgument(!isNullOrEmpty(sqlAccessInfoFile), "Null or empty credentialFilePath");
     String line = readOnlyLineFromCredentialFile();
     if (isCloudSqlCredential()) {
       line = lazyDecryptor.get().decrypt(line);
@@ -101,7 +103,7 @@ public class BeamJpaModule {
 
   String readOnlyLineFromCredentialFile() {
     try {
-      ResourceId resourceId = FileSystems.matchSingleFileSpec(credentialFilePath).resourceId();
+      ResourceId resourceId = FileSystems.matchSingleFileSpec(sqlAccessInfoFile).resourceId();
       try (BufferedReader reader =
           new BufferedReader(
               new InputStreamReader(
@@ -141,8 +143,8 @@ public class BeamJpaModule {
 
   @Provides
   @Config("beamCloudKmsProjectId")
-  static String kmsProjectId() {
-    return "domain-registry-dev";
+  String kmsProjectId() {
+    return cloudKmsProjectId;
   }
 
   @Provides

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

@@ -1,3 +1,17 @@
 ## Summary
 
-This package contains a BEAM pipeline that populates a Cloud SQL database from a Datastore backup.
+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/Transforms.java

@@ -17,8 +17,10 @@ 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;
@@ -29,14 +31,16 @@ 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.base.Throwables;
 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;
@@ -49,7 +53,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
-import javax.persistence.OptimisticLockException;
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.io.Compression;
 import org.apache.beam.sdk.io.FileIO;
@@ -70,7 +73,6 @@ 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.PDone;
 import org.apache.beam.sdk.values.TupleTag;
 import org.apache.beam.sdk.values.TupleTagList;
 import org.apache.beam.sdk.values.TypeDescriptor;
@@ -225,7 +227,7 @@ public final class Transforms {
     return new PTransform<PCollection<String>, PCollection<Metadata>>() {
       @Override
       public PCollection<Metadata> expand(PCollection<String> input) {
-        return input.apply(FileIO.matchAll().withEmptyMatchTreatment(EmptyMatchTreatment.DISALLOW));
+        return input.apply(FileIO.matchAll().withEmptyMatchTreatment(EmptyMatchTreatment.ALLOW));
       }
     };
   }
@@ -263,6 +265,11 @@ public final class Transforms {
 
   /**
    * 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
@@ -270,22 +277,21 @@ public final class Transforms {
    * @param batchSize the number of entities to write in each operation
    * @param jpaSupplier supplier of a {@link JpaTransactionManager}
    */
-  public static PTransform<PCollection<VersionedEntity>, PDone> writeToSql(
+  public static PTransform<PCollection<VersionedEntity>, PCollection<Void>> writeToSql(
       String transformId,
       int maxWriters,
       int batchSize,
       SerializableSupplier<JpaTransactionManager> jpaSupplier) {
-    return new PTransform<PCollection<VersionedEntity>, PDone>() {
+    return new PTransform<PCollection<VersionedEntity>, PCollection<Void>>() {
       @Override
-      public PDone expand(PCollection<VersionedEntity> input) {
-        input
+      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)));
-        return PDone.in(input.getPipeline());
       }
     };
   }
@@ -397,8 +403,10 @@ public final class Transforms {
     public void setup() {
       sleeper = new SystemSleeper();
 
-      ObjectifyService.initOfy();
-      ofy = ObjectifyService.ofy();
+      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
+        ObjectifyService.initOfy();
+        ofy = ObjectifyService.ofy();
+      }
 
       synchronized (SqlBatchWriter.class) {
         if (instanceCount == 0) {
@@ -429,7 +437,7 @@ public final class Transforms {
                 .map(Optional::get)
                 .map(ofy::toPojo)
                 .collect(ImmutableList.toImmutableList());
-        retry(() -> jpaTm().transact(() -> jpaTm().saveNewOrUpdateAll(ofyEntities)));
+        retry(() -> jpaTm().transact(() -> jpaTm().putAll(ofyEntities)));
       }
     }
 
@@ -444,7 +452,10 @@ public final class Transforms {
           runnable.run();
           return;
         } catch (Throwable throwable) {
-          throwIfNotCausedBy(throwable, OptimisticLockException.class);
+          if (!isFailedTxnRetriable(throwable)) {
+            throwIfUnchecked(throwable);
+            throw new RuntimeException(throwable);
+          }
           int sleepMillis = (1 << attempt) * initialDelayMillis;
           int jitter =
               ThreadLocalRandom.current().nextInt((int) (sleepMillis * jitterRatio))
@@ -453,21 +464,28 @@ public final class Transforms {
         }
       }
     }
+  }
 
-    /**
-     * Rethrows {@code throwable} if it is not (and does not have a cause of) {@code causeType};
-     * otherwise returns with no side effects.
-     */
-    private void throwIfNotCausedBy(Throwable throwable, Class<? extends Throwable> causeType) {
-      Throwable t = throwable;
-      while (t != null) {
-        if (causeType.isInstance(t)) {
-          return;
-        }
-        t = t.getCause();
-      }
-      Throwables.throwIfUnchecked(t);
-      throw new RuntimeException(t);
+  /**
+   * 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/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,9 +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'
-    AND disableInvoicing is not TRUE) ) 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/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;
@@ -81,24 +89,30 @@ public class Spec11Pipeline implements Serializable {
   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) {
     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;
   }
@@ -135,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,12 +192,40 @@ public class Spec11Pipeline implements Serializable {
       EvaluateSafeBrowsingFn evaluateSafeBrowsingFn,
       ValueProvider<String> dateProvider) {
 
+    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));
     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)))

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

@@ -21,7 +21,7 @@
 SELECT
   domain.fullyQualifiedDomainName AS domainName,
   domain.__key__.name AS domainRepoId,
-  registrar.clientId AS clientId,
+  registrar.clientId AS registrarId,
   COALESCE(registrar.emailAddress, '') AS registrarEmailAddress
 FROM ( (
     SELECT

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

@@ -0,0 +1,44 @@
+// 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.config;
+
+import com.google.common.collect.ImmutableSortedMap;
+import dagger.Module;
+import dagger.Provides;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.util.CertificateChecker;
+import google.registry.util.Clock;
+import javax.inject.Singleton;
+import org.joda.time.DateTime;
+
+/** Dagger module that provides the {@link CertificateChecker} used in the application. */
+// TODO(sarahbot@): Move this module to a better location. Possibly flows/. If we decide to move
+// CertificateChecker.java to core/ delete this file and inject the CertificateChecker constructor
+// instead.
+@Module
+public abstract class CertificateCheckerModule {
+
+  @Provides
+  @Singleton
+  static CertificateChecker provideCertificateChecker(
+      @Config("maxValidityDaysSchedule") ImmutableSortedMap<DateTime, Integer> validityDaysMap,
+      @Config("expirationWarningDays") int daysToExpiration,
+      @Config("minimumRsaKeyLength") int minimumRsaKeyLength,
+      Clock clock) {
+    return new CertificateChecker(validityDaysMap, daysToExpiration, minimumRsaKeyLength, clock);
+  }
+
+  private CertificateCheckerModule() {}
+}

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

@@ -16,9 +16,12 @@ package google.registry.config;
 
 import static com.google.common.base.Suppliers.memoize;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
 import static google.registry.config.ConfigUtils.makeUrl;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.ResourceUtils.readResourceUtf8;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.util.Comparator.naturalOrder;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Ascii;
@@ -27,6 +30,7 @@ import com.google.common.base.Strings;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedMap;
 import dagger.Module;
 import dagger.Provides;
 import google.registry.util.TaskQueueUtils;
@@ -46,6 +50,7 @@ import javax.inject.Qualifier;
 import javax.inject.Singleton;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
 import org.joda.time.Duration;
 
@@ -615,6 +620,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.
      *
@@ -1333,6 +1350,33 @@ public final class RegistryConfig {
     public static String provideRdapTosStaticUrl(RegistryConfigSettings config) {
       return config.registryPolicy.rdapTosStaticUrl;
     }
+
+    @Provides
+    @Config("maxValidityDaysSchedule")
+    public static ImmutableSortedMap<DateTime, Integer> provideValidityDaysMap(
+        RegistryConfigSettings config) {
+      return config.sslCertificateValidation.maxValidityDaysSchedule.entrySet().stream()
+          .collect(
+              toImmutableSortedMap(
+                  naturalOrder(),
+                  e ->
+                      e.getKey().equals("START_OF_TIME")
+                          ? START_OF_TIME
+                          : DateTime.parse(e.getKey()),
+                  e -> e.getValue()));
+    }
+
+    @Provides
+    @Config("expirationWarningDays")
+    public static int provideDaysToExpiration(RegistryConfigSettings config) {
+      return config.sslCertificateValidation.expirationWarningDays;
+    }
+
+    @Provides
+    @Config("minimumRsaKeyLength")
+    public static int provideMinimumRsaKeyLength(RegistryConfigSettings config) {
+      return config.sslCertificateValidation.minimumRsaKeyLength;
+    }
   }
 
   /** Returns the App Engine project ID, which is based off the environment name. */
@@ -1527,6 +1571,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

@@ -15,6 +15,7 @@
 package google.registry.config;
 
 import java.util.List;
+import java.util.Map;
 
 /** The POJO that YAML config files are deserialized into. */
 public class RegistryConfigSettings {
@@ -38,6 +39,7 @@ public class RegistryConfigSettings {
   public Beam beam;
   public Keyring keyring;
   public RegistryTool registryTool;
+  public SslCertificateValidation sslCertificateValidation;
 
   /** Configuration options that apply to the entire App Engine project. */
   public static class AppEngine {
@@ -122,10 +124,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;
   }
 
@@ -216,4 +220,11 @@ public class RegistryConfigSettings {
     public String clientSecret;
     public String username;
   }
+
+  /** Configuration for the certificate checker. */
+  public static class SslCertificateValidation {
+    public Map<String, Integer> maxValidityDaysSchedule;
+    public int expirationWarningDays;
+    public int minimumRsaKeyLength;
+  }
 }

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

@@ -230,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.
@@ -416,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:
@@ -440,3 +446,17 @@ registryTool:
   # OAuth client secret used by the tool.
   clientSecret: YOUR_CLIENT_SECRET
   username: toolusername
+
+# Configuration options for checking SSL certificates.
+sslCertificateValidation:
+  # A map specifying the maximum amount of days the certificate can be valid.
+  # The entry key is the date closest before the date the certificate was issued
+  # and the entry value is the applicable maximum validity days for that certificate.
+  maxValidityDaysSchedule:
+    "START_OF_TIME": 825
+    "2020-09-01T00:00:00Z": 398
+  # The number of days before a certificate expires that indicates the
+  # certificate is nearing expiration and warnings should be sent.
+  expirationWarningDays: 30
+  # The minimum number of bits an RSA key must contain
+  minimumRsaKeyLength: 2048

core/src/main/java/google/registry/documentation/FlowDocumentation.java

@@ -1,275 +0,0 @@
-// Copyright 2017 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.documentation;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.MoreCollectors.onlyElement;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Multimaps;
-import com.sun.javadoc.AnnotationDesc;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.FieldDoc;
-import com.sun.javadoc.SeeTag;
-import com.sun.javadoc.Tag;
-import google.registry.model.eppoutput.Result.Code;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.TreeMap;
-import java.util.stream.Stream;
-import javax.annotation.Nullable;
-
-/**
- * Class to represent documentation information for a single EPP flow.
- *
- * <p>The static method getFlowDocs() on this class returns a list of FlowDocumentation
- * instances corresponding to the leaf flows in the flows package, constructing the instances
- * from class information returned from the javadoc system.  Each instance has methods for
- * retrieving relevant information about the flow, such as a description, error conditions, etc.
- */
-public class FlowDocumentation {
-
-  /** Constants for names of various relevant packages and classes. */
-  static final String FLOW_PACKAGE_NAME = "google.registry.flows";
-  static final String BASE_FLOW_CLASS_NAME = FLOW_PACKAGE_NAME + ".Flow";
-  static final String EXCEPTION_CLASS_NAME = FLOW_PACKAGE_NAME + ".EppException";
-  static final String CODE_ANNOTATION_NAME = EXCEPTION_CLASS_NAME + ".EppResultCode";
-
-  /** Name of the class for this flow. */
-  private final String name;
-
-  /** Fully qualified name of the class for this flow. */
-  private final String qualifiedName;
-
-  /** Name of the package in which this flow resides. */
-  private final String packageName;
-
-  /** Class docs for the flow. */
-  private final String classDocs;
-
-  /** Javadoc-tagged error conditions for this flow in list form. */
-  private final List<ErrorCase> errors;
-
-  /** Javadoc-tagged error conditions for this flow, organized by underlying error code. */
-  private final ListMultimap<Long, ErrorCase> errorsByCode;
-
-  /**
-   * Creates a FlowDocumentation for this flow class using data from javadoc tags.  Not public
-   * because clients should get FlowDocumentation objects via the DocumentationGenerator class.
-   */
-  protected FlowDocumentation(ClassDoc flowDoc) {
-    name = flowDoc.name();
-    qualifiedName = flowDoc.qualifiedName();
-    packageName = flowDoc.containingPackage().name();
-    classDocs = flowDoc.commentText();
-    errors = new ArrayList<>();
-    // Store error codes in sorted order, and leave reasons in insert order.
-    errorsByCode =
-        Multimaps.newListMultimap(new TreeMap<Long, Collection<ErrorCase>>(), ArrayList::new);
-    parseTags(flowDoc);
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public String getQualifiedName() {
-    return qualifiedName;
-  }
-
-  public String getPackageName() {
-    return packageName;
-  }
-
-  public String getClassDocs() {
-    return classDocs;
-  }
-
-  public ImmutableList<ErrorCase> getErrors() {
-    return ImmutableList.copyOf(errors);
-  }
-
-  public ImmutableMultimap<Long, ErrorCase> getErrorsByCode() {
-    return ImmutableMultimap.copyOf(errorsByCode);
-  }
-
-  /** Iterates through javadoc tags on the underlying class and calls specific parsing methods. */
-  private void parseTags(ClassDoc flowDoc) {
-    for (Tag tag : flowDoc.tags()) {
-      // Everything else is not a relevant tag.
-      if ("@error".equals(tag.name())) {
-        parseErrorTag(tag);
-      }
-    }
-  }
-
-  /** Exception to throw when an @error tag cannot be parsed correctly. */
-  private static class BadErrorTagFormatException extends IllegalStateException {
-    /** Makes a message to use as a prefix for the reason passed up to the superclass. */
-    private static String makeMessage(String reason, Tag tag) {
-      return String.format("Bad @error tag format at %s - %s", tag.position(), reason);
-    }
-
-    private BadErrorTagFormatException(String reason, Tag tag) {
-      super(makeMessage(reason, tag));
-    }
-
-    private BadErrorTagFormatException(String reason, Tag tag, Exception cause) {
-      super(makeMessage(reason, tag), cause);
-    }
-  }
-
-  /** Parses a javadoc tag corresponding to an error case and updates the error mapping. */
-  private void parseErrorTag(Tag tag) {
-    // Parse the @error tag text to find the @link inline tag.
-    SeeTag linkedTag;
-    try {
-      linkedTag =
-          Stream.of(tag.inlineTags())
-              .filter(SeeTag.class::isInstance)
-              .map(SeeTag.class::cast)
-              .collect(onlyElement());
-    } catch (NoSuchElementException | IllegalArgumentException e) {
-      throw new BadErrorTagFormatException(
-          String.format("expected one @link tag in tag text but found %s: %s",
-              (e instanceof NoSuchElementException ? "none" : "multiple"),
-              tag.text()),
-          tag, e);
-    }
-    // Check to see if the @link tag references a valid class.
-    ClassDoc exceptionRef = linkedTag.referencedClass();
-    if (exceptionRef == null) {
-      throw new BadErrorTagFormatException(
-          "could not resolve class from @link tag text: " + linkedTag.text(),
-          tag);
-    }
-    // Try to convert the referenced class into an ErrorCase; fail if it's not an EppException.
-    ErrorCase error;
-    try {
-      error = new ErrorCase(exceptionRef);
-    } catch (IllegalStateException | IllegalArgumentException e) {
-      throw new BadErrorTagFormatException(
-          "class referenced in @link is not a valid EppException: " + exceptionRef.qualifiedName(),
-          tag, e);
-    }
-    // Success; store this as a parsed error case.
-    errors.add(error);
-    errorsByCode.put(error.getCode(), error);
-  }
-
-  /**
-   * Represents an error case for a flow, with a reason for the error and the EPP error code.
-   *
-   * <p>This class is an immutable wrapper for the name of an EppException subclass that gets
-   * thrown to indicate an error condition.  It overrides equals() and hashCode() so that
-   * instances of this class can be used in collections in the normal fashion.
-   */
-  public static class ErrorCase {
-
-    /** The non-qualified name of the exception class. */
-    private final String name;
-
-    /** The fully-qualified name of the exception class. */
-    private final String className;
-
-    /** The reason this error was thrown, normally documented on the low-level exception class. */
-    private final String reason;
-
-    /** The EPP error code value corresponding to this error condition. */
-    private final long errorCode;
-
-    /** Constructs an ErrorCase from the corresponding class for a low-level flow exception. */
-    protected ErrorCase(ClassDoc exceptionDoc) {
-      name = exceptionDoc.name();
-      className = exceptionDoc.qualifiedName();
-      // The javadoc comment on the class explains the reason for the error condition.
-      reason = exceptionDoc.commentText();
-      ClassDoc highLevelExceptionDoc = getHighLevelExceptionFrom(exceptionDoc);
-      errorCode = extractErrorCode(highLevelExceptionDoc);
-      checkArgument(!exceptionDoc.isAbstract(),
-          "Cannot use an abstract subclass of EppException as an error case");
-    }
-
-    public String getName() {
-      return name;
-    }
-
-    protected String getClassName() {
-      return className;
-    }
-
-    public String getReason() {
-      return reason;
-    }
-
-    public long getCode() {
-      return errorCode;
-    }
-
-    /** Returns the direct subclass of EppException that this class is a subclass of (or is). */
-    private ClassDoc getHighLevelExceptionFrom(ClassDoc exceptionDoc) {
-      // While we're not yet at the root, move up the class hierarchy looking for EppException.
-      while (exceptionDoc.superclass() != null) {
-        if (exceptionDoc.superclass().qualifiedTypeName().equals(EXCEPTION_CLASS_NAME)) {
-          return exceptionDoc;
-        }
-        exceptionDoc = exceptionDoc.superclass();
-      }
-      // Failure; we reached the root without finding a subclass of EppException.
-      throw new IllegalArgumentException(
-          String.format("Class referenced is not a subclass of %s", EXCEPTION_CLASS_NAME));
-    }
-
-    /** Returns the corresponding EPP error code for an annotated subclass of EppException. */
-    private long extractErrorCode(ClassDoc exceptionDoc) {
-      try {
-        // We're looking for a specific annotation by name that should appear only once.
-        AnnotationDesc errorCodeAnnotation =
-            Arrays.stream(exceptionDoc.annotations())
-                .filter(
-                    anno -> anno.annotationType().qualifiedTypeName().equals(CODE_ANNOTATION_NAME))
-                .findFirst()
-                .get();
-        // The annotation should have one element whose value converts to an EppResult.Code.
-        AnnotationDesc.ElementValuePair pair = errorCodeAnnotation.elementValues()[0];
-        String enumConstant = ((FieldDoc) pair.value().value()).name();
-        return Code.valueOf(enumConstant).code;
-      } catch (IllegalStateException e) {
-        throw new IllegalStateException(
-            "No error code annotation found on exception " + exceptionDoc.name(), e);
-      } catch (ArrayIndexOutOfBoundsException | ClassCastException | IllegalArgumentException e) {
-        throw new IllegalStateException("Bad annotation on exception " + exceptionDoc.name(), e);
-      }
-    }
-
-    @Override
-    public boolean equals(@Nullable Object object) {
-      // The className field canonically identifies the EppException wrapped by this class, and
-      // all other instance state is derived from that exception, so we only check className.
-      return object instanceof ErrorCase && this.className.equals(((ErrorCase) object).className);
-    }
-
-    @Override
-    public int hashCode() {
-      // See note for equals() - only className is needed for comparisons.
-      return className.hashCode();
-    }
-  }
-}

core/src/main/java/google/registry/documentation/JavadocWrapper.java

@@ -1,159 +0,0 @@
-// Copyright 2017 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.documentation;
-
-import static google.registry.util.BuildPathUtils.getProjectRoot;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.flogger.FluentLogger;
-import com.google.common.io.CharStreams;
-import com.sun.javadoc.RootDoc;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javadoc.JavadocTool;
-import com.sun.tools.javadoc.Messager;
-import com.sun.tools.javadoc.ModifierFilter;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import javax.annotation.Nullable;
-import javax.tools.StandardLocation;
-
-/**
- * Wrapper class to simplify calls to the javadoc system and hide internal details.  An instance
- * represents a set of parameters for calling out to javadoc; these parameters can be set via
- * the appropriate methods, and determine what files and packages javadoc will process.  The
- * actual running of javadoc occurs when calling getRootDoc() to retrieve a javadoc RootDoc.
- */
-public final class JavadocWrapper {
-
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
-  /** Shows any member visible at at least the default (package) level. */
-  private static final long VISIBILITY_MASK =
-      Modifier.PUBLIC | Modifier.PROTECTED | ModifierFilter.PACKAGE;
-
-  /** Root directory for source files. If null, will use the current directory. */
-  private static final String SOURCE_PATH = getProjectRoot().resolve("core/src/main/java")
-      .toString();
-  /** Specific source files to generate documentation for. */
-  private static final ImmutableSet<String> SOURCE_FILE_NAMES = ImmutableSet.of();
-
-  /** Specific packages to generate documentation for. */
-  private static final ImmutableSet<String> SOURCE_PACKAGE_NAMES =
-      ImmutableSet.of(FlowDocumentation.FLOW_PACKAGE_NAME);
-
-  /** Whether or not the Javadoc tool should eschew excessive log output. */
-  private static final boolean QUIET = true;
-
-  /**
-   * Obtains a Javadoc {@link RootDoc} object containing raw Javadoc documentation.
-   * Wraps a call to the static method createRootDoc() and passes in instance-specific settings.
-   */
-  public static RootDoc getRootDoc() throws IOException {
-    logger.atInfo().log("Starting Javadoc tool");
-    File sourceFilePath = new File(SOURCE_PATH);
-    logger.atInfo().log("Using source directory: %s", sourceFilePath.getAbsolutePath());
-    try {
-      return createRootDoc(
-          SOURCE_PATH,
-          SOURCE_PACKAGE_NAMES,
-          SOURCE_FILE_NAMES,
-          VISIBILITY_MASK,
-          QUIET);
-    } finally {
-      logger.atInfo().log("Javadoc tool finished");
-    }
-  }
-
-  /**
-   * Obtains a Javadoc root document object for the specified source path and package/Java names.
-   * If the source path is null, then the working directory is assumed as the source path.
-   *
-   * <p>If a list of package names is provided, then Javadoc will run on these packages and all
-   * their subpackages, based out of the specified source path.
-   *
-   * <p>If a list of file names is provided, then Javadoc will also run on these Java source files.
-   * The specified source path is not considered in this case.
-   *
-   * @see <a href="http://relation.to/12969.lace">Testing Java doclets</a>
-   * @see <a href="http://www.docjar.com/docs/api/com/sun/tools/javadoc/JavadocTool.html">JavadocTool</a>
-   */
-  private static RootDoc createRootDoc(
-      @Nullable String sourcePath,
-      Collection<String> packageNames,
-      Collection<String> fileNames,
-      long visibilityMask,
-      boolean quiet) throws IOException {
-    // Create a context to hold settings for Javadoc.
-    Context context = new Context();
-
-    // Redirect Javadoc stdout/stderr to null writers, since otherwise the Java compiler
-    // issues lots of errors for classes that are imported and visible to blaze but not
-    // visible locally to the compiler.
-    // TODO(b/19124943): Find a way to ignore those errors so we can show real ones?
-    Messager.preRegister(
-        context,
-        JavadocWrapper.class.getName(),
-        new PrintWriter(CharStreams.nullWriter()),     // For errors.
-        new PrintWriter(CharStreams.nullWriter()),     // For warnings.
-        new PrintWriter(CharStreams.nullWriter()));    // For notices.
-
-    // Set source path option for Javadoc.
-    try (JavacFileManager fileManager = new JavacFileManager(context, true, UTF_8)) {
-      List<File> sourcePathFiles = new ArrayList<>();
-      if (sourcePath != null) {
-        for (String sourcePathEntry : Splitter.on(':').split(sourcePath)) {
-          sourcePathFiles.add(new File(sourcePathEntry));
-        }
-      }
-      fileManager.setLocation(StandardLocation.SOURCE_PATH, sourcePathFiles);
-
-      // Create an instance of Javadoc.
-      JavadocTool javadocTool = JavadocTool.make0(context);
-
-      // Convert the package and file lists to a format Javadoc can understand.
-      ListBuffer<String> subPackages = new ListBuffer<>();
-      subPackages.addAll(packageNames);
-      ListBuffer<String> javaNames = new ListBuffer<>();
-      javaNames.addAll(fileNames);
-
-      // Invoke Javadoc and ask it for a RootDoc containing the specified packages.
-      return javadocTool.getRootDocImpl(
-          Locale.US.toString(),                    // Javadoc comment locale
-          UTF_8.name(),                            // Source character encoding
-          new ModifierFilter(visibilityMask),      // Element visibility filter
-          javaNames.toList(),                      // Included Java file names
-          com.sun.tools.javac.util.List.nil(),     // Doclet options
-          com.sun.tools.javac.util.List.nil(),     // Source files
-          false,                                   // Don't use BreakIterator
-          subPackages.toList(),                    // Included sub-package names
-          com.sun.tools.javac.util.List.nil(),     // Excluded package names
-          false,                                   // Read source files, not classes
-          false,                                   // Don't run legacy doclet
-          quiet);                                  // If asked, run Javadoc quietly
-    }
-  }
-
-  private JavadocWrapper() {}
-}

core/src/main/java/google/registry/documentation/generate_javadoc.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-# Copyright 2017 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.
-
-
-# Generate javadoc for the project
-
-if (( $# != 3 )); then
-  echo "Usage: $0 JAVADOC ZIP OUT" 1>&2
-  exit 1
-fi
-
-JAVADOC_BINARY="$1"
-ZIP_BINARY="$2"
-TARGETFILE="$3"
-TMPDIR="$(mktemp -d "${TMPDIR:-/tmp}/generate_javadoc.XXXXXXXX")"
-PWDDIR="$(pwd)"
-
-"${JAVADOC_BINARY}" -d "${TMPDIR}" \
-  $(find java -name \*.java) \
-  -tag error:t:'EPP Errors' \
-  -subpackages google.registry \
-  -exclude google.registry.dns:google.registry.proxy:google.registry.monitoring.blackbox
-cd "${TMPDIR}"
-"${PWDDIR}/${ZIP_BINARY}" -rXoq "${PWDDIR}/${TARGETFILE}" .
-cd -
-rm -rf "${TMPDIR}"

core/src/main/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml

@@ -25,6 +25,11 @@
     <property name="tld" direction="asc"/>
     <property name="creationTime" direction="desc"/>
   </datastore-index>
+  <!-- For finding non-autorenewing domains to be deleted. -->
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="autorenewEndTime" direction="asc"/>
+    <property name="deletionTime" direction="asc"/>
+  </datastore-index>
   <!-- For finding host resources by registrar. -->
   <datastore-index kind="HostResource" ancestor="false" source="manual">
     <property name="currentSponsorClientId" direction="asc"/>

core/src/main/java/google/registry/flows/ResourceFlowUtils.java

@@ -42,6 +42,7 @@ import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.EppResource.ResourceWithTransferData;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.DomainContent;
 import google.registry.model.domain.Period;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.eppcommon.AuthInfo;
@@ -255,7 +256,7 @@ public final class ResourceFlowUtils {
    * @param domain is the domain already projected at approvalTime
    */
   public static DateTime computeExDateForApprovalTime(
-      DomainBase domain, DateTime approvalTime, Period period) {
+      DomainContent domain, DateTime approvalTime, Period period) {
     boolean inAutoRenew = domain.getGracePeriodStatuses().contains(GracePeriodStatus.AUTO_RENEW);
     // inAutoRenew is set to false if the period is zero because a zero-period transfer should not
     // subsume an autorenew.

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -347,8 +347,8 @@ public class DomainCreateFlow implements TransactionalFlow {
             .setRepoId(repoId)
             .setIdnTableName(validateDomainNameWithIdnTables(domainName))
             .setRegistrationExpirationTime(registrationExpirationTime)
-            .setAutorenewBillingEvent(Key.create(autorenewBillingEvent))
-            .setAutorenewPollMessage(Key.create(autorenewPollMessage))
+            .setAutorenewBillingEvent(autorenewBillingEvent.createVKey())
+            .setAutorenewPollMessage(autorenewPollMessage.createVKey())
             .setLaunchNotice(hasClaimsNotice ? launchCreate.get().getNotice() : null)
             .setSmdId(signedMarkId)
             .setDsData(secDnsCreate.isPresent() ? secDnsCreate.get().getDsData() : null)
@@ -360,7 +360,8 @@ public class DomainCreateFlow implements TransactionalFlow {
                     command.getNameservers().stream().collect(toImmutableSet()))
             .setStatusValues(statuses.build())
             .setContacts(command.getContacts())
-            .addGracePeriod(GracePeriod.forBillingEvent(GracePeriodStatus.ADD, createBillingEvent))
+            .addGracePeriod(
+                GracePeriod.forBillingEvent(GracePeriodStatus.ADD, repoId, createBillingEvent))
             .build();
     entitiesToSave.add(
         newDomain,
@@ -369,7 +370,8 @@ public class DomainCreateFlow implements TransactionalFlow {
     if (allocationToken.isPresent()
         && TokenType.SINGLE_USE.equals(allocationToken.get().getTokenType())) {
       entitiesToSave.add(
-          allocationTokenFlowUtils.redeemToken(allocationToken.get(), Key.create(historyEntry)));
+          allocationTokenFlowUtils.redeemToken(
+              allocationToken.get(), HistoryEntry.createVKey(Key.create(historyEntry))));
     }
     enqueueTasks(newDomain, hasSignedMarks, hasClaimsNotice);
 

core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java

@@ -31,7 +31,6 @@ import static google.registry.model.ResourceTransferUtils.handlePendingTransferO
 import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_ACTION_PENDING;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.ADD_FIELDS;
 import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.RENEW_FIELDS;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -187,14 +186,18 @@ public final class DomainDeleteFlow implements TransactionalFlow {
       DateTime redemptionTime = now.plus(redemptionGracePeriodLength);
       asyncTaskEnqueuer.enqueueAsyncResave(
           existingDomain, now, ImmutableSortedSet.of(redemptionTime, deletionTime));
-      builder.setDeletionTime(deletionTime)
+      builder
+          .setDeletionTime(deletionTime)
           .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
           // Clear out all old grace periods and add REDEMPTION, which does not include a key to a
           // billing event because there isn't one for a domain delete.
-          .setGracePeriods(ImmutableSet.of(GracePeriod.createWithoutBillingEvent(
-              GracePeriodStatus.REDEMPTION,
-              redemptionTime,
-              clientId)));
+          .setGracePeriods(
+              ImmutableSet.of(
+                  GracePeriod.createWithoutBillingEvent(
+                      GracePeriodStatus.REDEMPTION,
+                      existingDomain.getRepoId(),
+                      redemptionTime,
+                      clientId)));
       // Note: The expiration time is unchanged, so if it's before the new deletion time, there will
       // be a "phantom autorenew" where the expiration time advances. No poll message will be
       // produced (since we are ending the autorenew recurrences at "now" below) and the billing
@@ -209,7 +212,7 @@ public final class DomainDeleteFlow implements TransactionalFlow {
       PollMessage.OneTime deletePollMessage =
           createDeletePollMessage(existingDomain, historyEntry, deletionTime);
       entitiesToSave.add(deletePollMessage);
-      builder.setDeletePollMessage(Key.create(deletePollMessage));
+      builder.setDeletePollMessage(deletePollMessage.createVKey());
     }
 
     // Cancel any grace periods that were still active, and set the expiration time accordingly.
@@ -222,8 +225,7 @@ public final class DomainDeleteFlow implements TransactionalFlow {
         if (gracePeriod.getOneTimeBillingEvent() != null) {
           // Take the amount of amount of registration time being refunded off the expiration time.
           // This can be either add grace periods or renew grace periods.
-          BillingEvent.OneTime oneTime =
-              ofy().load().key(gracePeriod.getOneTimeBillingEvent()).now();
+          BillingEvent.OneTime oneTime = tm().load(gracePeriod.getOneTimeBillingEvent());
           newExpirationTime = newExpirationTime.minusYears(oneTime.getPeriodYears());
         } else if (gracePeriod.getRecurringBillingEvent() != null) {
           // Take 1 year off the registration if in the autorenew grace period (no need to load the
@@ -370,12 +372,12 @@ public final class DomainDeleteFlow implements TransactionalFlow {
   private Money getGracePeriodCost(GracePeriod gracePeriod, DateTime now) {
     if (gracePeriod.getType() == GracePeriodStatus.AUTO_RENEW) {
       DateTime autoRenewTime =
-          ofy().load().key(checkNotNull(gracePeriod.getRecurringBillingEvent())).now()
+          tm().load(checkNotNull(gracePeriod.getRecurringBillingEvent()))
               .getRecurrenceTimeOfYear()
-                  .getLastInstanceBeforeOrAt(now);
+              .getLastInstanceBeforeOrAt(now);
       return getDomainRenewCost(targetId, autoRenewTime, 1);
     }
-    return ofy().load().key(checkNotNull(gracePeriod.getOneTimeBillingEvent())).now().getCost();
+    return tm().load(checkNotNull(gracePeriod.getOneTimeBillingEvent())).getCost();
   }
 
   @Nullable

core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java

@@ -517,14 +517,14 @@ public class DomainFlowUtils {
    */
   public static void updateAutorenewRecurrenceEndTime(DomainBase domain, DateTime newEndTime) {
     Optional<PollMessage.Autorenew> autorenewPollMessage =
-        Optional.ofNullable(ofy().load().key(domain.getAutorenewPollMessage()).now());
+        tm().maybeLoad(domain.getAutorenewPollMessage());
 
     // Construct an updated autorenew poll message. If the autorenew poll message no longer exists,
     // create a new one at the same id. This can happen if a transfer was requested on a domain
     // where all autorenew poll messages had already been delivered (this would cause the poll
     // message to be deleted), and then subsequently the transfer was canceled, rejected, or deleted
     // (which would cause the poll message to be recreated here).
-    Key<PollMessage.Autorenew> existingAutorenewKey = domain.getAutorenewPollMessage();
+    Key<PollMessage.Autorenew> existingAutorenewKey = domain.getAutorenewPollMessage().getOfyKey();
     PollMessage.Autorenew updatedAutorenewPollMessage =
         autorenewPollMessage.isPresent()
             ? autorenewPollMessage.get().asBuilder().setAutorenewEndTime(newEndTime).build()
@@ -542,7 +542,7 @@ public class DomainFlowUtils {
       ofy().save().entity(updatedAutorenewPollMessage);
     }
 
-    Recurring recurring = ofy().load().key(domain.getAutorenewBillingEvent()).now();
+    Recurring recurring = tm().load(domain.getAutorenewBillingEvent());
     ofy().save().entity(recurring.asBuilder().setRecurrenceEndTime(newEndTime).build());
   }
 

core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java

@@ -60,7 +60,7 @@ public final class DomainPricingLogic {
    * <p>If {@code allocationToken} is present and the domain is non-premium, that discount will be
    * applied to the first year.
    */
-  public FeesAndCredits getCreatePrice(
+  FeesAndCredits getCreatePrice(
       Registry registry,
       String domainName,
       DateTime dateTime,
@@ -104,8 +104,8 @@ public final class DomainPricingLogic {
 
   /** Returns a new renew price for the pricer. */
   @SuppressWarnings("unused")
-  public FeesAndCredits getRenewPrice(
-      Registry registry, String domainName, DateTime dateTime, int years) throws EppException {
+  FeesAndCredits getRenewPrice(Registry registry, String domainName, DateTime dateTime, int years)
+      throws EppException {
     DomainPrices domainPrices = getPricesForDomainName(domainName, dateTime);
     BigDecimal renewCost = domainPrices.getRenewCost().multipliedBy(years).getAmount();
     return customLogic.customizeRenewPrice(
@@ -123,7 +123,7 @@ public final class DomainPricingLogic {
   }
 
   /** Returns a new restore price for the pricer. */
-  public FeesAndCredits getRestorePrice(
+  FeesAndCredits getRestorePrice(
       Registry registry, String domainName, DateTime dateTime, boolean isExpired)
       throws EppException {
     DomainPrices domainPrices = getPricesForDomainName(domainName, dateTime);
@@ -147,7 +147,7 @@ public final class DomainPricingLogic {
   }
 
   /** Returns a new transfer price for the pricer. */
-  public FeesAndCredits getTransferPrice(Registry registry, String domainName, DateTime dateTime)
+  FeesAndCredits getTransferPrice(Registry registry, String domainName, DateTime dateTime)
       throws EppException {
     DomainPrices domainPrices = getPricesForDomainName(domainName, dateTime);
     return customLogic.customizeTransferPrice(
@@ -168,7 +168,7 @@ public final class DomainPricingLogic {
   }
 
   /** Returns a new update price for the pricer. */
-  public FeesAndCredits getUpdatePrice(Registry registry, String domainName, DateTime dateTime)
+  FeesAndCredits getUpdatePrice(Registry registry, String domainName, DateTime dateTime)
       throws EppException {
     CurrencyUnit currency = registry.getCurrency();
     BaseFee feeOrCredit = Fee.create(zeroInCurrency(currency), FeeType.UPDATE, false);
@@ -191,16 +191,20 @@ public final class DomainPricingLogic {
       throws EppException {
     if (allocationToken.isPresent()
         && allocationToken.get().getDiscountFraction() != 0.0
-        && domainPrices.isPremium()) {
+        && domainPrices.isPremium()
+        && !allocationToken.get().shouldDiscountPremiums()) {
       throw new AllocationTokenInvalidForPremiumNameException();
     }
     Money oneYearCreateCost = domainPrices.getCreateCost();
     Money totalDomainCreateCost = oneYearCreateCost.multipliedBy(years);
-    // If a discount is applicable, apply it only to the first year
+
+    // Apply the allocation token discount, if applicable.
     if (allocationToken.isPresent()) {
+      int discountedYears = Math.min(years, allocationToken.get().getDiscountYears());
       Money discount =
           oneYearCreateCost.multipliedBy(
-              allocationToken.get().getDiscountFraction(), RoundingMode.HALF_UP);
+              discountedYears * allocationToken.get().getDiscountFraction(),
+              RoundingMode.HALF_EVEN);
       totalDomainCreateCost = totalDomainCreateCost.minus(discount);
     }
     return totalDomainCreateCost;
@@ -209,7 +213,7 @@ public final class DomainPricingLogic {
   /** An allocation token was provided that is invalid for premium domains. */
   public static class AllocationTokenInvalidForPremiumNameException
       extends CommandUseErrorException {
-    public AllocationTokenInvalidForPremiumNameException() {
+    AllocationTokenInvalidForPremiumNameException() {
       super("A nonzero discount code cannot be applied to premium domains");
     }
   }

core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java

@@ -33,7 +33,6 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.ParameterValueRangeErrorException;
 import google.registry.flows.ExtensionManager;
@@ -181,10 +180,11 @@ public final class DomainRenewFlow implements TransactionalFlow {
             .setLastEppUpdateTime(now)
             .setLastEppUpdateClientId(clientId)
             .setRegistrationExpirationTime(newExpirationTime)
-            .setAutorenewBillingEvent(Key.create(newAutorenewEvent))
-            .setAutorenewPollMessage(Key.create(newAutorenewPollMessage))
+            .setAutorenewBillingEvent(newAutorenewEvent.createVKey())
+            .setAutorenewPollMessage(newAutorenewPollMessage.createVKey())
             .addGracePeriod(
-                GracePeriod.forBillingEvent(GracePeriodStatus.RENEW, explicitRenewEvent))
+                GracePeriod.forBillingEvent(
+                    GracePeriodStatus.RENEW, existingDomain.getRepoId(), explicitRenewEvent))
             .build();
     EntityChanges entityChanges =
         flowCustomLogic.beforeSave(

core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java

@@ -26,7 +26,6 @@ import static google.registry.flows.domain.DomainFlowUtils.verifyNotReserved;
 import static google.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked;
 import static google.registry.flows.domain.DomainFlowUtils.verifyRegistrarIsActive;
 import static google.registry.model.ResourceTransferUtils.updateForeignKeyIndexDeletionTime;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
 
@@ -174,8 +173,8 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow  {
             existingDomain, newExpirationTime, autorenewEvent, autorenewPollMessage, now, clientId);
     updateForeignKeyIndexDeletionTime(newDomain);
     entitiesToSave.add(newDomain, historyEntry, autorenewEvent, autorenewPollMessage);
-    ofy().save().entities(entitiesToSave.build());
-    ofy().delete().key(existingDomain.getDeletePollMessage());
+    tm().putAll(entitiesToSave.build());
+    tm().delete(existingDomain.getDeletePollMessage());
     dnsQueue.addDomainRefreshTask(existingDomain.getDomainName());
     return responseBuilder
         .setExtensions(createResponseExtensions(feesAndCredits, feeUpdate, isExpired))
@@ -232,8 +231,8 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow  {
         .setStatusValues(null)
         .setGracePeriods(null)
         .setDeletePollMessage(null)
-        .setAutorenewBillingEvent(Key.create(autorenewEvent))
-        .setAutorenewPollMessage(Key.create(autorenewPollMessage))
+        .setAutorenewBillingEvent(autorenewEvent.createVKey())
+        .setAutorenewPollMessage(autorenewPollMessage.createVKey())
         .setLastEppUpdateTime(now)
         .setLastEppUpdateClientId(clientId)
         .build();

core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java

@@ -186,13 +186,16 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
                     .setTransferredRegistrationExpirationTime(newExpirationTime)
                     .build())
             .setRegistrationExpirationTime(newExpirationTime)
-            .setAutorenewBillingEvent(Key.create(autorenewEvent))
-            .setAutorenewPollMessage(Key.create(gainingClientAutorenewPollMessage))
+            .setAutorenewBillingEvent(autorenewEvent.createVKey())
+            .setAutorenewPollMessage(gainingClientAutorenewPollMessage.createVKey())
             // Remove all the old grace periods and add a new one for the transfer.
             .setGracePeriods(
                 billingEvent.isPresent()
                     ? ImmutableSet.of(
-                        GracePeriod.forBillingEvent(GracePeriodStatus.TRANSFER, billingEvent.get()))
+                        GracePeriod.forBillingEvent(
+                            GracePeriodStatus.TRANSFER,
+                            existingDomain.getRepoId(),
+                            billingEvent.get()))
                     : ImmutableSet.of())
             .setLastEppUpdateTime(now)
             .setLastEppUpdateClientId(clientId)

core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java

@@ -67,7 +67,9 @@ import google.registry.model.domain.DomainCommand.Update.AddRemove;
 import google.registry.model.domain.DomainCommand.Update.Change;
 import google.registry.model.domain.fee.FeeUpdateCommandExtension;
 import google.registry.model.domain.metadata.MetadataExtension;
+import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
+import google.registry.model.domain.superuser.DomainUpdateSuperuserExtension;
 import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppinput.EppInput;
@@ -152,7 +154,8 @@ public final class DomainUpdateFlow implements TransactionalFlow {
     extensionManager.register(
         FeeUpdateCommandExtension.class,
         MetadataExtension.class,
-        SecDnsUpdateExtension.class);
+        SecDnsUpdateExtension.class,
+        DomainUpdateSuperuserExtension.class);
     flowCustomLogic.beforeValidation();
     extensionManager.validate();
     validateClientIsLoggedIn(clientId);
@@ -236,10 +239,16 @@ public final class DomainUpdateFlow implements TransactionalFlow {
     DomainBase.Builder domainBuilder =
         domain
             .asBuilder()
-            // Handle the secDNS extension.
+            // Handle the secDNS extension. As dsData in secDnsUpdate is read from EPP input and
+            // does not have domainRepoId set, we create a copy of the existing dsData without
+            // domainRepoId for comparison.
             .setDsData(
                 secDnsUpdate.isPresent()
-                    ? updateDsData(domain.getDsData(), secDnsUpdate.get())
+                    ? updateDsData(
+                        domain.getDsData().stream()
+                            .map(DelegationSignerData::cloneWithoutDomainRepoId)
+                            .collect(toImmutableSet()),
+                        secDnsUpdate.get())
                     : domain.getDsData())
             .setLastEppUpdateTime(now)
             .setLastEppUpdateClientId(clientId)
@@ -251,6 +260,15 @@ public final class DomainUpdateFlow implements TransactionalFlow {
             .removeContacts(remove.getContacts())
             .setRegistrant(firstNonNull(change.getRegistrant(), domain.getRegistrant()))
             .setAuthInfo(firstNonNull(change.getAuthInfo(), domain.getAuthInfo()));
+    Optional<DomainUpdateSuperuserExtension> superuserExt =
+        eppInput.getSingleExtension(DomainUpdateSuperuserExtension.class);
+    if (superuserExt.isPresent()) {
+      if (superuserExt.get().getAutorenews().isPresent()) {
+        boolean autorenews = superuserExt.get().getAutorenews().get();
+        domainBuilder.setAutorenewEndTime(
+            Optional.ofNullable(autorenews ? null : domain.getRegistrationExpirationTime()));
+      }
+    }
     return domainBuilder.build();
   }
 

core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java

@@ -33,6 +33,7 @@ import google.registry.model.domain.token.AllocationToken.TokenStatus;
 import google.registry.model.domain.token.AllocationToken.TokenType;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.VKey;
 import java.util.List;
 import java.util.Optional;
 import javax.inject.Inject;
@@ -107,7 +108,7 @@ public class AllocationTokenFlowUtils {
 
   /** Redeems a SINGLE_USE {@link AllocationToken}, returning the redeemed copy. */
   public AllocationToken redeemToken(
-      AllocationToken token, Key<HistoryEntry> redemptionHistoryEntry) {
+      AllocationToken token, VKey<HistoryEntry> redemptionHistoryEntry) {
     checkArgument(
         TokenType.SINGLE_USE.equals(token.getTokenType()),
         "Only SINGLE_USE tokens can be marked as redeemed");
@@ -124,7 +125,8 @@ public class AllocationTokenFlowUtils {
   private void validateToken(
       InternetDomainName domainName, AllocationToken token, String clientId, DateTime now)
       throws EppException {
-    if (!token.getAllowedClientIds().isEmpty() && !token.getAllowedClientIds().contains(clientId)) {
+    if (!token.getAllowedRegistrarIds().isEmpty()
+        && !token.getAllowedRegistrarIds().contains(clientId)) {
       throw new AllocationTokenNotValidForRegistrarException();
     }
     if (!token.getAllowedTlds().isEmpty()

core/src/main/java/google/registry/flows/host/HostUpdateFlow.java

@@ -285,7 +285,7 @@ public final class HostUpdateFlow implements TransactionalFlow {
         && newHost.isSubordinate()
         && Objects.equals(
             existingHost.getSuperordinateDomain(), newHost.getSuperordinateDomain())) {
-      tm().saveNewOrUpdate(
+      tm().put(
               tm().load(existingHost.getSuperordinateDomain())
                   .asBuilder()
                   .removeSubordinateHost(existingHost.getHostName())
@@ -294,14 +294,14 @@ public final class HostUpdateFlow implements TransactionalFlow {
       return;
     }
     if (existingHost.isSubordinate()) {
-      tm().saveNewOrUpdate(
+      tm().put(
               tm().load(existingHost.getSuperordinateDomain())
                   .asBuilder()
                   .removeSubordinateHost(existingHost.getHostName())
                   .build());
     }
     if (newHost.isSubordinate()) {
-      tm().saveNewOrUpdate(
+      tm().put(
               tm().load(newHost.getSuperordinateDomain())
                   .asBuilder()
                   .addSubordinateHost(newHost.getHostName())

core/src/main/java/google/registry/flows/poll/PollFlowUtils.java

@@ -64,7 +64,7 @@ public final class PollFlowUtils {
       // and re-save it for future autorenew poll messages to be delivered. Otherwise, this
       // autorenew poll message has no more events to deliver and should be deleted.
       if (nextEventTime.isBefore(autorenewPollMessage.getAutorenewEndTime())) {
-        tm().saveNewOrUpdate(autorenewPollMessage.asBuilder().setEventTime(nextEventTime).build());
+        tm().put(autorenewPollMessage.asBuilder().setEventTime(nextEventTime).build());
         includeAckedMessageInCount = isBeforeOrAt(nextEventTime, tm().getTransactionTime());
       } else {
         tm().delete(autorenewPollMessage.createVKey());

core/src/main/java/google/registry/idn/Arabic-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Arab
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Armenian-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Armn
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Bengali-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Beng
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Chinese-IDN.txt

@@ -1,24 +1,24 @@
 # Registry: Charleston Road Registry Inc.
-# Script: Chinese
+# Script: zh-Hans
 # Version: 1.0
 # Effective Date: 04-12-2012
 #
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com
 # Notes: This table describes codepoints allowed for the Chinese script.
 
-Reference 0 Unicode 3.2
-Reference 1 A Complete Set of Simplified Chinese Characters
-Reference 2 Chinese Variants Collation Table
-Reference 3 Chinese Big Dictionary
-Reference 4 Chinese Relationship Table for Unihan Project
-Reference 5 GB2312
-Reference 6 General Table for Modern Chinese
-Reference 7 International Chinese Standard Big Dictionary
-Reference 8 Unihan Database
-Reference 9 BIG5
+# Reference 0 Unicode 3.2
+# Reference 1 A Complete Set of Simplified Chinese Characters
+# Reference 2 Chinese Variants Collation Table
+# Reference 3 Chinese Big Dictionary
+# Reference 4 Chinese Relationship Table for Unihan Project
+# Reference 5 GB2312
+# Reference 6 General Table for Modern Chinese
+# Reference 7 International Chinese Standard Big Dictionary
+# Reference 8 Unihan Database
+# Reference 9 BIG5
 
 U+002D(0);U+002D(0);
 U+0030(0);U+0030(0);

core/src/main/java/google/registry/idn/Cyrillic-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Cyrl
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Devanagari-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Deva
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Ethiopic-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Ethi
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com

core/src/main/java/google/registry/idn/Georgian-IDN.txt

@@ -3,7 +3,7 @@
 #
 # Version: 1.0
 # Effective Date: 04-12-2012
-# Contact: tas-contact.google.com
+# Contact: iana-contact@google.com
 # Address: 1600 Amphitheatre Parkway Mountain View, CA 94043, USA
 # Telephone: +1 (650) 253-0000
 # Website: www.google.com