Revert "Request 101m CPU in sandbox proxy (#813)" (#818)

This reverts commit e30c0f9a11.

The proposed solution didn't work.

.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

@@ -260,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()
         }
       }

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

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

@@ -75,6 +75,7 @@ Pseudo-commands:
 """
 
 # 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 '
@@ -124,6 +125,9 @@ 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.'),

core/build.gradle

@@ -225,8 +225,8 @@ dependencies {
   testRuntime deps['io.github.java-diff-utils:java-diff-utils']
   testCompile deps['javax.annotation:javax.annotation-api']
   testCompile deps['javax.annotation:jsr250-api']
-  compile deps['javax.inject:javax.inject']
   compile deps['javax.mail:mail']
+  compile deps['javax.inject:javax.inject']
   compile deps['javax.persistence:javax.persistence-api']
   compile deps['javax.servlet:servlet-api']
   compile deps['javax.xml.bind:jaxb-api']
@@ -245,6 +245,7 @@ dependencies {
   testCompile deps['org.apache.ftpserver:ftpserver-core']
   compile deps['org.apache.httpcomponents:httpclient']
   compile deps['org.apache.httpcomponents:httpcore']
+  runtime deps['org.apache.logging.log4j:log4j-core']
   testCompile deps['org.apache.sshd:sshd-core']
   testCompile deps['org.apache.sshd:sshd-scp']
   testCompile deps['org.apache.sshd:sshd-sftp']
@@ -633,131 +634,6 @@ artifacts {
   testRuntime testJar
 }
 
-/**
- * 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
- * --tests flag only applies to the task named on the command line (usually
- * just "test"), not for all tasks of type "Test".
- *
- * As a better solution, FilteringTest sets testNameIncludePatterns (the
- * internal property that --tests sets) from the value of the "testFilter"
- * property, allowing us to filter across all the tests in core without
- * explicitly specifying a test task or causing errors because there are no
- * matching tests in the main task.
- *
- * To use it, define "testFilter" to be a comma-separated collection of class
- * names (wildcards are allowed):
- *
- *   ./gradlew test -P testFilter=*.FooBar,google.registry.tools.ShellCommandTest
- */
-class FilteringTest extends Test {
-
-  FilteringTest() {
-    useJUnitPlatform();
-  }
-
-  private void applyTestFilter() {
-    if (project.testFilter) {
-      testNameIncludePatterns = project.testFilter.split(',')
-
-      // By default, gradle test tasks will produce a failure if no tests
-      // match the include/exclude/filter rules.  Since test filtering allows us
-      // to select a set of tests from a particular task, we don't want this
-      // behavior.
-      filter.failOnNoMatchingTests = false
-    }
-  }
-
-  /**
-   * Set to false if you also want to include TestCase and TestSuite classes.
-   *
-   * <p>Must be defined before "test", if at all.
-   */
-  boolean excludeTestCases = true
-
-  void setTests(List<String> tests) {
-    // Common exclude pattern. See README in parent directory for explanation.
-    if (excludeTestCases) {
-      exclude "**/*TestCase.*", "**/*TestSuite.*"
-    }
-    include tests
-    applyTestFilter()
-  }
-
-  /**
-   * Include all of the tests (except Test{Case,TestSuite}).  This actually
-   * doesn't explicitly "include" anything, in which cast the Test class tries
-   * to include everything that is not explicitly excluded.
-   */
-  void includeAllTests() {
-    exclude "**/*TestCase.*", "**/*TestSuite.*"
-    applyTestFilter()
-  }
-}
-
-task fragileTest(type: FilteringTest) {
-  // Common exclude pattern. See README in parent directory for explanation.
-  tests = fragileTestPatterns
-
-  if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
-    exclude dockerIncompatibleTestPatterns
-  }
-
-  // Run every test class in a freshly started process.
-  forkEvery 1
-
-  doFirst {
-    new File(screenshotsDir).deleteDir()
-  }
-}
-
-task outcastTest(type: FilteringTest) {
-  tests = outcastTestPatterns
-
-  // Sets the maximum number of test executors that may exist at the same time.
-  // Note that this number appears to contribute to NoClassDefFoundError
-  // exceptions on certain machines and distros. The root cause is unclear.
-  // Try reducing this number if you experience similar problems.
-  maxParallelForks 3
-}
-
-// 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.
-  // Here we need to override parent's choice of JUnit 5. If changing this, remember to
-  // change :integration:sqlIntegrationTest too.
-  useJUnit()
-  excludeTestCases = false
-  tests = ['google/registry/schema/integration/SqlIntegrationTestSuite.*']
-}
-
 task findGoldenImages(type: JavaExec) {
   classpath = sourceSets.test.runtimeClasspath
   main = 'google.registry.webdriver.GoldenImageFinder'
@@ -877,39 +753,6 @@ task generateGoldenImages(type: FilteringTest) {
 }
 generateGoldenImages.finalizedBy(findGoldenImages)
 
-task standardTest(type: FilteringTest) {
-  includeAllTests()
-  exclude fragileTestPatterns
-  exclude outcastTestPatterns
-  // See SqlIntegrationTestSuite.java
-  exclude '**/*BeforeSuiteTest.*', '**/*AfterSuiteTest.*'
-
-  if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
-    exclude dockerIncompatibleTestPatterns
-  }
-
-  // Run every test class in its own process.
-  // Uncomment to unblock build while troubleshooting inexplicable test errors.
-  // This setting makes the build take 35 minutes, without it it takes about 10.
-  // forkEvery 1
-
-  // Sets the maximum number of test executors that may exist at the same time.
-  // Also, Gradle executes tests in 1 thread and some of our test infrastructures
-  // depend on that, e.g. DualDatabaseTestInvocationContextProvider injects
-  // different implementation of TransactionManager into TransactionManagerFactory.
-  maxParallelForks 5
-
-  systemProperty 'test.projectRoot', rootProject.projectRootDir
-  systemProperty 'test.resourcesDir', resourcesDir
-}
-
-test {
-  // Don't run any tests from this task, all testing gets done in the
-  // FilteringTest tasks.
-  exclude "**"
-  // 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
@@ -1044,6 +887,147 @@ task runTestServer(dependsOn: copyJsFilesForTestServer, type: JavaExec) {
   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
+ * --tests flag only applies to the task named on the command line (usually
+ * just "test"), not for all tasks of type "Test".
+ *
+ * As a better solution, FilteringTest sets testNameIncludePatterns (the
+ * internal property that --tests sets) from the value of the "testFilter"
+ * property, allowing us to filter across all the tests in core without
+ * explicitly specifying a test task or causing errors because there are no
+ * matching tests in the main task.
+ *
+ * To use it, define "testFilter" to be a comma-separated collection of class
+ * names (wildcards are allowed):
+ *
+ *   ./gradlew test -P testFilter=*.FooBar,google.registry.tools.ShellCommandTest
+ */
+class FilteringTest extends Test {
+
+  FilteringTest() {
+    useJUnitPlatform();
+  }
+
+  private void applyTestFilter() {
+    if (project.testFilter) {
+      testNameIncludePatterns = project.testFilter.split(',')
+
+      // By default, gradle test tasks will produce a failure if no tests
+      // match the include/exclude/filter rules.  Since test filtering allows us
+      // to select a set of tests from a particular task, we don't want this
+      // behavior.
+      filter.failOnNoMatchingTests = false
+    }
+  }
+
+  /**
+   * Set to false if you also want to include TestCase and TestSuite classes.
+   *
+   * <p>Must be defined before "test", if at all.
+   */
+  boolean excludeTestCases = true
+
+  void setTests(List<String> tests) {
+    // Common exclude pattern. See README in parent directory for explanation.
+    if (excludeTestCases) {
+      exclude "**/*TestCase.*", "**/*TestSuite.*"
+    }
+    include tests
+    applyTestFilter()
+  }
+
+  /**
+   * Include all of the tests (except Test{Case,TestSuite}).  This actually
+   * doesn't explicitly "include" anything, in which cast the Test class tries
+   * to include everything that is not explicitly excluded.
+   */
+  void includeAllTests() {
+    exclude "**/*TestCase.*", "**/*TestSuite.*"
+    applyTestFilter()
+  }
+}
+
+task fragileTest(type: FilteringTest) {
+  // Common exclude pattern. See README in parent directory for explanation.
+  tests = fragileTestPatterns
+
+  if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
+    exclude dockerIncompatibleTestPatterns
+  }
+
+  // Run every test class in a freshly started process.
+  forkEvery 1
+
+  doFirst {
+    new File(screenshotsDir).deleteDir()
+  }
+}
+
+task outcastTest(type: FilteringTest) {
+  tests = outcastTestPatterns
+
+  // Sets the maximum number of test executors that may exist at the same time.
+  // Note that this number appears to contribute to NoClassDefFoundError
+  // exceptions on certain machines and distros. The root cause is unclear.
+  // Try reducing this number if you experience similar problems.
+  maxParallelForks 3
+}
+
+// Dedicated test suite for schema-dependent tests.
+task sqlIntegrationTest(type: FilteringTest) {
+  // TestSuite still requires a JUnit 4 runner, which knows how to handle JUnit 5 tests.
+  // Here we need to override parent's choice of JUnit 5. If changing this, remember to
+  // change :integration:sqlIntegrationTest too.
+  useJUnit()
+  excludeTestCases = false
+  tests = ['google/registry/schema/integration/SqlIntegrationTestSuite.*']
+}
+
+// Verifies that RegistryTool can be instantiated:
+// - All dependencies are packaged in nomulus.jar
+// - JPA setup succeeds.
+task registryToolIntegrationTest(dependsOn: nomulus, type: FilteringTest) {
+  tests = ['google/registry/tools/RegistryToolTest.*']
+  testClassesDirs = sourceSets.test.output.classesDirs
+  classpath = nomulus.outputs.files.plus(configurations.testRuntimeClasspath)
+      .plus(files(testClassesDirs))
+}
+
+task standardTest(type: FilteringTest) {
+  includeAllTests()
+  exclude fragileTestPatterns
+  exclude outcastTestPatterns
+  // See SqlIntegrationTestSuite.java
+  exclude '**/*BeforeSuiteTest.*', '**/*AfterSuiteTest.*'
+
+  if (rootProject.findProperty("skipDockerIncompatibleTests") == "true") {
+    exclude dockerIncompatibleTestPatterns
+  }
+
+  // Run every test class in its own process.
+  // Uncomment to unblock build while troubleshooting inexplicable test errors.
+  // This setting makes the build take 35 minutes, without it it takes about 10.
+  // forkEvery 1
+
+  // Sets the maximum number of test executors that may exist at the same time.
+  // Also, Gradle executes tests in 1 thread and some of our test infrastructures
+  // depend on that, e.g. DualDatabaseTestInvocationContextProvider injects
+  // different implementation of TransactionManager into TransactionManagerFactory.
+  maxParallelForks 5
+
+  systemProperty 'test.projectRoot', rootProject.projectRootDir
+  systemProperty 'test.resourcesDir', resourcesDir
+}
+
+test {
+  // Don't run any tests from this task, all testing gets done in the
+  // FilteringTest tasks.
+  exclude "**"
+  // TODO(weiminyu): Remove dependency on sqlIntegrationTest
+}.dependsOn(fragileTest, outcastTest, standardTest, registryToolIntegrationTest, sqlIntegrationTest)
+
 project.build.dependsOn devtool
 project.build.dependsOn buildToolImage
 project.build.dependsOn ':stage'

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,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
 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: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,7 +226,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -238,7 +244,7 @@ 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

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,40 @@ 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: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
@@ -233,7 +241,7 @@ 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

core/gradle/dependency-locks/default.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,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-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 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
 com.google.oauth-client:google-oauth-client-appengine:1.30.5
-com.google.oauth-client:google-oauth-client-java6:1.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
 com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,43 +127,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
@@ -176,33 +175,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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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
@@ -220,7 +228,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -240,7 +247,7 @@ 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

core/gradle/dependency-locks/deploy_jar.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,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-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 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
 com.google.oauth-client:google-oauth-client-appengine:1.30.5
-com.google.oauth-client:google-oauth-client-java6:1.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
 com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,43 +127,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
@@ -176,32 +175,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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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
@@ -237,7 +245,7 @@ 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

core/gradle/dependency-locks/errorproneJavac.lockfile

@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.google.errorprone:javac:9+181-r4173-1

core/gradle/dependency-locks/nonprodCompile.lockfile

@@ -1,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,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
 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: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,7 +226,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -238,7 +244,7 @@ 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

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,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
 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: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,7 +225,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -236,7 +243,7 @@ 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

core/gradle/dependency-locks/nonprodRuntime.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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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,7 +227,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -238,7 +245,7 @@ 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

core/gradle/dependency-locks/nonprodRuntimeClasspath.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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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,7 +227,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -238,7 +245,7 @@ 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

core/gradle/dependency-locks/runtime.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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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,7 +227,6 @@ org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.8
-org.mockito:mockito-core:1.9.5
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.objenesis:objenesis:1.2
@@ -238,7 +245,7 @@ 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

core/gradle/dependency-locks/runtimeClasspath.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,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-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 +107,12 @@ com.google.jsinterop:jsinterop-annotations:1.0.2
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
 com.google.oauth-client:google-oauth-client-appengine:1.30.5
-com.google.oauth-client:google-oauth-client-java6:1.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
 com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.googlecode.charts4j:charts4j:1.3
@@ -129,43 +127,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
@@ -176,32 +175,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.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
+org.checkerframework:checker-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
@@ -237,7 +245,7 @@ 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

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
@@ -288,7 +293,7 @@ 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

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
@@ -286,7 +292,7 @@ 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

core/gradle/dependency-locks/testRuntime.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,90 +18,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 +110,12 @@ com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
 com.google.oauth-client:google-oauth-client-appengine:1.30.5
-com.google.oauth-client:google-oauth-client-java6:1.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
 com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -137,41 +135,41 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
 io.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.0
+io.opencensus:opencensus-contrib-grpc-util:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
+io.perfmark:perfmark-api:0.19.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -186,25 +184,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
@@ -213,6 +216,8 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
@@ -226,7 +231,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
@@ -291,7 +297,7 @@ 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

core/gradle/dependency-locks/testRuntimeClasspath.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,90 +18,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 +110,12 @@ com.google.monitoring-client:contrib:1.0.7
 com.google.monitoring-client:metrics:1.0.7
 com.google.monitoring-client:stackdriver:1.0.7
 com.google.oauth-client:google-oauth-client-appengine:1.30.5
-com.google.oauth-client:google-oauth-client-java6:1.28.0
+com.google.oauth-client:google-oauth-client-java6:1.30.6
 com.google.oauth-client:google-oauth-client-jetty:1.28.0
 com.google.oauth-client:google-oauth-client-servlet:1.30.5
-com.google.oauth-client:google-oauth-client:1.30.5
-com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
-com.google.protobuf:protobuf-java-util:3.6.1
-com.google.protobuf:protobuf-java:3.6.1
+com.google.oauth-client:google-oauth-client:1.30.6
+com.google.protobuf:protobuf-java-util:3.11.4
+com.google.protobuf:protobuf-java:3.11.4
 com.google.re2j:re2j:1.1
 com.google.template:soy:2018-03-14
 com.google.truth.extensions:truth-java8-extension:1.0
@@ -137,41 +135,41 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.thoughtworks.paranamer:paranamer:2.7
 com.thoughtworks.qdox:qdox:1.12.1
 com.zaxxer:HikariCP:3.2.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
 dnsjava:dnsjava:2.1.7
-io.dropwizard.metrics:metrics-core:3.1.2
-io.github.classgraph:classgraph:4.8.52
+io.dropwizard.metrics:metrics-core:3.2.6
+io.github.classgraph:classgraph:4.8.65
 io.github.java-diff-utils:java-diff-utils:4.0
-io.grpc:grpc-all:1.17.1
-io.grpc:grpc-alts:1.17.1
-io.grpc:grpc-auth:1.17.1
-io.grpc:grpc-context:1.22.1
-io.grpc:grpc-core:1.17.1
-io.grpc:grpc-grpclb:1.17.1
-io.grpc:grpc-netty-shaded:1.17.1
-io.grpc:grpc-netty:1.17.1
-io.grpc:grpc-okhttp:1.17.1
-io.grpc:grpc-protobuf-lite:1.17.1
-io.grpc:grpc-protobuf-nano:1.17.1
-io.grpc:grpc-protobuf:1.17.1
-io.grpc:grpc-stub:1.17.1
-io.grpc:grpc-testing:1.17.1
-io.netty:netty-buffer:4.1.30.Final
-io.netty:netty-codec-http2:4.1.30.Final
-io.netty:netty-codec-http:4.1.30.Final
-io.netty:netty-codec-socks:4.1.30.Final
-io.netty:netty-codec:4.1.30.Final
-io.netty:netty-common:4.1.30.Final
-io.netty:netty-handler-proxy:4.1.30.Final
-io.netty:netty-handler:4.1.30.Final
-io.netty:netty-resolver:4.1.30.Final
+io.grpc:grpc-all:1.27.2
+io.grpc:grpc-alts:1.29.0
+io.grpc:grpc-api:1.29.0
+io.grpc:grpc-auth:1.29.0
+io.grpc:grpc-context:1.29.0
+io.grpc:grpc-core:1.29.0
+io.grpc:grpc-grpclb:1.29.0
+io.grpc:grpc-netty-shaded:1.29.0
+io.grpc:grpc-netty:1.27.2
+io.grpc:grpc-okhttp:1.27.2
+io.grpc:grpc-protobuf-lite:1.29.0
+io.grpc:grpc-protobuf:1.29.0
+io.grpc:grpc-stub:1.29.0
+io.grpc:grpc-testing:1.27.2
+io.netty:netty-buffer:4.1.42.Final
+io.netty:netty-codec-http2:4.1.42.Final
+io.netty:netty-codec-http:4.1.42.Final
+io.netty:netty-codec-socks:4.1.42.Final
+io.netty:netty-codec:4.1.42.Final
+io.netty:netty-common:4.1.42.Final
+io.netty:netty-handler-proxy:4.1.42.Final
+io.netty:netty-handler:4.1.42.Final
+io.netty:netty-resolver:4.1.42.Final
 io.netty:netty-tcnative-boringssl-static:2.0.17.Final
-io.netty:netty-transport:4.1.30.Final
+io.netty:netty-transport:4.1.42.Final
 io.opencensus:opencensus-api:0.24.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.17.0
-io.opencensus:opencensus-contrib-grpc-util:0.17.0
+io.opencensus:opencensus-contrib-grpc-util:0.24.0
 io.opencensus:opencensus-contrib-http-util:0.24.0
+io.perfmark:perfmark-api:0.19.0
 it.unimi.dsi:fastutil:6.5.16
 javax.activation:activation:1.1
 javax.activation:javax.activation-api:1.2.0
@@ -186,25 +184,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
@@ -213,6 +216,8 @@ org.apache.ftpserver:ftplet-api:1.0.6
 org.apache.ftpserver:ftpserver-core:1.0.6
 org.apache.httpcomponents:httpclient:4.5.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.logging.log4j:log4j-api:2.13.3
+org.apache.logging.log4j:log4j-core:2.13.3
 org.apache.mina:mina-core:2.0.4
 org.apache.sshd:sshd-core:2.0.0
 org.apache.sshd:sshd-scp:2.0.0
@@ -226,7 +231,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
@@ -292,7 +298,7 @@ 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

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

@@ -169,16 +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)
             .header("Host", backendHostname)
-            .param(
-                RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM,
-                String.valueOf(lock.getRevisionId()))
-            .countdownMillis(lock.getRelockDuration().get().getMillis()));
+            .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/Transforms.java

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

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
+      enableInvoicing 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/config/RegistryConfig.java

@@ -615,6 +615,18 @@ public final class RegistryConfig {
       return config.registryPolicy.requireSslCertificates;
     }
 
+    /**
+     * Returns the default job region to run Apache Beam (Cloud Dataflow) jobs in.
+     *
+     * @see google.registry.beam.invoicing.InvoicingPipeline
+     * @see google.registry.beam.spec11.Spec11Pipeline
+     */
+    @Provides
+    @Config("defaultJobRegion")
+    public static String provideDefaultJobRegion(RegistryConfigSettings config) {
+      return config.beam.defaultJobRegion;
+    }
+
     /**
      * Returns the default job zone to run Apache Beam (Cloud Dataflow) jobs in.
      *

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

@@ -127,6 +127,7 @@ public class RegistryConfigSettings {
 
   /** Configuration for Apache Beam (Cloud Dataflow). */
   public static class Beam {
+    public String defaultJobRegion;
     public String defaultJobZone;
   }
 

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

@@ -419,7 +419,10 @@ misc:
   transientFailureRetries: 12
 
 beam:
+  # The default region to run Apache Beam (Cloud Dataflow) jobs in.
+  defaultJobRegion: us-east1
   # The default zone to run Apache Beam (Cloud Dataflow) jobs in.
+  # TODO(weiminyu): consider dropping zone config. No obvious needs for this.
   defaultJobZone: us-east1-c
 
 keyring:

core/src/main/java/google/registry/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

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

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

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

@@ -183,7 +183,8 @@ public final class DomainRenewFlow implements TransactionalFlow {
             .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

@@ -173,7 +173,7 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow  {
             existingDomain, newExpirationTime, autorenewEvent, autorenewPollMessage, now, clientId);
     updateForeignKeyIndexDeletionTime(newDomain);
     entitiesToSave.add(newDomain, historyEntry, autorenewEvent, autorenewPollMessage);
-    tm().saveNewOrUpdateAll(entitiesToSave.build());
+    tm().putAll(entitiesToSave.build());
     tm().delete(existingDomain.getDeletePollMessage());
     dnsQueue.addDomainRefreshTask(existingDomain.getDomainName());
     return responseBuilder

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

@@ -192,7 +192,10 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
             .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

@@ -68,6 +68,7 @@ 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.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 +153,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);
@@ -251,6 +253,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

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

@@ -3,7 +3,7 @@
 # Script: Grek
 # 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/Gurmukhi-IDN.txt

@@ -3,7 +3,7 @@
 # Script: Guru
 # 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/Hebrew-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Hebr
 # 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/Kannada-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Knda
 # 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/Khmer-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Khmr
 # 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

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

@@ -2,7 +2,7 @@
 # Script: Kore
 # 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/Malayalam-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Mlym
 # 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/Myanmar-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

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

@@ -2,7 +2,7 @@
 # Script: Orya
 # 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/Sinhala-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Sinh
 # 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/Tamil-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Taml
 # 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/Telugu-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Telu
 # 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/Thai-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Thai
 # 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/Tibetan-IDN.txt

@@ -2,7 +2,7 @@
 # Script: Tibt
 # 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/Traditional-Chinese-IDN.txt

@@ -1,23 +1,23 @@
 # Registry: Charleston Road Registry Inc.
-# Script: Traditional Chinese
+# Script: zh-Hant
 # 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 Traditional 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/model/BackupGroupRoot.java

@@ -14,7 +14,6 @@
 
 package google.registry.model;
 
-import com.google.common.annotations.VisibleForTesting;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.MappedSuperclass;
@@ -30,6 +29,7 @@ import javax.xml.bind.annotation.XmlTransient;
  */
 @MappedSuperclass
 public abstract class BackupGroupRoot extends ImmutableObject {
+
   /**
    * An automatically managed timestamp of when this object was last written to Datastore.
    *
@@ -40,7 +40,6 @@ public abstract class BackupGroupRoot extends ImmutableObject {
   // Prevents subclasses from unexpectedly accessing as property (e.g., HostResource), which would
   // require an unnecessary non-private setter method.
   @Access(AccessType.FIELD)
-  @VisibleForTesting
   UpdateAutoTimestamp updateTimestamp = UpdateAutoTimestamp.create(null);
 
   /** Get the {@link UpdateAutoTimestamp} for this entity. */

core/src/main/java/google/registry/model/EntityClasses.java

@@ -19,9 +19,12 @@ import google.registry.model.billing.BillingEvent;
 import google.registry.model.common.Cursor;
 import google.registry.model.common.EntityGroupRoot;
 import google.registry.model.common.GaeUserIdConverter;
+import google.registry.model.contact.ContactHistory;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.token.AllocationToken;
+import google.registry.model.host.HostHistory;
 import google.registry.model.host.HostResource;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.EppResourceIndexBucket;
@@ -68,9 +71,11 @@ public final class EntityClasses {
           CommitLogCheckpointRoot.class,
           CommitLogManifest.class,
           CommitLogMutation.class,
+          ContactHistory.class,
           ContactResource.class,
           Cursor.class,
           DomainBase.class,
+          DomainHistory.class,
           EntityGroupRoot.class,
           EppResourceIndex.class,
           EppResourceIndexBucket.class,
@@ -79,6 +84,7 @@ public final class EntityClasses {
           ForeignKeyIndex.ForeignKeyHostIndex.class,
           GaeUserIdConverter.class,
           HistoryEntry.class,
+          HostHistory.class,
           HostResource.class,
           KmsSecret.class,
           KmsSecretRevision.class,

core/src/main/java/google/registry/model/EppResource.java

@@ -62,23 +62,32 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
   /**
    * Unique identifier in the registry for this resource.
    *
+   * <p>Not persisted so that we can store these in references to other objects. Subclasses that
+   * wish to use this as the primary key should create a getter method annotated with @Id
+   *
    * <p>This is in the (\w|_){1,80}-\w{1,8} format specified by RFC 5730 for roidType.
    *
    * @see <a href="https://tools.ietf.org/html/rfc5730">RFC 5730</a>
    */
-  @Id
-  // not persisted so that we can store these in references to other objects. Subclasses that wish
-  // to use this as the primary key should create a getter method annotated with @Id
-  @Transient
-  String repoId;
+  @Id @Transient String repoId;
 
-  /** The ID of the registrar that is currently sponsoring this resource. */
+  /**
+   * The ID of the registrar that is currently sponsoring this resource.
+   *
+   * <p>This can be null in the case of pre-Registry-3.0-migration history objects with null
+   * resource fields.
+   */
   @Index
-  @Column(name = "currentSponsorRegistrarId", nullable = false)
+  @Column(name = "currentSponsorRegistrarId")
   String currentSponsorClientId;
 
-  /** The ID of the registrar that created this resource. */
-  @Column(name = "creationRegistrarId", nullable = false)
+  /**
+   * The ID of the registrar that created this resource.
+   *
+   * <p>This can be null in the case of pre-Registry-3.0-migration history objects with null
+   * resource fields.
+   */
+  @Column(name = "creationRegistrarId")
   String creationClientId;
 
   /**
@@ -91,13 +100,17 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
   @Column(name = "lastEppUpdateRegistrarId")
   String lastEppUpdateClientId;
 
-  /** The time when this resource was created. */
-  // Map the method to XML, not the field, because if we map the field (with an adaptor class) it
-  // will never be omitted from the xml even if the timestamp inside creationTime is null and we
-  // return null from the adaptor. (Instead it gets written as an empty tag.)
-  @Column(nullable = false)
-  @Index
-  CreateAutoTimestamp creationTime = CreateAutoTimestamp.create(null);
+  /**
+   * The time when this resource was created.
+   *
+   * <p>Map the method to XML, not the field, because if we map the field (with an adaptor class) it
+   * will never be omitted from the xml even if the timestamp inside creationTime is null and we
+   * return null from the adaptor (instead it gets written as an empty tag).
+   *
+   * <p>This can be null in the case of pre-Registry-3.0-migration history objects with null
+   * resource fields.
+   */
+  @Index CreateAutoTimestamp creationTime = CreateAutoTimestamp.create(null);
 
   /**
    * The time when this resource was or will be deleted.
@@ -112,8 +125,7 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
    * out of the index at that time, as long as we query for resources whose deletion time is before
    * now.
    */
-  @Index
-  DateTime deletionTime;
+  @Index DateTime deletionTime;
 
   /**
    * The time that this resource was last updated.
@@ -144,7 +156,7 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
     return repoId;
   }
 
-  // Hibernate needs this to populate the repo ID, but no one else should ever use it
+  /** This method exists solely to satisfy Hibernate. Use {@link Builder} instead. */
   @SuppressWarnings("UnusedMethod")
   private void setRepoId(String repoId) {
     this.repoId = repoId;

core/src/main/java/google/registry/model/billing/BillingEvent.java

@@ -33,12 +33,14 @@ import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
+import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.condition.IfNull;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.common.TimeOfYear;
+import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.token.AllocationToken;
@@ -46,6 +48,7 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
+import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -56,9 +59,8 @@ import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.MappedSuperclass;
+import javax.persistence.PostLoad;
 import javax.persistence.Transient;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -107,10 +109,7 @@ public abstract class BillingEvent extends ImmutableObject
   }
 
   /** Entity id. */
-  @Id
-  @javax.persistence.Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  Long id;
+  @Id @javax.persistence.Id Long id;
 
   @Parent @DoNotHydrate @Transient Key<HistoryEntry> parent;
 
@@ -148,6 +147,21 @@ public abstract class BillingEvent extends ImmutableObject
   @Nullable
   Set<Flag> flags;
 
+  @PostLoad
+  void postLoad() {
+    parent =
+        Key.create(
+            Key.create(DomainBase.class, domainRepoId),
+            HistoryEntry.class,
+            domainHistoryRevisionId);
+  }
+
+  @OnLoad
+  void onLoad() {
+    domainHistoryRevisionId = parent.getId();
+    domainRepoId = parent.getParent().getName();
+  }
+
   public String getClientId() {
     return clientId;
   }
@@ -244,7 +258,6 @@ public abstract class BillingEvent extends ImmutableObject
     }
 
     public B setParent(Key<HistoryEntry> parentKey) {
-      // TODO(shicong): Figure out how to set domainHistoryRevisionId and domainRepoId
       getInstance().parent = parentKey;
       return thisCastToDerived();
     }
@@ -257,6 +270,11 @@ public abstract class BillingEvent extends ImmutableObject
       checkNotNull(instance.eventTime, "Event time must be set");
       checkNotNull(instance.targetId, "Target ID must be set");
       checkNotNull(instance.parent, "Parent must be set");
+      checkNotNull(instance.parent.getParent(), "parent.getParent() must be set");
+      checkNotNull(
+          instance.parent.getParent().getName(), "parent.getParent().getName() must be set");
+      instance.domainHistoryRevisionId = instance.parent.getId();
+      instance.domainRepoId = instance.parent.getParent().getName();
       return super.build();
     }
   }
@@ -274,7 +292,7 @@ public abstract class BillingEvent extends ImmutableObject
         @javax.persistence.Index(columnList = "allocation_token_id")
       })
   @AttributeOverride(name = "id", column = @Column(name = "billing_event_id"))
-  public static class OneTime extends BillingEvent {
+  public static class OneTime extends BillingEvent implements DatastoreAndSqlEntity {
 
     /** The billable value. */
     @AttributeOverrides({
@@ -347,27 +365,11 @@ public abstract class BillingEvent extends ImmutableObject
 
     @Override
     public VKey<OneTime> createVKey() {
-      return VKey.create(
-          getClass(),
-          parent.getParent().getName() + "/" + parent.getId() + "/" + getId(),
-          Key.create(this));
+      return VKey.create(OneTime.class, getId(), Key.create(this));
     }
 
     public static VKey<OneTime> createVKey(Key<OneTime> key) {
-      // TODO(b/159207551): As it stands, the SQL key generated here doesn't mesh with the primary
-      // key type for the table, which is a single long integer.
-      if (key == null) {
-        return null;
-      }
-      Key parent = key.getParent();
-      Key grandparent = (parent != null) ? parent.getParent() : null;
-      String path =
-          (grandparent != null ? grandparent.getName() : "")
-              + "/"
-              + (parent != null ? parent.getId() : "")
-              + "/"
-              + key.getId();
-      return VKey.create(OneTime.class, path, key);
+      return VKey.create(OneTime.class, key.getId(), key);
     }
 
     @Override
@@ -466,7 +468,7 @@ public abstract class BillingEvent extends ImmutableObject
         @javax.persistence.Index(columnList = "recurrence_time_of_year")
       })
   @AttributeOverride(name = "id", column = @Column(name = "billing_recurrence_id"))
-  public static class Recurring extends BillingEvent {
+  public static class Recurring extends BillingEvent implements DatastoreAndSqlEntity {
 
     /**
      * The billing event recurs every year between {@link #eventTime} and this time on the
@@ -505,21 +507,11 @@ public abstract class BillingEvent extends ImmutableObject
 
     @Override
     public VKey<Recurring> createVKey() {
-      return VKey.create(
-          getClass(),
-          parent.getParent().getName() + "/" + parent.getId() + "/" + getId(),
-          Key.create(this));
+      return VKey.create(Recurring.class, getId(), Key.create(this));
     }
 
     public static VKey<Recurring> createVKey(Key<Recurring> key) {
-      // TODO(b/159207551): As it stands, the SQL key generated here doesn't mesh with the primary
-      // key type for the table, which is a single long integer.
-      if (key == null) {
-        return null;
-      }
-      String path =
-          key.getParent().getParent().getName() + "/" + key.getParent().getId() + "/" + key.getId();
-      return VKey.create(Recurring.class, path, key);
+      return VKey.create(Recurring.class, key.getId(), key);
     }
 
     @Override
@@ -570,7 +562,7 @@ public abstract class BillingEvent extends ImmutableObject
         @javax.persistence.Index(columnList = "billingTime")
       })
   @AttributeOverride(name = "id", column = @Column(name = "billing_cancellation_id"))
-  public static class Cancellation extends BillingEvent {
+  public static class Cancellation extends BillingEvent implements DatastoreAndSqlEntity {
 
     /** The billing time of the charge that is being cancelled. */
     @Index
@@ -639,21 +631,11 @@ public abstract class BillingEvent extends ImmutableObject
 
     @Override
     public VKey<Cancellation> createVKey() {
-      return VKey.create(
-          getClass(),
-          parent.getParent().getName() + "/" + parent.getId() + "/" + getId(),
-          Key.create(this));
+      return VKey.create(Cancellation.class, getId(), Key.create(this));
     }
 
     public static VKey<Cancellation> createVKey(Key<Cancellation> key) {
-      // TODO(b/159207551): As it stands, the SQL key generated here doesn't mesh with the primary
-      // key type for the table, which is a single long integer.
-      if (key == null) {
-        return null;
-      }
-      String path =
-          key.getParent().getParent().getName() + "/" + key.getParent().getId() + "/" + key.getId();
-      return VKey.create(Cancellation.class, path, key);
+      return VKey.create(Cancellation.class, key.getId(), key);
     }
 
     @Override
@@ -700,7 +682,7 @@ public abstract class BillingEvent extends ImmutableObject
   /** An event representing a modification of an existing one-time billing event. */
   @ReportedOn
   @Entity
-  public static class Modification extends BillingEvent {
+  public static class Modification extends BillingEvent implements DatastoreAndSqlEntity {
 
     /** The change in cost that should be applied to the original billing event. */
     Money cost;
@@ -733,21 +715,11 @@ public abstract class BillingEvent extends ImmutableObject
 
     @Override
     public VKey<Modification> createVKey() {
-      return VKey.create(
-          getClass(),
-          parent.getParent().getName() + "/" + parent.getId() + "/" + getId(),
-          Key.create(this));
+      return VKey.create(Modification.class, getId(), Key.create(this));
     }
 
     public static VKey<Modification> createVKey(Key<Modification> key) {
-      // TODO(b/159207551): As it stands, the SQL key generated here doesn't mesh with the primary
-      // key type for the table, which is a single long integer.
-      if (key == null) {
-        return null;
-      }
-      String path =
-          key.getParent().getParent().getName() + "/" + key.getParent().getId() + "/" + key.getId();
-      return VKey.create(Modification.class, path, key);
+      return VKey.create(Modification.class, key.getId(), key);
     }
 
     /**

core/src/main/java/google/registry/model/contact/ContactBase.java

@@ -19,7 +19,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList;
 import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime;
 
 import com.google.common.collect.ImmutableList;
-import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.condition.IfNull;
@@ -185,8 +184,9 @@ public class ContactBase extends EppResource implements ResourceWithTransferData
 
   @Override
   public VKey<? extends ContactBase> createVKey() {
-    // TODO(mmuller): create symmetric keys if we can ever reload both sides.
-    return VKey.create(ContactBase.class, getRepoId(), Key.create(this));
+    throw new UnsupportedOperationException(
+        "ContactBase is not an actual persisted entity you can create a key to;"
+            + " use ContactResource instead");
   }
 
   public String getContactId() {

core/src/main/java/google/registry/model/contact/ContactHistory.java

@@ -15,18 +15,27 @@
 package google.registry.model.contact;
 
 import com.googlecode.objectify.Key;
+import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PostLoad;
 
 /**
  * A persisted history entry representing an EPP modification to a contact.
  *
  * <p>In addition to the general history fields (e.g. action time, registrar ID) we also persist a
- * copy of the host entity at this point in time. We persist a raw {@link ContactBase} so that the
- * foreign-keyed fields in that class can refer to this object.
+ * copy of the contact entity at this point in time. We persist a raw {@link ContactBase} so that
+ * the foreign-keyed fields in that class can refer to this object.
  */
 @Entity
 @javax.persistence.Table(
@@ -36,16 +45,33 @@ import javax.persistence.Entity;
       @javax.persistence.Index(columnList = "historyType"),
       @javax.persistence.Index(columnList = "historyModificationTime")
     })
+@EntitySubclass
+@Access(AccessType.FIELD)
 public class ContactHistory extends HistoryEntry {
+
   // Store ContactBase instead of ContactResource so we don't pick up its @Id
-  ContactBase contactBase;
+  @Nullable ContactBase contactBase;
 
   @Column(nullable = false)
   VKey<ContactResource> contactRepoId;
 
-  /** The state of the {@link ContactBase} object at this point in time. */
-  public ContactBase getContactBase() {
-    return contactBase;
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
+  @Column(name = "historyRevisionId")
+  @Access(AccessType.PROPERTY)
+  @Override
+  public long getId() {
+    return super.getId();
+  }
+
+  /**
+   * The values of all the fields on the {@link ContactBase} object after the action represented by
+   * this history object was executed.
+   *
+   * <p>Will be absent for objects created prior to the Registry 3.0 SQL migration.
+   */
+  public Optional<ContactBase> getContactBase() {
+    return Optional.ofNullable(contactBase);
   }
 
   /** The key to the {@link ContactResource} this is based off of. */
@@ -53,6 +79,20 @@ public class ContactHistory extends HistoryEntry {
     return contactRepoId;
   }
 
+  @PostLoad
+  void postLoad() {
+    // Normally Hibernate would see that the contact fields are all null and would fill contactBase
+    // with a null object. Unfortunately, the updateTimestamp is never null in SQL.
+    if (contactBase != null && contactBase.getContactId() == null) {
+      contactBase = null;
+    }
+    // Fill in the full, symmetric, parent repo ID key
+    Key<ContactResource> parentKey =
+        Key.create(ContactResource.class, (String) contactRepoId.getSqlKey());
+    parent = parentKey;
+    contactRepoId = VKey.create(ContactResource.class, contactRepoId.getSqlKey(), parentKey);
+  }
+
   @Override
   public Builder asBuilder() {
     return new Builder(clone(this));
@@ -81,7 +121,8 @@ public class ContactHistory extends HistoryEntry {
     @Override
     public Builder setParent(Key<? extends EppResource> parent) {
       super.setParent(parent);
-      getInstance().contactRepoId = VKey.create(ContactResource.class, parent.getName(), parent);
+      getInstance().contactRepoId =
+          VKey.create(ContactResource.class, parent.getName(), (Key<ContactResource>) parent);
       return this;
     }
   }

core/src/main/java/google/registry/model/contact/ContactResource.java

@@ -40,7 +40,7 @@ import org.joda.time.DateTime;
       @javax.persistence.Index(columnList = "creationTime"),
       @javax.persistence.Index(columnList = "currentSponsorRegistrarId"),
       @javax.persistence.Index(columnList = "deletionTime"),
-      @javax.persistence.Index(columnList = "contactId", unique = true),
+      @javax.persistence.Index(columnList = "contactId"),
       @javax.persistence.Index(columnList = "searchName")
     })
 @ExternalMessagingName("contact")

core/src/main/java/google/registry/model/domain/DomainBase.java

@@ -14,79 +14,29 @@
 
 package google.registry.model.domain;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Strings.emptyToNull;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
-import static com.google.common.collect.Sets.difference;
-import static com.google.common.collect.Sets.intersection;
-import static com.google.common.collect.Sets.union;
-import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime;
-import static google.registry.model.EppResourceUtils.setAutomaticTransferSuccessProperties;
-import static google.registry.model.ofy.ObjectifyService.ofy;
-import static google.registry.util.CollectionUtils.forceEmptyToNull;
-import static google.registry.util.CollectionUtils.nullToEmpty;
-import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
-import static google.registry.util.CollectionUtils.union;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.DateTimeUtils.earliestOf;
-import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static google.registry.util.DateTimeUtils.leapSafeAddYears;
-import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
-import static google.registry.util.DomainNameUtils.getTldFromDomainName;
-import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Ignore;
-import com.googlecode.objectify.annotation.IgnoreSave;
-import com.googlecode.objectify.annotation.Index;
-import com.googlecode.objectify.annotation.OnLoad;
-import com.googlecode.objectify.condition.IfNull;
-import google.registry.flows.ResourceFlowUtils;
 import google.registry.model.EppResource;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
-import google.registry.model.EppResource.ResourceWithTransferData;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.ReportedOn;
-import google.registry.model.billing.BillingEvent;
-import google.registry.model.contact.ContactResource;
-import google.registry.model.domain.DesignatedContact.Type;
-import google.registry.model.domain.launch.LaunchNotice;
-import google.registry.model.domain.rgp.GracePeriodStatus;
-import google.registry.model.domain.secdns.DelegationSignerData;
-import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
-import google.registry.model.poll.PollMessage;
-import google.registry.model.registry.Registry;
-import google.registry.model.transfer.DomainTransferData;
-import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
 import google.registry.schema.replay.DatastoreAndSqlEntity;
-import google.registry.util.CollectionUtils;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Predicate;
-import javax.annotation.Nullable;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
-import javax.persistence.PostLoad;
-import javax.persistence.Transient;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import org.joda.time.DateTime;
-import org.joda.time.Interval;
 
 /**
  * A persistable domain resource including mutable and non-mutable fields.
@@ -98,211 +48,23 @@ import org.joda.time.Interval;
  * @see <a href="https://tools.ietf.org/html/rfc5731">RFC 5731</a>
  */
 @ReportedOn
-@Entity
-@javax.persistence.Entity(name = "Domain")
-@javax.persistence.Table(
+@com.googlecode.objectify.annotation.Entity
+@Entity(name = "Domain")
+@Table(
     name = "Domain",
     indexes = {
-      @javax.persistence.Index(columnList = "creationTime"),
-      @javax.persistence.Index(columnList = "currentSponsorRegistrarId"),
-      @javax.persistence.Index(columnList = "deletionTime"),
-      @javax.persistence.Index(columnList = "domainName"),
-      @javax.persistence.Index(columnList = "tld")
+      @Index(columnList = "creationTime"),
+      @Index(columnList = "currentSponsorRegistrarId"),
+      @Index(columnList = "deletionTime"),
+      @Index(columnList = "domainName"),
+      @Index(columnList = "tld"),
+      @Index(columnList = "autorenewEndTime")
     })
 @WithStringVKey
 @ExternalMessagingName("domain")
 @Access(AccessType.FIELD)
-public class DomainBase extends EppResource
-    implements DatastoreAndSqlEntity,
-        ForeignKeyedEppResource,
-        ResourceWithTransferData<DomainTransferData> {
-
-  /** The max number of years that a domain can be registered for, as set by ICANN policy. */
-  public static final int MAX_REGISTRATION_YEARS = 10;
-
-  /** Status values which prohibit DNS information from being published. */
-  private static final ImmutableSet<StatusValue> DNS_PUBLISHING_PROHIBITED_STATUSES =
-      ImmutableSet.of(
-          StatusValue.CLIENT_HOLD,
-          StatusValue.INACTIVE,
-          StatusValue.PENDING_DELETE,
-          StatusValue.SERVER_HOLD);
-
-  /**
-   * Fully qualified domain name (puny-coded), which serves as the foreign key for this domain.
-   *
-   * <p>This is only unique in the sense that for any given lifetime specified as the time range
-   * from (creationTime, deletionTime) there can only be one domain in Datastore with this name.
-   * However, there can be many domains with the same name and non-overlapping lifetimes.
-   *
-   * @invariant fullyQualifiedDomainName == fullyQualifiedDomainName.toLowerCase(Locale.ENGLISH)
-   */
-  // TODO(b/158858642): Rename this to domainName when we are off Datastore
-  @Column(name = "domainName")
-  @Index
-  String fullyQualifiedDomainName;
-
-  /** The top level domain this is under, dernormalized from {@link #fullyQualifiedDomainName}. */
-  @Index
-  String tld;
-
-  /** References to hosts that are the nameservers for the domain. */
-  @Index
-  @ElementCollection
-  @JoinTable(name = "DomainHost")
-  Set<VKey<HostResource>> nsHosts;
-
-  /**
-   * The union of the contacts visible via {@link #getContacts} and {@link #getRegistrant}.
-   *
-   * <p>These are stored in one field so that we can query across all contacts at once.
-   */
-  @Transient Set<DesignatedContact> allContacts;
-
-  /**
-   * Contacts as they are stored in cloud SQL.
-   *
-   * <p>This information is duplicated in allContacts, and must be kept in sync with it.
-   */
-  @Ignore VKey<ContactResource> adminContact;
-
-  @Ignore VKey<ContactResource> billingContact;
-  @Ignore VKey<ContactResource> techContact;
-  @Ignore VKey<ContactResource> registrantContact;
-
-  /** Authorization info (aka transfer secret) of the domain. */
-  @Embedded
-  @AttributeOverrides({
-    @AttributeOverride(name = "pw.value", column = @Column(name = "auth_info_value")),
-    @AttributeOverride(name = "pw.repoId", column = @Column(name = "auth_info_repo_id")),
-  })
-  DomainAuthInfo authInfo;
-
-  /**
-   * Data used to construct DS records for this domain.
-   *
-   * <p>This is {@literal @}XmlTransient because it needs to be returned under the "extension" tag
-   * of an info response rather than inside the "infData" tag.
-   */
-  @Transient Set<DelegationSignerData> dsData;
-
-  /**
-   * The claims notice supplied when this application or domain was created, if there was one. It's
-   * {@literal @}XmlTransient because it's not returned in an info response.
-   */
-  @IgnoreSave(IfNull.class)
-  @Embedded
-  @AttributeOverrides({
-    @AttributeOverride(name = "noticeId.tcnId", column = @Column(name = "launch_notice_tcn_id")),
-    @AttributeOverride(
-        name = "noticeId.validatorId",
-        column = @Column(name = "launch_notice_validator_id")),
-    @AttributeOverride(
-        name = "expirationTime",
-        column = @Column(name = "launch_notice_expiration_time")),
-    @AttributeOverride(
-        name = "acceptedTime",
-        column = @Column(name = "launch_notice_accepted_time")),
-  })
-  LaunchNotice launchNotice;
-
-  /**
-   * Name of first IDN table associated with TLD that matched the characters in this domain label.
-   *
-   * @see google.registry.tldconfig.idn.IdnLabelValidator#findValidIdnTableForTld
-   */
-  @IgnoreSave(IfNull.class)
-  String idnTableName;
-
-  /** Fully qualified host names of this domain's active subordinate hosts. */
-  Set<String> subordinateHosts;
-
-  /** When this domain's registration will expire. */
-  DateTime registrationExpirationTime;
-
-  /**
-   * The poll message associated with this domain being deleted.
-   *
-   * <p>This field should be null if the domain is not in pending delete. If it is, the field should
-   * refer to a {@link PollMessage} timed to when the domain is fully deleted. If the domain is
-   * restored, the message should be deleted.
-   */
-  @Column(name = "deletion_poll_message_id")
-  VKey<PollMessage.OneTime> deletePollMessage;
-
-  /**
-   * The recurring billing event associated with this domain's autorenewals.
-   *
-   * <p>The recurrence should be open ended unless the domain is in pending delete or fully deleted,
-   * in which case it should be closed at the time the delete was requested. Whenever the domain's
-   * {@link #registrationExpirationTime} is changed the recurrence should be closed, a new one
-   * should be created, and this field should be updated to point to the new one.
-   */
-  @Column(name = "billing_recurrence_id")
-  VKey<BillingEvent.Recurring> autorenewBillingEvent;
-
-  /**
-   * The recurring poll message associated with this domain's autorenewals.
-   *
-   * <p>The recurrence should be open ended unless the domain is in pending delete or fully deleted,
-   * in which case it should be closed at the time the delete was requested. Whenever the domain's
-   * {@link #registrationExpirationTime} is changed the recurrence should be closed, a new one
-   * should be created, and this field should be updated to point to the new one.
-   */
-  @Column(name = "autorenew_poll_message_id")
-  VKey<PollMessage.Autorenew> autorenewPollMessage;
-
-  /** The unexpired grace periods for this domain (some of which may not be active yet). */
-  @Transient @ElementCollection Set<GracePeriod> gracePeriods;
-
-  /**
-   * The id of the signed mark that was used to create this domain in sunrise.
-   *
-   * <p>Will only be populated for domains created in sunrise.
-   */
-  @IgnoreSave(IfNull.class)
-  String smdId;
-
-  /** Data about any pending or past transfers on this domain. */
-  DomainTransferData transferData;
-
-  /**
-   * The time that this resource was last transferred.
-   *
-   * <p>Can be null if the resource has never been transferred.
-   */
-  DateTime lastTransferTime;
-
-  @OnLoad
-  void load() {
-    // Reconstitute all of the contacts so that they have VKeys.
-    allContacts =
-        allContacts.stream().map(contact -> contact.reconstitute()).collect(toImmutableSet());
-    setContactFields(allContacts, true);
-  }
-
-  @PostLoad
-  void postLoad() {
-    // Reconstitute the contact list.
-    ImmutableSet.Builder<DesignatedContact> contactsBuilder =
-        new ImmutableSet.Builder<DesignatedContact>();
-
-    if (registrantContact != null) {
-      contactsBuilder.add(
-          DesignatedContact.create(DesignatedContact.Type.REGISTRANT, registrantContact));
-    }
-    if (billingContact != null) {
-      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.BILLING, billingContact));
-    }
-    if (techContact != null) {
-      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.TECH, techContact));
-    }
-    if (adminContact != null) {
-      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.ADMIN, adminContact));
-    }
-
-    allContacts = contactsBuilder.build();
-  }
+public class DomainBase extends DomainContent
+    implements DatastoreAndSqlEntity, ForeignKeyedEppResource {
 
   @Override
   @javax.persistence.Id
@@ -311,326 +73,37 @@ public class DomainBase extends EppResource
     return super.getRepoId();
   }
 
-  public ImmutableSet<String> getSubordinateHosts() {
-    return nullToEmptyImmutableCopy(subordinateHosts);
-  }
-
-  public DateTime getRegistrationExpirationTime() {
-    return registrationExpirationTime;
-  }
-
-  public VKey<PollMessage.OneTime> getDeletePollMessage() {
-    return deletePollMessage;
-  }
-
-  public VKey<BillingEvent.Recurring> getAutorenewBillingEvent() {
-    return autorenewBillingEvent;
-  }
-
-  public VKey<PollMessage.Autorenew> getAutorenewPollMessage() {
-    return autorenewPollMessage;
-  }
-
-  public ImmutableSet<GracePeriod> getGracePeriods() {
-    return nullToEmptyImmutableCopy(gracePeriods);
-  }
-
-  public String getSmdId() {
-    return smdId;
-  }
-
-  @Override
-  public DomainTransferData getTransferData() {
-    return Optional.ofNullable(transferData).orElse(DomainTransferData.EMPTY);
-  }
-
-  @Override
-  public DateTime getLastTransferTime() {
-    return lastTransferTime;
-  }
-
-  @Override
-  public String getForeignKey() {
-    return fullyQualifiedDomainName;
-  }
-
-  public String getDomainName() {
-    return fullyQualifiedDomainName;
-  }
-
-  public ImmutableSet<DelegationSignerData> getDsData() {
-    return nullToEmptyImmutableCopy(dsData);
-  }
-
-  public LaunchNotice getLaunchNotice() {
-    return launchNotice;
-  }
-
-  public String getIdnTableName() {
-    return idnTableName;
-  }
-
-  public ImmutableSet<VKey<HostResource>> getNameservers() {
-    return nullToEmptyImmutableCopy(nsHosts);
-  }
-
-  public final String getCurrentSponsorClientId() {
-    return getPersistedCurrentSponsorClientId();
-  }
-
-  /** Returns true if DNS information should be published for the given domain. */
-  public boolean shouldPublishToDns() {
-    return intersection(getStatusValues(), DNS_PUBLISHING_PROHIBITED_STATUSES).isEmpty();
+  @ElementCollection
+  @JoinTable(name = "DomainHost")
+  @Access(AccessType.PROPERTY)
+  @Column(name = "host_repo_id")
+  public Set<VKey<HostResource>> getNsHosts() {
+    return super.nsHosts;
   }
 
   /**
-   * Returns the Registry Grace Period Statuses for this domain.
+   * Returns the set of {@link GracePeriod} associated with the domain.
    *
-   * <p>This collects all statuses from the domain's {@link GracePeriod} entries and also adds the
-   * PENDING_DELETE status if needed.
-   */
-  public ImmutableSet<GracePeriodStatus> getGracePeriodStatuses() {
-    Set<GracePeriodStatus> gracePeriodStatuses = new HashSet<>();
-    for (GracePeriod gracePeriod : getGracePeriods()) {
-      gracePeriodStatuses.add(gracePeriod.getType());
-    }
-    if (getStatusValues().contains(StatusValue.PENDING_DELETE)
-        && !gracePeriodStatuses.contains(GracePeriodStatus.REDEMPTION)) {
-      gracePeriodStatuses.add(GracePeriodStatus.PENDING_DELETE);
-    }
-    return ImmutableSet.copyOf(gracePeriodStatuses);
-  }
-
-  /** Returns the subset of grace periods having the specified type. */
-  public ImmutableSet<GracePeriod> getGracePeriodsOfType(GracePeriodStatus gracePeriodType) {
-    ImmutableSet.Builder<GracePeriod> builder = new ImmutableSet.Builder<>();
-    for (GracePeriod gracePeriod : getGracePeriods()) {
-      if (gracePeriod.getType() == gracePeriodType) {
-        builder.add(gracePeriod);
-      }
-    }
-    return builder.build();
-  }
-
-  /**
-   * The logic in this method, which handles implicit server approval of transfers, very closely
-   * parallels the logic in {@code DomainTransferApproveFlow} which handles explicit client
-   * approvals.
-   */
-  @Override
-  public DomainBase cloneProjectedAtTime(final DateTime now) {
-
-    DomainTransferData transferData = getTransferData();
-    DateTime transferExpirationTime = transferData.getPendingTransferExpirationTime();
-
-    // If there's a pending transfer that has expired, handle it.
-    if (TransferStatus.PENDING.equals(transferData.getTransferStatus())
-        && isBeforeOrAt(transferExpirationTime, now)) {
-      // Project until just before the transfer time. This will handle the case of an autorenew
-      // before the transfer was even requested or during the request period.
-      // If the transfer time is precisely the moment that the domain expires, there will not be an
-      // autorenew billing event (since we end the recurrence at transfer time and recurrences are
-      // exclusive of their ending), and we can just proceed with the transfer.
-      DomainBase domainAtTransferTime =
-          cloneProjectedAtTime(transferExpirationTime.minusMillis(1));
-
-      DateTime expirationDate = transferData.getTransferredRegistrationExpirationTime();
-      if (expirationDate == null) {
-        // Extend the registration by the correct number of years from the expiration time
-        // that was current on the domain right before the transfer, capped at 10 years from
-        // the moment of the transfer.
-        expirationDate =
-            ResourceFlowUtils.computeExDateForApprovalTime(
-                domainAtTransferTime, transferExpirationTime, transferData.getTransferPeriod());
-      }
-      // If we are within an autorenew grace period, the transfer will subsume the autorenew. There
-      // will already be a cancellation written in advance by the transfer request flow, so we don't
-      // need to worry about billing, but we do need to cancel out the expiration time increase.
-      // The transfer period saved in the transfer data will be one year, unless the superuser
-      // extension set the transfer period to zero.
-      // Set the expiration, autorenew events, and grace period for the transfer. (Transfer ends
-      // all other graces).
-      Builder builder =
-          domainAtTransferTime
-              .asBuilder()
-              .setRegistrationExpirationTime(expirationDate)
-              // Set the speculatively-written new autorenew events as the domain's autorenew
-              // events.
-              .setAutorenewBillingEvent(transferData.getServerApproveAutorenewEvent())
-              .setAutorenewPollMessage(transferData.getServerApproveAutorenewPollMessage());
-      if (transferData.getTransferPeriod().getValue() == 1) {
-        // Set the grace period using a key to the prescheduled transfer billing event.  Not using
-        // GracePeriod.forBillingEvent() here in order to avoid the actual Datastore fetch.
-        builder.setGracePeriods(
-            ImmutableSet.of(
-                GracePeriod.create(
-                    GracePeriodStatus.TRANSFER,
-                    transferExpirationTime.plus(
-                        Registry.get(getTld()).getTransferGracePeriodLength()),
-                    transferData.getGainingClientId(),
-                    transferData.getServerApproveBillingEvent())));
-      } else {
-        // There won't be a billing event, so we don't need a grace period
-        builder.setGracePeriods(ImmutableSet.of());
-      }
-      // Set all remaining transfer properties.
-      setAutomaticTransferSuccessProperties(builder, transferData);
-      builder
-          .setLastEppUpdateTime(transferExpirationTime)
-          .setLastEppUpdateClientId(transferData.getGainingClientId());
-      // Finish projecting to now.
-      return builder.build().cloneProjectedAtTime(now);
-    }
-
-    Optional<DateTime> newLastEppUpdateTime = Optional.empty();
-
-    // There is no transfer. Do any necessary autorenews for active domains.
-
-    Builder builder = asBuilder();
-    if (isBeforeOrAt(registrationExpirationTime, now) && END_OF_TIME.equals(getDeletionTime())) {
-      // Autorenew by the number of years between the old expiration time and now.
-      DateTime lastAutorenewTime = leapSafeAddYears(
-          registrationExpirationTime,
-          new Interval(registrationExpirationTime, now).toPeriod().getYears());
-      DateTime newExpirationTime  = lastAutorenewTime.plusYears(1);
-      builder
-          .setRegistrationExpirationTime(newExpirationTime)
-          .addGracePeriod(
-              GracePeriod.createForRecurring(
-                  GracePeriodStatus.AUTO_RENEW,
-                  lastAutorenewTime.plus(Registry.get(getTld()).getAutoRenewGracePeriodLength()),
-                  getCurrentSponsorClientId(),
-                  autorenewBillingEvent));
-      newLastEppUpdateTime = Optional.of(lastAutorenewTime);
-    }
-
-    // Remove any grace periods that have expired.
-    DomainBase almostBuilt = builder.build();
-    builder = almostBuilt.asBuilder();
-    for (GracePeriod gracePeriod : almostBuilt.getGracePeriods()) {
-      if (isBeforeOrAt(gracePeriod.getExpirationTime(), now)) {
-        builder.removeGracePeriod(gracePeriod);
-        if (!newLastEppUpdateTime.isPresent()
-            || isBeforeOrAt(newLastEppUpdateTime.get(), gracePeriod.getExpirationTime())) {
-          newLastEppUpdateTime = Optional.of(gracePeriod.getExpirationTime());
-        }
-      }
-    }
-
-    // It is possible that the lastEppUpdateClientId is different from current sponsor client
-    // id, so we have to do the comparison instead of having one variable just storing the most
-    // recent time.
-    if (newLastEppUpdateTime.isPresent()) {
-      if (getLastEppUpdateTime() == null
-          || newLastEppUpdateTime.get().isAfter(getLastEppUpdateTime())) {
-        builder
-            .setLastEppUpdateTime(newLastEppUpdateTime.get())
-            .setLastEppUpdateClientId(getCurrentSponsorClientId());
-      }
-    }
-
-    // Handle common properties like setting or unsetting linked status. This also handles the
-    // general case of pending transfers for other resource types, but since we've always handled
-    // a pending transfer by this point that's a no-op for domains.
-    projectResourceOntoBuilderAtTime(almostBuilt, builder, now);
-    return builder.build();
-  }
-
-  /** Return what the expiration time would be if the given number of years were added to it. */
-  public static DateTime extendRegistrationWithCap(
-      DateTime now,
-      DateTime currentExpirationTime,
-      @Nullable Integer extendedRegistrationYears) {
-    // We must cap registration at the max years (aka 10), even if that truncates the last year.
-    return earliestOf(
-        leapSafeAddYears(
-            currentExpirationTime,
-            Optional.ofNullable(extendedRegistrationYears).orElse(0)),
-        leapSafeAddYears(now, MAX_REGISTRATION_YEARS));
-  }
-
-  /** Loads and returns the fully qualified host names of all linked nameservers. */
-  public ImmutableSortedSet<String> loadNameserverHostNames() {
-    return ofy()
-        .load()
-        .keys(getNameservers().stream().map(VKey::getOfyKey).collect(toImmutableSet()))
-        .values()
-        .stream()
-        .map(HostResource::getHostName)
-        .collect(toImmutableSortedSet(Ordering.natural()));
-  }
-
-  /** A key to the registrant who registered this domain. */
-  public VKey<ContactResource> getRegistrant() {
-    return registrantContact;
-  }
-
-  public VKey<ContactResource> getAdminContact() {
-    return adminContact;
-  }
-
-  public VKey<ContactResource> getBillingContact() {
-    return billingContact;
-  }
-
-  public VKey<ContactResource> getTechContact() {
-    return techContact;
-  }
-
-  /** Associated contacts for the domain (other than registrant). */
-  public ImmutableSet<DesignatedContact> getContacts() {
-    return nullToEmpty(allContacts)
-        .stream()
-        .filter(IS_REGISTRANT.negate())
-        .collect(toImmutableSet());
-  }
-
-  public DomainAuthInfo getAuthInfo() {
-    return authInfo;
-  }
-
-  /** Returns all referenced contacts from this domain or application. */
-  public ImmutableSet<VKey<ContactResource>> getReferencedContacts() {
-    return nullToEmptyImmutableCopy(allContacts)
-        .stream()
-        .map(DesignatedContact::getContactKey)
-        .filter(Objects::nonNull)
-        .collect(toImmutableSet());
-  }
-
-  public String getTld() {
-    return tld;
-  }
-
-  /**
-   * Sets the individual contact fields from {@code contacts}.
+   * <p>This is the getter method specific for Hibernate to access the field so it is set to
+   * private. The caller can use the public {@link #getGracePeriods()} to get the grace periods.
    *
-   * <p>The registrant field is only set if {@code includeRegistrant} is true, as this field needs
-   * to be set in some circumstances but not in others.
+   * <p>Note that we need to set `insertable = false, updatable = false` for @JoinColumn, otherwise
+   * Hibernate would try to set the foreign key to null(through an UPDATE TABLE sql) instead of
+   * deleting the whole entry from the table when the {@link GracePeriod} is removed from the set.
    */
-  private void setContactFields(Set<DesignatedContact> contacts, boolean includeRegistrant) {
-
-    // Set the individual contact fields.
-    for (DesignatedContact contact : contacts) {
-      switch (contact.getType()) {
-        case BILLING:
-          billingContact = contact.getContactKey();
-          break;
-        case TECH:
-          techContact = contact.getContactKey();
-          break;
-        case ADMIN:
-          adminContact = contact.getContactKey();
-          break;
-        case REGISTRANT:
-          if (includeRegistrant) {
-            registrantContact = contact.getContactKey();
-          }
-          break;
-        default:
-          throw new IllegalArgumentException("Unknown contact resource type: " + contact.getType());
-      }
-    }
+  @Access(AccessType.PROPERTY)
+  @OneToMany(
+      cascade = {CascadeType.ALL},
+      fetch = FetchType.EAGER,
+      orphanRemoval = true)
+  @JoinColumn(
+      name = "domainRepoId",
+      referencedColumnName = "repoId",
+      insertable = false,
+      updatable = false)
+  @SuppressWarnings("UnusedMethod")
+  private Set<GracePeriod> getInternalGracePeriods() {
+    return gracePeriods;
   }
 
   @Override
@@ -638,9 +111,14 @@ public class DomainBase extends EppResource
     return VKey.create(DomainBase.class, getRepoId(), Key.create(this));
   }
 
-  /** Predicate to determine if a given {@link DesignatedContact} is the registrant. */
-  private static final Predicate<DesignatedContact> IS_REGISTRANT =
-      (DesignatedContact contact) -> DesignatedContact.Type.REGISTRANT.equals(contact.type);
+  @Override
+  public DomainBase cloneProjectedAtTime(final DateTime now) {
+    return cloneDomainProjectedAtTime(this, now);
+  }
+
+  public static VKey<DomainBase> createVKey(Key<DomainBase> key) {
+    return VKey.create(DomainBase.class, key.getName(), key);
+  }
 
   /** An override of {@link EppResource#asBuilder} with tighter typing. */
   @Override
@@ -649,199 +127,12 @@ public class DomainBase extends EppResource
   }
 
   /** A builder for constructing {@link DomainBase}, since it is immutable. */
-  public static class Builder extends EppResource.Builder<DomainBase, Builder>
-      implements BuilderWithTransferData<DomainTransferData, Builder> {
+  public static class Builder extends DomainContent.Builder<DomainBase, Builder> {
 
     public Builder() {}
 
     Builder(DomainBase instance) {
       super(instance);
     }
-
-    @Override
-    public DomainBase build() {
-      DomainBase instance = getInstance();
-      // If TransferData is totally empty, set it to null.
-      if (DomainTransferData.EMPTY.equals(getInstance().transferData)) {
-        setTransferData(null);
-      }
-      // A DomainBase has status INACTIVE if there are no nameservers.
-      if (getInstance().getNameservers().isEmpty()) {
-        addStatusValue(StatusValue.INACTIVE);
-      } else {  // There are nameservers, so make sure INACTIVE isn't there.
-        removeStatusValue(StatusValue.INACTIVE);
-      }
-
-      checkArgumentNotNull(emptyToNull(instance.fullyQualifiedDomainName), "Missing domainName");
-      if (instance.getRegistrant() == null
-          && instance.allContacts.stream().anyMatch(IS_REGISTRANT)) {
-        throw new IllegalArgumentException("registrant is null but is in allContacts");
-      }
-      checkArgumentNotNull(instance.getRegistrant(), "Missing registrant");
-      instance.tld = getTldFromDomainName(instance.fullyQualifiedDomainName);
-      return super.build();
-    }
-
-    public Builder setDomainName(String domainName) {
-      checkArgument(
-          domainName.equals(canonicalizeDomainName(domainName)),
-          "Domain name must be in puny-coded, lower-case form");
-      getInstance().fullyQualifiedDomainName = domainName;
-      return thisCastToDerived();
-    }
-
-    public Builder setDsData(ImmutableSet<DelegationSignerData> dsData) {
-      getInstance().dsData = dsData;
-      return thisCastToDerived();
-    }
-
-    public Builder setRegistrant(VKey<ContactResource> registrant) {
-      // Replace the registrant contact inside allContacts.
-      getInstance().allContacts = union(
-          getInstance().getContacts(),
-          DesignatedContact.create(Type.REGISTRANT, checkArgumentNotNull(registrant)));
-
-      // Set the registrant field specifically.
-      getInstance().registrantContact = registrant;
-      return thisCastToDerived();
-    }
-
-    public Builder setAuthInfo(DomainAuthInfo authInfo) {
-      getInstance().authInfo = authInfo;
-      return thisCastToDerived();
-    }
-
-    public Builder setNameservers(VKey<HostResource> nameserver) {
-      getInstance().nsHosts = ImmutableSet.of(nameserver);
-      return thisCastToDerived();
-    }
-
-    public Builder setNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
-      getInstance().nsHosts = forceEmptyToNull(nameservers);
-      return thisCastToDerived();
-    }
-
-    public Builder addNameserver(VKey<HostResource> nameserver) {
-      return addNameservers(ImmutableSet.of(nameserver));
-    }
-
-    public Builder addNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
-      return setNameservers(
-          ImmutableSet.copyOf(union(getInstance().getNameservers(), nameservers)));
-    }
-
-    public Builder removeNameserver(VKey<HostResource> nameserver) {
-      return removeNameservers(ImmutableSet.of(nameserver));
-    }
-
-    public Builder removeNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
-      return setNameservers(
-          ImmutableSet.copyOf(difference(getInstance().getNameservers(), nameservers)));
-    }
-
-    public Builder setContacts(DesignatedContact contact) {
-      return setContacts(ImmutableSet.of(contact));
-    }
-
-    public Builder setContacts(ImmutableSet<DesignatedContact> contacts) {
-      checkArgument(contacts.stream().noneMatch(IS_REGISTRANT), "Registrant cannot be a contact");
-
-      // Replace the non-registrant contacts inside allContacts.
-      getInstance().allContacts =
-          Streams.concat(
-                  nullToEmpty(getInstance().allContacts).stream().filter(IS_REGISTRANT),
-                  contacts.stream())
-              .collect(toImmutableSet());
-
-      // Set the individual fields.
-      getInstance().setContactFields(contacts, false);
-      return thisCastToDerived();
-    }
-
-    public Builder addContacts(ImmutableSet<DesignatedContact> contacts) {
-      return setContacts(ImmutableSet.copyOf(union(getInstance().getContacts(), contacts)));
-    }
-
-    public Builder removeContacts(ImmutableSet<DesignatedContact> contacts) {
-      return setContacts(ImmutableSet.copyOf(difference(getInstance().getContacts(), contacts)));
-    }
-
-    public Builder setLaunchNotice(LaunchNotice launchNotice) {
-      getInstance().launchNotice = launchNotice;
-      return thisCastToDerived();
-    }
-
-    public Builder setIdnTableName(String idnTableName) {
-      getInstance().idnTableName = idnTableName;
-      return thisCastToDerived();
-    }
-
-    public Builder setSubordinateHosts(ImmutableSet<String> subordinateHosts) {
-      getInstance().subordinateHosts = subordinateHosts;
-      return thisCastToDerived();
-    }
-
-    public Builder addSubordinateHost(String hostToAdd) {
-      return setSubordinateHosts(ImmutableSet.copyOf(
-          union(getInstance().getSubordinateHosts(), hostToAdd)));
-    }
-
-    public Builder removeSubordinateHost(String hostToRemove) {
-      return setSubordinateHosts(ImmutableSet.copyOf(
-          CollectionUtils.difference(getInstance().getSubordinateHosts(), hostToRemove)));
-    }
-
-    public Builder setRegistrationExpirationTime(DateTime registrationExpirationTime) {
-      getInstance().registrationExpirationTime = registrationExpirationTime;
-      return this;
-    }
-
-    public Builder setDeletePollMessage(VKey<PollMessage.OneTime> deletePollMessage) {
-      getInstance().deletePollMessage = deletePollMessage;
-      return this;
-    }
-
-    public Builder setAutorenewBillingEvent(VKey<BillingEvent.Recurring> autorenewBillingEvent) {
-      getInstance().autorenewBillingEvent = autorenewBillingEvent;
-      return this;
-    }
-
-    public Builder setAutorenewPollMessage(VKey<PollMessage.Autorenew> autorenewPollMessage) {
-      getInstance().autorenewPollMessage = autorenewPollMessage;
-      return this;
-    }
-
-    public Builder setSmdId(String smdId) {
-      getInstance().smdId = smdId;
-      return this;
-    }
-
-    public Builder setGracePeriods(ImmutableSet<GracePeriod> gracePeriods) {
-      getInstance().gracePeriods = gracePeriods;
-      return this;
-    }
-
-    public Builder addGracePeriod(GracePeriod gracePeriod) {
-      getInstance().gracePeriods = union(getInstance().getGracePeriods(), gracePeriod);
-      return this;
-    }
-
-    public Builder removeGracePeriod(GracePeriod gracePeriod) {
-      getInstance().gracePeriods = CollectionUtils
-          .difference(getInstance().getGracePeriods(), gracePeriod);
-      return this;
-    }
-
-    @Override
-    public Builder setTransferData(DomainTransferData transferData) {
-      getInstance().transferData = transferData;
-      return thisCastToDerived();
-    }
-
-    @Override
-    public Builder setLastTransferTime(DateTime lastTransferTime) {
-      getInstance().lastTransferTime = lastTransferTime;
-      return thisCastToDerived();
-    }
   }
 }

core/src/main/java/google/registry/model/domain/DomainContent.java

@@ -0,0 +1,878 @@
+// 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.model.domain;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Strings.emptyToNull;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
+import static com.google.common.collect.Sets.difference;
+import static com.google.common.collect.Sets.intersection;
+import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime;
+import static google.registry.model.EppResourceUtils.setAutomaticTransferSuccessProperties;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.util.CollectionUtils.forceEmptyToNull;
+import static google.registry.util.CollectionUtils.nullToEmpty;
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+import static google.registry.util.CollectionUtils.union;
+import static google.registry.util.DateTimeUtils.END_OF_TIME;
+import static google.registry.util.DateTimeUtils.earliestOf;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.util.DateTimeUtils.leapSafeAddYears;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
+import static google.registry.util.DomainNameUtils.getTldFromDomainName;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Streams;
+import com.googlecode.objectify.annotation.Ignore;
+import com.googlecode.objectify.annotation.IgnoreSave;
+import com.googlecode.objectify.annotation.Index;
+import com.googlecode.objectify.annotation.OnLoad;
+import com.googlecode.objectify.condition.IfNull;
+import google.registry.flows.ResourceFlowUtils;
+import google.registry.model.EppResource;
+import google.registry.model.EppResource.ResourceWithTransferData;
+import google.registry.model.billing.BillingEvent;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.launch.LaunchNotice;
+import google.registry.model.domain.rgp.GracePeriodStatus;
+import google.registry.model.domain.secdns.DelegationSignerData;
+import google.registry.model.eppcommon.StatusValue;
+import google.registry.model.host.HostResource;
+import google.registry.model.poll.PollMessage;
+import google.registry.model.registry.Registry;
+import google.registry.model.transfer.DomainTransferData;
+import google.registry.model.transfer.TransferStatus;
+import google.registry.persistence.VKey;
+import google.registry.util.CollectionUtils;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import javax.annotation.Nullable;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.PostLoad;
+import javax.persistence.Transient;
+import org.joda.time.DateTime;
+import org.joda.time.Interval;
+
+/**
+ * A persistable domain resource including mutable and non-mutable fields.
+ *
+ * <p>This class deliberately does not include an {@link javax.persistence.Id} so that any
+ * foreign-keyed fields can refer to the proper parent entity's ID, whether we're storing this in
+ * the DB itself or as part of another entity.
+ *
+ * <p>For historical reasons, the name of this class is "DomainContent". Ideally it would be
+ * "DomainBase" for parallelism with the other {@link EppResource} entity classes, but because that
+ * name is already taken by {@link DomainBase} (also for historical reasons), we can't use it. Once
+ * we are no longer on Datastore, we can rename the classes.
+ *
+ * @see <a href="https://tools.ietf.org/html/rfc5731">RFC 5731</a>
+ */
+@MappedSuperclass
+@Embeddable
+@Access(AccessType.FIELD)
+public class DomainContent extends EppResource
+    implements ResourceWithTransferData<DomainTransferData> {
+
+  /** The max number of years that a domain can be registered for, as set by ICANN policy. */
+  public static final int MAX_REGISTRATION_YEARS = 10;
+
+  /** Status values which prohibit DNS information from being published. */
+  private static final ImmutableSet<StatusValue> DNS_PUBLISHING_PROHIBITED_STATUSES =
+      ImmutableSet.of(
+          StatusValue.CLIENT_HOLD,
+          StatusValue.INACTIVE,
+          StatusValue.PENDING_DELETE,
+          StatusValue.SERVER_HOLD);
+
+  /**
+   * Fully qualified domain name (puny-coded), which serves as the foreign key for this domain.
+   *
+   * <p>This is only unique in the sense that for any given lifetime specified as the time range
+   * from (creationTime, deletionTime) there can only be one domain in Datastore with this name.
+   * However, there can be many domains with the same name and non-overlapping lifetimes.
+   *
+   * @invariant fullyQualifiedDomainName == fullyQualifiedDomainName.toLowerCase(Locale.ENGLISH)
+   */
+  // TODO(b/158858642): Rename this to domainName when we are off Datastore
+  @Column(name = "domainName")
+  @Index
+  String fullyQualifiedDomainName;
+
+  /** The top level domain this is under, dernormalized from {@link #fullyQualifiedDomainName}. */
+  @Index String tld;
+
+  /** References to hosts that are the nameservers for the domain. */
+  @Index @Transient Set<VKey<HostResource>> nsHosts;
+
+  /**
+   * The union of the contacts visible via {@link #getContacts} and {@link #getRegistrant}.
+   *
+   * <p>These are stored in one field so that we can query across all contacts at once.
+   */
+  @Transient Set<DesignatedContact> allContacts;
+
+  /**
+   * Contacts as they are stored in cloud SQL.
+   *
+   * <p>This information is duplicated in allContacts, and must be kept in sync with it.
+   */
+  @Ignore VKey<ContactResource> adminContact;
+
+  @Ignore VKey<ContactResource> billingContact;
+  @Ignore VKey<ContactResource> techContact;
+  @Ignore VKey<ContactResource> registrantContact;
+
+  /** Authorization info (aka transfer secret) of the domain. */
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(name = "pw.value", column = @Column(name = "auth_info_value")),
+    @AttributeOverride(name = "pw.repoId", column = @Column(name = "auth_info_repo_id")),
+  })
+  DomainAuthInfo authInfo;
+
+  /**
+   * Data used to construct DS records for this domain.
+   *
+   * <p>This is {@literal @}XmlTransient because it needs to be returned under the "extension" tag
+   * of an info response rather than inside the "infData" tag.
+   */
+  @Transient Set<DelegationSignerData> dsData;
+
+  /**
+   * The claims notice supplied when this application or domain was created, if there was one. It's
+   * {@literal @}XmlTransient because it's not returned in an info response.
+   */
+  @IgnoreSave(IfNull.class)
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(name = "noticeId.tcnId", column = @Column(name = "launch_notice_tcn_id")),
+    @AttributeOverride(
+        name = "noticeId.validatorId",
+        column = @Column(name = "launch_notice_validator_id")),
+    @AttributeOverride(
+        name = "expirationTime",
+        column = @Column(name = "launch_notice_expiration_time")),
+    @AttributeOverride(
+        name = "acceptedTime",
+        column = @Column(name = "launch_notice_accepted_time")),
+  })
+  LaunchNotice launchNotice;
+
+  /**
+   * Name of first IDN table associated with TLD that matched the characters in this domain label.
+   *
+   * @see google.registry.tldconfig.idn.IdnLabelValidator#findValidIdnTableForTld
+   */
+  @IgnoreSave(IfNull.class)
+  String idnTableName;
+
+  /** Fully qualified host names of this domain's active subordinate hosts. */
+  Set<String> subordinateHosts;
+
+  /** When this domain's registration will expire. */
+  DateTime registrationExpirationTime;
+
+  /**
+   * The poll message associated with this domain being deleted.
+   *
+   * <p>This field should be null if the domain is not in pending delete. If it is, the field should
+   * refer to a {@link PollMessage} timed to when the domain is fully deleted. If the domain is
+   * restored, the message should be deleted.
+   */
+  @Column(name = "deletion_poll_message_id")
+  VKey<PollMessage.OneTime> deletePollMessage;
+
+  /**
+   * The recurring billing event associated with this domain's autorenewals.
+   *
+   * <p>The recurrence should be open ended unless the domain is in pending delete or fully deleted,
+   * in which case it should be closed at the time the delete was requested. Whenever the domain's
+   * {@link #registrationExpirationTime} is changed the recurrence should be closed, a new one
+   * should be created, and this field should be updated to point to the new one.
+   */
+  @Column(name = "billing_recurrence_id")
+  VKey<BillingEvent.Recurring> autorenewBillingEvent;
+
+  /**
+   * The recurring poll message associated with this domain's autorenewals.
+   *
+   * <p>The recurrence should be open ended unless the domain is in pending delete or fully deleted,
+   * in which case it should be closed at the time the delete was requested. Whenever the domain's
+   * {@link #registrationExpirationTime} is changed the recurrence should be closed, a new one
+   * should be created, and this field should be updated to point to the new one.
+   */
+  @Column(name = "autorenew_poll_message_id")
+  VKey<PollMessage.Autorenew> autorenewPollMessage;
+
+  /** The unexpired grace periods for this domain (some of which may not be active yet). */
+  @Transient Set<GracePeriod> gracePeriods;
+
+  /**
+   * The id of the signed mark that was used to create this domain in sunrise.
+   *
+   * <p>Will only be populated for domains created in sunrise.
+   */
+  @IgnoreSave(IfNull.class)
+  String smdId;
+
+  /** Data about any pending or past transfers on this domain. */
+  DomainTransferData transferData;
+
+  /**
+   * The time that this resource was last transferred.
+   *
+   * <p>Can be null if the resource has never been transferred.
+   */
+  DateTime lastTransferTime;
+
+  /**
+   * When the domain's autorenewal status will expire.
+   *
+   * <p>This will be null for the vast majority of domains because all domains autorenew
+   * indefinitely by default and autorenew can only be countermanded by administrators, typically
+   * for reasons of the URS process or termination of a registrar for nonpayment.
+   *
+   * <p>When a domain is scheduled to not autorenew, this field is set to the current value of its
+   * {@link #registrationExpirationTime}, after which point the next invocation of a periodic
+   * cronjob will explicitly delete the domain. This field is a DateTime and not a boolean because
+   * of edge cases that occur during the autorenew grace period. We need to be able to tell the
+   * difference domains that have reached their life and must be deleted now, and domains that
+   * happen to be in the autorenew grace period now but should be deleted in roughly a year.
+   */
+  @Nullable @Index DateTime autorenewEndTime;
+
+  @OnLoad
+  void load() {
+    // Reconstitute all of the contacts so that they have VKeys.
+    allContacts =
+        allContacts.stream().map(DesignatedContact::reconstitute).collect(toImmutableSet());
+    setContactFields(allContacts, true);
+
+    // We have to return the cloned object here because the original object's
+    // hashcode is not correct due to the change to its domainRepoId. The cloned
+    // object will have a null hashcode so that it can get a recalculated hashcode
+    // when its hashCode() is invoked.
+    // TODO(b/162739503): Remove this after fully migrating to Cloud SQL.
+    gracePeriods =
+        nullToEmptyImmutableCopy(gracePeriods).stream()
+            .map(gracePeriod -> gracePeriod.cloneWithDomainRepoId(getRepoId()))
+            .collect(toImmutableSet());
+  }
+
+  @PostLoad
+  void postLoad() {
+    // Reconstitute the contact list.
+    ImmutableSet.Builder<DesignatedContact> contactsBuilder = new ImmutableSet.Builder<>();
+
+    if (registrantContact != null) {
+      contactsBuilder.add(
+          DesignatedContact.create(DesignatedContact.Type.REGISTRANT, registrantContact));
+    }
+    if (billingContact != null) {
+      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.BILLING, billingContact));
+    }
+    if (techContact != null) {
+      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.TECH, techContact));
+    }
+    if (adminContact != null) {
+      contactsBuilder.add(DesignatedContact.create(DesignatedContact.Type.ADMIN, adminContact));
+    }
+
+    allContacts = contactsBuilder.build();
+  }
+
+  public ImmutableSet<String> getSubordinateHosts() {
+    return nullToEmptyImmutableCopy(subordinateHosts);
+  }
+
+  public DateTime getRegistrationExpirationTime() {
+    return registrationExpirationTime;
+  }
+
+  public VKey<PollMessage.OneTime> getDeletePollMessage() {
+    return deletePollMessage;
+  }
+
+  public VKey<BillingEvent.Recurring> getAutorenewBillingEvent() {
+    return autorenewBillingEvent;
+  }
+
+  public VKey<PollMessage.Autorenew> getAutorenewPollMessage() {
+    return autorenewPollMessage;
+  }
+
+  public ImmutableSet<GracePeriod> getGracePeriods() {
+    return nullToEmptyImmutableCopy(gracePeriods);
+  }
+
+  public String getSmdId() {
+    return smdId;
+  }
+
+  public Optional<DateTime> getAutorenewEndTime() {
+    return Optional.ofNullable(autorenewEndTime);
+  }
+
+  @Override
+  public DomainTransferData getTransferData() {
+    return Optional.ofNullable(transferData).orElse(DomainTransferData.EMPTY);
+  }
+
+  @Override
+  public DateTime getLastTransferTime() {
+    return lastTransferTime;
+  }
+
+  @Override
+  public String getForeignKey() {
+    return fullyQualifiedDomainName;
+  }
+
+  public String getDomainName() {
+    return fullyQualifiedDomainName;
+  }
+
+  public ImmutableSet<DelegationSignerData> getDsData() {
+    return nullToEmptyImmutableCopy(dsData);
+  }
+
+  public LaunchNotice getLaunchNotice() {
+    return launchNotice;
+  }
+
+  public String getIdnTableName() {
+    return idnTableName;
+  }
+
+  public ImmutableSet<VKey<HostResource>> getNameservers() {
+    return nullToEmptyImmutableCopy(nsHosts);
+  }
+
+  // Hibernate needs this in order to populate nsHosts but no one else should ever use it
+  @SuppressWarnings("UnusedMethod")
+  private void setNsHosts(Set<VKey<HostResource>> nsHosts) {
+    this.nsHosts = forceEmptyToNull(nsHosts);
+  }
+
+  // Hibernate needs this in order to populate gracePeriods but no one else should ever use it
+  @SuppressWarnings("UnusedMethod")
+  private void setInternalGracePeriods(Set<GracePeriod> gracePeriods) {
+    this.gracePeriods = gracePeriods;
+  }
+
+  public final String getCurrentSponsorClientId() {
+    return getPersistedCurrentSponsorClientId();
+  }
+
+  /** Returns true if DNS information should be published for the given domain. */
+  public boolean shouldPublishToDns() {
+    return intersection(getStatusValues(), DNS_PUBLISHING_PROHIBITED_STATUSES).isEmpty();
+  }
+
+  /**
+   * Returns the Registry Grace Period Statuses for this domain.
+   *
+   * <p>This collects all statuses from the domain's {@link GracePeriod} entries and also adds the
+   * PENDING_DELETE status if needed.
+   */
+  public ImmutableSet<GracePeriodStatus> getGracePeriodStatuses() {
+    Set<GracePeriodStatus> gracePeriodStatuses = new HashSet<>();
+    for (GracePeriod gracePeriod : getGracePeriods()) {
+      gracePeriodStatuses.add(gracePeriod.getType());
+    }
+    if (getStatusValues().contains(StatusValue.PENDING_DELETE)
+        && !gracePeriodStatuses.contains(GracePeriodStatus.REDEMPTION)) {
+      gracePeriodStatuses.add(GracePeriodStatus.PENDING_DELETE);
+    }
+    return ImmutableSet.copyOf(gracePeriodStatuses);
+  }
+
+  /** Returns the subset of grace periods having the specified type. */
+  public ImmutableSet<GracePeriod> getGracePeriodsOfType(GracePeriodStatus gracePeriodType) {
+    ImmutableSet.Builder<GracePeriod> builder = new ImmutableSet.Builder<>();
+    for (GracePeriod gracePeriod : getGracePeriods()) {
+      if (gracePeriod.getType() == gracePeriodType) {
+        builder.add(gracePeriod);
+      }
+    }
+    return builder.build();
+  }
+
+  @Override
+  public DomainContent cloneProjectedAtTime(final DateTime now) {
+    return cloneDomainProjectedAtTime(this, now);
+  }
+
+  /**
+   * The logic in this method, which handles implicit server approval of transfers, very closely
+   * parallels the logic in {@code DomainTransferApproveFlow} which handles explicit client
+   * approvals.
+   */
+  static <T extends DomainContent> T cloneDomainProjectedAtTime(T domain, DateTime now) {
+    DomainTransferData transferData = domain.getTransferData();
+    DateTime transferExpirationTime = transferData.getPendingTransferExpirationTime();
+
+    // If there's a pending transfer that has expired, handle it.
+    if (TransferStatus.PENDING.equals(transferData.getTransferStatus())
+        && isBeforeOrAt(transferExpirationTime, now)) {
+      // Project until just before the transfer time. This will handle the case of an autorenew
+      // before the transfer was even requested or during the request period.
+      // If the transfer time is precisely the moment that the domain expires, there will not be an
+      // autorenew billing event (since we end the recurrence at transfer time and recurrences are
+      // exclusive of their ending), and we can just proceed with the transfer.
+      T domainAtTransferTime =
+          cloneDomainProjectedAtTime(domain, transferExpirationTime.minusMillis(1));
+
+      DateTime expirationDate = transferData.getTransferredRegistrationExpirationTime();
+      if (expirationDate == null) {
+        // Extend the registration by the correct number of years from the expiration time
+        // that was current on the domain right before the transfer, capped at 10 years from
+        // the moment of the transfer.
+        expirationDate =
+            ResourceFlowUtils.computeExDateForApprovalTime(
+                domainAtTransferTime, transferExpirationTime, transferData.getTransferPeriod());
+      }
+      // If we are within an autorenew grace period, the transfer will subsume the autorenew. There
+      // will already be a cancellation written in advance by the transfer request flow, so we don't
+      // need to worry about billing, but we do need to cancel out the expiration time increase.
+      // The transfer period saved in the transfer data will be one year, unless the superuser
+      // extension set the transfer period to zero.
+      // Set the expiration, autorenew events, and grace period for the transfer. (Transfer ends
+      // all other graces).
+      Builder builder =
+          domainAtTransferTime
+              .asBuilder()
+              .setRegistrationExpirationTime(expirationDate)
+              // Set the speculatively-written new autorenew events as the domain's autorenew
+              // events.
+              .setAutorenewBillingEvent(transferData.getServerApproveAutorenewEvent())
+              .setAutorenewPollMessage(transferData.getServerApproveAutorenewPollMessage());
+      if (transferData.getTransferPeriod().getValue() == 1) {
+        // Set the grace period using a key to the prescheduled transfer billing event.  Not using
+        // GracePeriod.forBillingEvent() here in order to avoid the actual Datastore fetch.
+        builder.setGracePeriods(
+            ImmutableSet.of(
+                GracePeriod.create(
+                    GracePeriodStatus.TRANSFER,
+                    domain.getRepoId(),
+                    transferExpirationTime.plus(
+                        Registry.get(domain.getTld()).getTransferGracePeriodLength()),
+                    transferData.getGainingClientId(),
+                    transferData.getServerApproveBillingEvent())));
+      } else {
+        // There won't be a billing event, so we don't need a grace period
+        builder.setGracePeriods(ImmutableSet.of());
+      }
+      // Set all remaining transfer properties.
+      setAutomaticTransferSuccessProperties(builder, transferData);
+      builder
+          .setLastEppUpdateTime(transferExpirationTime)
+          .setLastEppUpdateClientId(transferData.getGainingClientId());
+      // Finish projecting to now.
+      return (T) builder.build().cloneProjectedAtTime(now);
+    }
+
+    Optional<DateTime> newLastEppUpdateTime = Optional.empty();
+
+    // There is no transfer. Do any necessary autorenews for active domains.
+
+    Builder builder = domain.asBuilder();
+    if (isBeforeOrAt(domain.getRegistrationExpirationTime(), now)
+        && END_OF_TIME.equals(domain.getDeletionTime())) {
+      // Autorenew by the number of years between the old expiration time and now.
+      DateTime lastAutorenewTime =
+          leapSafeAddYears(
+              domain.getRegistrationExpirationTime(),
+              new Interval(domain.getRegistrationExpirationTime(), now).toPeriod().getYears());
+      DateTime newExpirationTime = lastAutorenewTime.plusYears(1);
+      builder
+          .setRegistrationExpirationTime(newExpirationTime)
+          .addGracePeriod(
+              GracePeriod.createForRecurring(
+                  GracePeriodStatus.AUTO_RENEW,
+                  domain.getRepoId(),
+                  lastAutorenewTime.plus(
+                      Registry.get(domain.getTld()).getAutoRenewGracePeriodLength()),
+                  domain.getCurrentSponsorClientId(),
+                  domain.getAutorenewBillingEvent()));
+      newLastEppUpdateTime = Optional.of(lastAutorenewTime);
+    }
+
+    // Remove any grace periods that have expired.
+    T almostBuilt = (T) builder.build();
+    builder = almostBuilt.asBuilder();
+    for (GracePeriod gracePeriod : almostBuilt.getGracePeriods()) {
+      if (isBeforeOrAt(gracePeriod.getExpirationTime(), now)) {
+        builder.removeGracePeriod(gracePeriod);
+        if (!newLastEppUpdateTime.isPresent()
+            || isBeforeOrAt(newLastEppUpdateTime.get(), gracePeriod.getExpirationTime())) {
+          newLastEppUpdateTime = Optional.of(gracePeriod.getExpirationTime());
+        }
+      }
+    }
+
+    // It is possible that the lastEppUpdateClientId is different from current sponsor client
+    // id, so we have to do the comparison instead of having one variable just storing the most
+    // recent time.
+    if (newLastEppUpdateTime.isPresent()) {
+      if (domain.getLastEppUpdateTime() == null
+          || newLastEppUpdateTime.get().isAfter(domain.getLastEppUpdateTime())) {
+        builder
+            .setLastEppUpdateTime(newLastEppUpdateTime.get())
+            .setLastEppUpdateClientId(domain.getCurrentSponsorClientId());
+      }
+    }
+
+    // Handle common properties like setting or unsetting linked status. This also handles the
+    // general case of pending transfers for other resource types, but since we've always handled
+    // a pending transfer by this point that's a no-op for domains.
+    projectResourceOntoBuilderAtTime(almostBuilt, builder, now);
+    return (T) builder.build();
+  }
+
+  /** Return what the expiration time would be if the given number of years were added to it. */
+  public static DateTime extendRegistrationWithCap(
+      DateTime now, DateTime currentExpirationTime, @Nullable Integer extendedRegistrationYears) {
+    // We must cap registration at the max years (aka 10), even if that truncates the last year.
+    return earliestOf(
+        leapSafeAddYears(
+            currentExpirationTime, Optional.ofNullable(extendedRegistrationYears).orElse(0)),
+        leapSafeAddYears(now, MAX_REGISTRATION_YEARS));
+  }
+
+  /** Loads and returns the fully qualified host names of all linked nameservers. */
+  public ImmutableSortedSet<String> loadNameserverHostNames() {
+    return ofy()
+        .load()
+        .keys(getNameservers().stream().map(VKey::getOfyKey).collect(toImmutableSet()))
+        .values()
+        .stream()
+        .map(HostResource::getHostName)
+        .collect(toImmutableSortedSet(Ordering.natural()));
+  }
+
+  /** A key to the registrant who registered this domain. */
+  public VKey<ContactResource> getRegistrant() {
+    return registrantContact;
+  }
+
+  public VKey<ContactResource> getAdminContact() {
+    return adminContact;
+  }
+
+  public VKey<ContactResource> getBillingContact() {
+    return billingContact;
+  }
+
+  public VKey<ContactResource> getTechContact() {
+    return techContact;
+  }
+
+  /** Associated contacts for the domain (other than registrant). */
+  public ImmutableSet<DesignatedContact> getContacts() {
+    return nullToEmpty(allContacts).stream()
+        .filter(IS_REGISTRANT.negate())
+        .collect(toImmutableSet());
+  }
+
+  public DomainAuthInfo getAuthInfo() {
+    return authInfo;
+  }
+
+  /** Returns all referenced contacts from this domain or application. */
+  public ImmutableSet<VKey<ContactResource>> getReferencedContacts() {
+    return nullToEmptyImmutableCopy(allContacts).stream()
+        .map(DesignatedContact::getContactKey)
+        .filter(Objects::nonNull)
+        .collect(toImmutableSet());
+  }
+
+  public String getTld() {
+    return tld;
+  }
+
+  /**
+   * Sets the individual contact fields from {@code contacts}.
+   *
+   * <p>The registrant field is only set if {@code includeRegistrant} is true, as this field needs
+   * to be set in some circumstances but not in others.
+   */
+  void setContactFields(Set<DesignatedContact> contacts, boolean includeRegistrant) {
+    // Set the individual contact fields.
+    for (DesignatedContact contact : contacts) {
+      switch (contact.getType()) {
+        case BILLING:
+          billingContact = contact.getContactKey();
+          break;
+        case TECH:
+          techContact = contact.getContactKey();
+          break;
+        case ADMIN:
+          adminContact = contact.getContactKey();
+          break;
+        case REGISTRANT:
+          if (includeRegistrant) {
+            registrantContact = contact.getContactKey();
+          }
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown contact resource type: " + contact.getType());
+      }
+    }
+  }
+
+  @Override
+  public VKey<DomainBase> createVKey() {
+    throw new UnsupportedOperationException(
+        "DomainContent is not an actual persisted entity you can create a key to;"
+            + " use DomainBase instead");
+  }
+
+  /** Predicate to determine if a given {@link DesignatedContact} is the registrant. */
+  static final Predicate<DesignatedContact> IS_REGISTRANT =
+      (DesignatedContact contact) -> DesignatedContact.Type.REGISTRANT.equals(contact.type);
+
+  /** An override of {@link EppResource#asBuilder} with tighter typing. */
+  @Override
+  public Builder asBuilder() {
+    return new Builder<>(clone(this));
+  }
+
+  /** A builder for constructing {@link DomainBase}, since it is immutable. */
+  public static class Builder<T extends DomainContent, B extends Builder<T, B>>
+      extends EppResource.Builder<T, B> implements BuilderWithTransferData<DomainTransferData, B> {
+
+    public Builder() {}
+
+    Builder(T instance) {
+      super(instance);
+    }
+
+    @Override
+    public T build() {
+      T instance = getInstance();
+      // If TransferData is totally empty, set it to null.
+      if (DomainTransferData.EMPTY.equals(getInstance().transferData)) {
+        setTransferData(null);
+      }
+      // A DomainBase has status INACTIVE if there are no nameservers.
+      if (getInstance().getNameservers().isEmpty()) {
+        addStatusValue(StatusValue.INACTIVE);
+      } else { // There are nameservers, so make sure INACTIVE isn't there.
+        removeStatusValue(StatusValue.INACTIVE);
+      }
+
+      checkArgumentNotNull(emptyToNull(instance.fullyQualifiedDomainName), "Missing domainName");
+      if (instance.getRegistrant() == null
+          && instance.allContacts.stream().anyMatch(IS_REGISTRANT)) {
+        throw new IllegalArgumentException("registrant is null but is in allContacts");
+      }
+      checkArgumentNotNull(instance.getRegistrant(), "Missing registrant");
+      instance.tld = getTldFromDomainName(instance.fullyQualifiedDomainName);
+
+      T newDomain = super.build();
+      // Hibernate throws exception if gracePeriods is null because we enabled all cascadable
+      // operations and orphan removal.
+      newDomain.gracePeriods =
+          newDomain.gracePeriods == null ? ImmutableSet.of() : newDomain.gracePeriods;
+      return newDomain;
+    }
+
+    public B setDomainName(String domainName) {
+      checkArgument(
+          domainName.equals(canonicalizeDomainName(domainName)),
+          "Domain name must be in puny-coded, lower-case form");
+      getInstance().fullyQualifiedDomainName = domainName;
+      return thisCastToDerived();
+    }
+
+    public B setDsData(ImmutableSet<DelegationSignerData> dsData) {
+      getInstance().dsData = dsData;
+      return thisCastToDerived();
+    }
+
+    public B setRegistrant(VKey<ContactResource> registrant) {
+      // Replace the registrant contact inside allContacts.
+      getInstance().allContacts =
+          union(
+              getInstance().getContacts(),
+              DesignatedContact.create(
+                  DesignatedContact.Type.REGISTRANT, checkArgumentNotNull(registrant)));
+
+      // Set the registrant field specifically.
+      getInstance().registrantContact = registrant;
+      return thisCastToDerived();
+    }
+
+    public B setAuthInfo(DomainAuthInfo authInfo) {
+      getInstance().authInfo = authInfo;
+      return thisCastToDerived();
+    }
+
+    public B setNameservers(VKey<HostResource> nameserver) {
+      getInstance().nsHosts = ImmutableSet.of(nameserver);
+      return thisCastToDerived();
+    }
+
+    public B setNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
+      getInstance().nsHosts = forceEmptyToNull(nameservers);
+      return thisCastToDerived();
+    }
+
+    public B addNameserver(VKey<HostResource> nameserver) {
+      return addNameservers(ImmutableSet.of(nameserver));
+    }
+
+    public B addNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
+      return setNameservers(
+          ImmutableSet.copyOf(Sets.union(getInstance().getNameservers(), nameservers)));
+    }
+
+    public B removeNameserver(VKey<HostResource> nameserver) {
+      return removeNameservers(ImmutableSet.of(nameserver));
+    }
+
+    public B removeNameservers(ImmutableSet<VKey<HostResource>> nameservers) {
+      return setNameservers(
+          ImmutableSet.copyOf(difference(getInstance().getNameservers(), nameservers)));
+    }
+
+    public B setContacts(DesignatedContact contact) {
+      return setContacts(ImmutableSet.of(contact));
+    }
+
+    public B setContacts(ImmutableSet<DesignatedContact> contacts) {
+      checkArgument(contacts.stream().noneMatch(IS_REGISTRANT), "Registrant cannot be a contact");
+
+      // Replace the non-registrant contacts inside allContacts.
+      getInstance().allContacts =
+          Streams.concat(
+                  nullToEmpty(getInstance().allContacts).stream().filter(IS_REGISTRANT),
+                  contacts.stream())
+              .collect(toImmutableSet());
+
+      // Set the individual fields.
+      getInstance().setContactFields(contacts, false);
+      return thisCastToDerived();
+    }
+
+    public B addContacts(ImmutableSet<DesignatedContact> contacts) {
+      return setContacts(ImmutableSet.copyOf(Sets.union(getInstance().getContacts(), contacts)));
+    }
+
+    public B removeContacts(ImmutableSet<DesignatedContact> contacts) {
+      return setContacts(ImmutableSet.copyOf(difference(getInstance().getContacts(), contacts)));
+    }
+
+    public B setLaunchNotice(LaunchNotice launchNotice) {
+      getInstance().launchNotice = launchNotice;
+      return thisCastToDerived();
+    }
+
+    public B setIdnTableName(String idnTableName) {
+      getInstance().idnTableName = idnTableName;
+      return thisCastToDerived();
+    }
+
+    public B setSubordinateHosts(ImmutableSet<String> subordinateHosts) {
+      getInstance().subordinateHosts = subordinateHosts;
+      return thisCastToDerived();
+    }
+
+    public B addSubordinateHost(String hostToAdd) {
+      return setSubordinateHosts(
+          ImmutableSet.copyOf(union(getInstance().getSubordinateHosts(), hostToAdd)));
+    }
+
+    public B removeSubordinateHost(String hostToRemove) {
+      return setSubordinateHosts(
+          ImmutableSet.copyOf(
+              CollectionUtils.difference(getInstance().getSubordinateHosts(), hostToRemove)));
+    }
+
+    public B setRegistrationExpirationTime(DateTime registrationExpirationTime) {
+      getInstance().registrationExpirationTime = registrationExpirationTime;
+      return thisCastToDerived();
+    }
+
+    public B setDeletePollMessage(VKey<PollMessage.OneTime> deletePollMessage) {
+      getInstance().deletePollMessage = deletePollMessage;
+      return thisCastToDerived();
+    }
+
+    public B setAutorenewBillingEvent(VKey<BillingEvent.Recurring> autorenewBillingEvent) {
+      getInstance().autorenewBillingEvent = autorenewBillingEvent;
+      return thisCastToDerived();
+    }
+
+    public B setAutorenewPollMessage(VKey<PollMessage.Autorenew> autorenewPollMessage) {
+      getInstance().autorenewPollMessage = autorenewPollMessage;
+      return thisCastToDerived();
+    }
+
+    public B setSmdId(String smdId) {
+      getInstance().smdId = smdId;
+      return thisCastToDerived();
+    }
+
+    public B setGracePeriods(ImmutableSet<GracePeriod> gracePeriods) {
+      getInstance().gracePeriods = gracePeriods;
+      return thisCastToDerived();
+    }
+
+    public B addGracePeriod(GracePeriod gracePeriod) {
+      getInstance().gracePeriods = union(getInstance().getGracePeriods(), gracePeriod);
+      return thisCastToDerived();
+    }
+
+    public B removeGracePeriod(GracePeriod gracePeriod) {
+      getInstance().gracePeriods =
+          CollectionUtils.difference(getInstance().getGracePeriods(), gracePeriod);
+      return thisCastToDerived();
+    }
+
+    public B setAutorenewEndTime(Optional<DateTime> autorenewEndTime) {
+      getInstance().autorenewEndTime = autorenewEndTime.orElse(null);
+      return thisCastToDerived();
+    }
+
+    @Override
+    public B setTransferData(DomainTransferData transferData) {
+      getInstance().transferData = transferData;
+      return thisCastToDerived();
+    }
+
+    @Override
+    public B setLastTransferTime(DateTime lastTransferTime) {
+      getInstance().lastTransferTime = lastTransferTime;
+      return thisCastToDerived();
+    }
+  }
+}

core/src/main/java/google/registry/model/domain/DomainHistory.java

@@ -0,0 +1,243 @@
+// 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.model.domain;
+
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.googlecode.objectify.Key;
+import com.googlecode.objectify.annotation.EntitySubclass;
+import com.googlecode.objectify.annotation.Ignore;
+import google.registry.model.EppResource;
+import google.registry.model.ImmutableObject;
+import google.registry.model.domain.DomainHistory.DomainHistoryId;
+import google.registry.model.host.HostResource;
+import google.registry.model.reporting.DomainTransactionRecord;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.VKey;
+import java.io.Serializable;
+import java.util.Optional;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.PostLoad;
+import javax.persistence.Table;
+
+/**
+ * A persisted history entry representing an EPP modification to a domain.
+ *
+ * <p>In addition to the general history fields (e.g. action time, registrar ID) we also persist a
+ * copy of the domain entity at this point in time. We persist a raw {@link DomainContent} so that
+ * the foreign-keyed fields in that class can refer to this object.
+ */
+@Entity
+@Table(
+    indexes = {
+      @Index(columnList = "creationTime"),
+      @Index(columnList = "historyRegistrarId"),
+      @Index(columnList = "historyType"),
+      @Index(columnList = "historyModificationTime")
+    })
+@EntitySubclass
+@Access(AccessType.FIELD)
+@IdClass(DomainHistoryId.class)
+public class DomainHistory extends HistoryEntry {
+
+  // Store DomainContent instead of DomainBase so we don't pick up its @Id
+  @Nullable DomainContent domainContent;
+
+  @Id String domainRepoId;
+
+  // We could have reused domainContent.nsHosts here, but Hibernate throws a weird exception after
+  // we change to use a composite primary key.
+  // TODO(b/166776754): Investigate if we can reuse domainContent.nsHosts for storing host keys.
+  @Ignore
+  @ElementCollection
+  @JoinTable(name = "DomainHistoryHost")
+  @Column(name = "host_repo_id")
+  Set<VKey<HostResource>> nsHosts;
+
+  @Override
+  @Nullable
+  @Access(AccessType.PROPERTY)
+  @AttributeOverrides({
+      @AttributeOverride(
+          name = "unit",
+          column = @Column(name = "historyPeriodUnit")),
+      @AttributeOverride(
+          name = "value",
+          column = @Column(name = "historyPeriodValue"))
+  })
+  public Period getPeriod() {
+    return super.getPeriod();
+  }
+
+  /**
+   * For transfers, the id of the other registrar.
+   *
+   * <p>For requests and cancels, the other registrar is the losing party (because the registrar
+   * sending the EPP transfer command is the gaining party). For approves and rejects, the other
+   * registrar is the gaining party.
+   */
+  @Nullable
+  @Access(AccessType.PROPERTY)
+  @Column(name = "historyOtherRegistrarId")
+  public String getOtherRegistrarId() {
+    return super.getOtherClientId();
+  }
+
+  /**
+   * Logging field for transaction reporting.
+   *
+   * <p>This will be empty for any DomainHistory/HistoryEntry generated before this field was added,
+   * mid-2017, as well as any action that does not generate billable events (e.g. updates).
+   */
+  @Access(AccessType.PROPERTY)
+  @OneToMany(cascade = {CascadeType.ALL})
+  @JoinColumn(name = "historyRevisionId", referencedColumnName = "historyRevisionId")
+  @JoinColumn(name = "domainRepoId", referencedColumnName = "domainRepoId")
+  @Override
+  public Set<DomainTransactionRecord> getDomainTransactionRecords() {
+    return super.getDomainTransactionRecords();
+  }
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
+  @Column(name = "historyRevisionId")
+  @Access(AccessType.PROPERTY)
+  @Override
+  public long getId() {
+    return super.getId();
+  }
+
+  /** Returns keys to the {@link HostResource} that are the nameservers for the domain. */
+  public Set<VKey<HostResource>> getNsHosts() {
+    return nsHosts;
+  }
+
+  /**
+   * The values of all the fields on the {@link DomainContent} object after the action represented
+   * by this history object was executed.
+   *
+   * <p>Will be absent for objects created prior to the Registry 3.0 SQL migration.
+   */
+  public Optional<DomainContent> getDomainContent() {
+    return Optional.ofNullable(domainContent);
+  }
+
+  /** The key to the {@link DomainBase} this is based off of. */
+  public VKey<DomainBase> getDomainRepoId() {
+    return VKey.create(DomainBase.class, domainRepoId, Key.create(DomainBase.class, domainRepoId));
+  }
+
+  public VKey<DomainHistory> createVKey() {
+    return VKey.createSql(DomainHistory.class, new DomainHistoryId(domainRepoId, getId()));
+  }
+
+  @PostLoad
+  void postLoad() {
+    if (domainContent != null) {
+      domainContent.nsHosts = nullToEmptyImmutableCopy(nsHosts);
+      // Normally Hibernate would see that the domain fields are all null and would fill
+      // domainContent with a null object. Unfortunately, the updateTimestamp is never null in SQL.
+      if (domainContent.getDomainName() == null) {
+        domainContent = null;
+      }
+    }
+    parent = Key.create(DomainBase.class, domainRepoId);
+  }
+
+  /** Class to represent the composite primary key of {@link DomainHistory} entity. */
+  static class DomainHistoryId extends ImmutableObject implements Serializable {
+
+    private String domainRepoId;
+
+    private Long id;
+
+    /** Hibernate requires this default constructor. */
+    private DomainHistoryId() {}
+
+    DomainHistoryId(String domainRepoId, long id) {
+      this.domainRepoId = domainRepoId;
+      this.id = id;
+    }
+
+    String getDomainRepoId() {
+      return domainRepoId;
+    }
+
+    void setDomainRepoId(String domainRepoId) {
+      this.domainRepoId = domainRepoId;
+    }
+
+    long getId() {
+      return id;
+    }
+
+    void setId(long id) {
+      this.id = id;
+    }
+  }
+
+  @Override
+  public Builder asBuilder() {
+    return new Builder(clone(this));
+  }
+
+  public static class Builder extends HistoryEntry.Builder<DomainHistory, DomainHistory.Builder> {
+
+    public Builder() {}
+
+    public Builder(DomainHistory instance) {
+      super(instance);
+    }
+
+    public Builder setDomainContent(DomainContent domainContent) {
+      getInstance().domainContent = domainContent;
+      if (domainContent != null) {
+        getInstance().nsHosts = nullToEmptyImmutableCopy(domainContent.nsHosts);
+      }
+      return this;
+    }
+
+    public Builder setDomainRepoId(String domainRepoId) {
+      getInstance().domainRepoId = domainRepoId;
+      getInstance().parent = Key.create(DomainBase.class, domainRepoId);
+      return this;
+    }
+
+    // We can remove this once all HistoryEntries are converted to History objects
+    @Override
+    public Builder setParent(Key<? extends EppResource> parent) {
+      super.setParent(parent);
+      getInstance().domainRepoId = parent.getName();
+      return this;
+    }
+  }
+}

core/src/main/java/google/registry/model/domain/GracePeriod.java

@@ -18,16 +18,14 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.googlecode.objectify.annotation.Embed;
-import com.googlecode.objectify.annotation.Ignore;
-import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Recurring;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.persistence.VKey;
 import javax.annotation.Nullable;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
 import org.joda.time.DateTime;
 
 /**
@@ -37,75 +35,13 @@ import org.joda.time.DateTime;
  * the resource is loaded from Datastore.
  */
 @Embed
-@javax.persistence.Entity
-public class GracePeriod extends ImmutableObject {
-
-  @javax.persistence.Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Ignore
-  /** Unique id required for hibernate representation. */
-  long id;
-
-  /** The type of grace period. */
-  GracePeriodStatus type;
-
-  /** When the grace period ends. */
-  DateTime expirationTime;
-
-  /** The registrar to bill. */
-  @Column(name = "registrarId")
-  String clientId;
-
-  /**
-   * The one-time billing event corresponding to the action that triggered this grace period, or
-   * null if not applicable. Not set for autorenew grace periods (which instead use the field {@code
-   * billingEventRecurring}) or for redemption grace periods (since deletes have no cost).
-   */
-  // NB: Would @IgnoreSave(IfNull.class), but not allowed for @Embed collections.
-  VKey<BillingEvent.OneTime> billingEventOneTime = null;
-
-  /**
-   * The recurring billing event corresponding to the action that triggered this grace period, if
-   * applicable - i.e. if the action was an autorenew - or null in all other cases.
-   */
-  // NB: Would @IgnoreSave(IfNull.class), but not allowed for @Embed collections.
-  VKey<BillingEvent.Recurring> billingEventRecurring = null;
-
-  public GracePeriodStatus getType() {
-    return type;
-  }
-
-  public DateTime getExpirationTime() {
-    return expirationTime;
-  }
-
-  public String getClientId() {
-    return clientId;
-  }
-
-  /** Returns true if this GracePeriod has an associated BillingEvent; i.e. if it's refundable. */
-  public boolean hasBillingEvent() {
-    return billingEventOneTime != null || billingEventRecurring != null;
-  }
-
-  /**
-   * Returns the one time billing event. The value will only be non-null if the type of this grace
-   * period is not AUTO_RENEW.
-   */
-  public VKey<BillingEvent.OneTime> getOneTimeBillingEvent() {
-    return billingEventOneTime;
-  }
-
-  /**
-   * Returns the recurring billing event. The value will only be non-null if the type of this grace
-   * period is AUTO_RENEW.
-   */
-  public VKey<BillingEvent.Recurring> getRecurringBillingEvent() {
-    return billingEventRecurring;
-  }
+@Entity
+@Table(indexes = @Index(columnList = "domainRepoId"))
+public class GracePeriod extends GracePeriodBase {
 
   private static GracePeriod createInternal(
       GracePeriodStatus type,
+      String domainRepoId,
       DateTime expirationTime,
       String clientId,
       @Nullable VKey<BillingEvent.OneTime> billingEventOneTime,
@@ -117,6 +53,7 @@ public class GracePeriod extends ImmutableObject {
         "Recurring billing events must be present on (and only on) autorenew grace periods");
     GracePeriod instance = new GracePeriod();
     instance.type = checkArgumentNotNull(type);
+    instance.domainRepoId = checkArgumentNotNull(domainRepoId);
     instance.expirationTime = checkArgumentNotNull(expirationTime);
     instance.clientId = checkArgumentNotNull(clientId);
     instance.billingEventOneTime = billingEventOneTime;
@@ -133,32 +70,51 @@ public class GracePeriod extends ImmutableObject {
    */
   public static GracePeriod create(
       GracePeriodStatus type,
+      String domainRepoId,
       DateTime expirationTime,
       String clientId,
       @Nullable VKey<BillingEvent.OneTime> billingEventOneTime) {
-    return createInternal(type, expirationTime, clientId, billingEventOneTime, null);
+    return createInternal(type, domainRepoId, expirationTime, clientId, billingEventOneTime, null);
   }
 
   /** Creates a GracePeriod for a Recurring billing event. */
   public static GracePeriod createForRecurring(
       GracePeriodStatus type,
+      String domainRepoId,
       DateTime expirationTime,
       String clientId,
       VKey<Recurring> billingEventRecurring) {
     checkArgumentNotNull(billingEventRecurring, "billingEventRecurring cannot be null");
-    return createInternal(type, expirationTime, clientId, null, billingEventRecurring);
+    return createInternal(
+        type, domainRepoId, expirationTime, clientId, null, billingEventRecurring);
   }
 
   /** Creates a GracePeriod with no billing event. */
   public static GracePeriod createWithoutBillingEvent(
-      GracePeriodStatus type, DateTime expirationTime, String clientId) {
-    return createInternal(type, expirationTime, clientId, null, null);
+      GracePeriodStatus type, String domainRepoId, DateTime expirationTime, String clientId) {
+    return createInternal(type, domainRepoId, expirationTime, clientId, null, null);
   }
 
   /** Constructs a GracePeriod of the given type from the provided one-time BillingEvent. */
   public static GracePeriod forBillingEvent(
-      GracePeriodStatus type, BillingEvent.OneTime billingEvent) {
+      GracePeriodStatus type, String domainRepoId, BillingEvent.OneTime billingEvent) {
     return create(
-        type, billingEvent.getBillingTime(), billingEvent.getClientId(), billingEvent.createVKey());
+        type,
+        domainRepoId,
+        billingEvent.getBillingTime(),
+        billingEvent.getClientId(),
+        billingEvent.createVKey());
   }
+
+  /**
+   * Returns a clone of this {@link GracePeriod} with {@link #domainRepoId} set to the given value.
+   *
+   * <p>TODO(b/162739503): Remove this function after fully migrating to Cloud SQL.
+   */
+  public GracePeriod cloneWithDomainRepoId(String domainRepoId) {
+    GracePeriod clone = clone(this);
+    clone.domainRepoId = checkArgumentNotNull(domainRepoId);
+    return clone;
+  }
+
 }

core/src/main/java/google/registry/model/domain/GracePeriodBase.java

@@ -0,0 +1,114 @@
+// 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.model.domain;
+
+import com.googlecode.objectify.annotation.Embed;
+import com.googlecode.objectify.annotation.Ignore;
+import google.registry.model.ImmutableObject;
+import google.registry.model.billing.BillingEvent;
+import google.registry.model.billing.BillingEvent.OneTime;
+import google.registry.model.domain.rgp.GracePeriodStatus;
+import google.registry.persistence.VKey;
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.MappedSuperclass;
+import org.joda.time.DateTime;
+
+/** Base class containing common fields and methods for {@link GracePeriod}. */
+@Embed
+@MappedSuperclass
+public class GracePeriodBase extends ImmutableObject {
+
+  /** Unique id required for hibernate representation. */
+  @javax.persistence.Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Ignore
+  Long id;
+
+  /** Repository id for the domain which this grace period belongs to. */
+  @Ignore
+  @Column(nullable = false)
+  String domainRepoId;
+
+  /** The type of grace period. */
+  @Column(nullable = false)
+  @Enumerated(EnumType.STRING)
+  GracePeriodStatus type;
+
+  /** When the grace period ends. */
+  @Column(nullable = false)
+  DateTime expirationTime;
+
+  /** The registrar to bill. */
+  @Column(name = "registrarId", nullable = false)
+  String clientId;
+
+  /**
+   * The one-time billing event corresponding to the action that triggered this grace period, or
+   * null if not applicable. Not set for autorenew grace periods (which instead use the field {@code
+   * billingEventRecurring}) or for redemption grace periods (since deletes have no cost).
+   */
+  // NB: Would @IgnoreSave(IfNull.class), but not allowed for @Embed collections.
+  @Column(name = "billing_event_id")
+  VKey<OneTime> billingEventOneTime = null;
+
+  /**
+   * The recurring billing event corresponding to the action that triggered this grace period, if
+   * applicable - i.e. if the action was an autorenew - or null in all other cases.
+   */
+  // NB: Would @IgnoreSave(IfNull.class), but not allowed for @Embed collections.
+  @Column(name = "billing_recurrence_id")
+  VKey<BillingEvent.Recurring> billingEventRecurring = null;
+
+  public GracePeriodStatus getType() {
+    return type;
+  }
+
+  public String getDomainRepoId() {
+    return domainRepoId;
+  }
+
+  public DateTime getExpirationTime() {
+    return expirationTime;
+  }
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  /** Returns true if this GracePeriod has an associated BillingEvent; i.e. if it's refundable. */
+  public boolean hasBillingEvent() {
+    return billingEventOneTime != null || billingEventRecurring != null;
+  }
+
+  /**
+   * Returns the one time billing event. The value will only be non-null if the type of this grace
+   * period is not AUTO_RENEW.
+   */
+  public VKey<BillingEvent.OneTime> getOneTimeBillingEvent() {
+    return billingEventOneTime;
+  }
+
+  /**
+   * Returns the recurring billing event. The value will only be non-null if the type of this grace
+   * period is AUTO_RENEW.
+   */
+  public VKey<BillingEvent.Recurring> getRecurringBillingEvent() {
+    return billingEventRecurring;
+  }
+}

core/src/main/java/google/registry/model/domain/Period.java

@@ -31,9 +31,9 @@ public class Period extends ImmutableObject {
   @XmlAttribute
   Unit unit;
 
-  @XmlValue
-  Integer value;
+  @XmlValue Integer value;
 
+  @Enumerated(EnumType.STRING)
   public Unit getUnit() {
     return unit;
   }
@@ -42,6 +42,18 @@ public class Period extends ImmutableObject {
     return value;
   }
 
+  /** This method exists solely to satisfy Hibernate. Use {@link #create(int, Unit)} instead. */
+  @SuppressWarnings("UnusedMethod")
+  private void setUnit(Unit unit) {
+    this.unit = unit;
+  }
+
+  /** This method exists solely to satisfy Hibernate. Use {@link #create(int, Unit)} instead. */
+  @SuppressWarnings("UnusedMethod")
+  private void setValue(Integer value) {
+    this.value = value;
+  }
+
   /** The unit enum. */
   public enum Unit {
     @XmlEnumValue("y")

core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java

@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /** A superuser extension that may be present on domain delete commands. */
 @XmlRootElement(name = "domainDelete")
 public class DomainDeleteSuperuserExtension extends SuperuserExtension {
+
   @XmlElement(name = "redemptionGracePeriodDays")
   int redemptionGracePeriodDays;
 

core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java

@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /** A superuser extension that may be present on domain transfer request commands. */
 @XmlRootElement(name = "domainTransferRequest")
 public class DomainTransferRequestSuperuserExtension extends SuperuserExtension {
+
   // We need to specify the period here because the transfer object's period cannot be set to zero.
   @XmlElement(name = "renewalPeriod")
   Period renewalPeriod;

core/src/main/java/google/registry/model/domain/superuser/DomainUpdateSuperuserExtension.java

@@ -0,0 +1,35 @@
+// 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.model.domain.superuser;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/** A superuser extension that may be present on domain update commands. */
+@XmlRootElement(name = "domainUpdate")
+public class DomainUpdateSuperuserExtension extends SuperuserExtension {
+
+  @XmlElement(name = "autorenews")
+  @Nullable
+  String autorenews;
+
+  public Optional<Boolean> getAutorenews() {
+    return Optional.ofNullable(isNullOrEmpty(autorenews) ? null : Boolean.valueOf(autorenews));
+  }
+}

core/src/main/java/google/registry/model/domain/token/AllocationToken.java

@@ -29,12 +29,14 @@ import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.Range;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.annotation.Mapify;
+import com.googlecode.objectify.annotation.OnLoad;
 import google.registry.flows.EppException;
 import google.registry.flows.domain.DomainFlowUtils;
 import google.registry.model.BackupGroupRoot;
@@ -47,16 +49,32 @@ import google.registry.model.common.TimedTransitionProperty.TimedTransition;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
+import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Table;
 import org.joda.time.DateTime;
 
 /** An entity representing an allocation token. */
 @ReportedOn
 @Entity
 @WithStringVKey
-public class AllocationToken extends BackupGroupRoot implements Buildable {
+@javax.persistence.Entity
+@Table(
+    indexes = {
+      @javax.persistence.Index(
+          columnList = "token",
+          name = "allocation_token_token_idx",
+          unique = true),
+      @javax.persistence.Index(
+          columnList = "domainName",
+          name = "allocation_token_domain_name_idx"),
+    })
+public class AllocationToken extends BackupGroupRoot implements Buildable, DatastoreAndSqlEntity {
 
   // Promotions should only move forward, and ENDED / CANCELLED are terminal states.
   private static final ImmutableMultimap<TokenStatus, TokenStatus> VALID_TOKEN_STATUS_TRANSITIONS =
@@ -84,19 +102,22 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
   }
 
   /** The allocation token string. */
-  @Id String token;
+  @javax.persistence.Id @Id String token;
 
   /** The key of the history entry for which the token was used. Null if not yet used. */
-  @Nullable @Index Key<HistoryEntry> redemptionHistoryEntry;
+  @Nullable @Index VKey<HistoryEntry> redemptionHistoryEntry;
 
   /** The fully-qualified domain name that this token is limited to, if any. */
   @Nullable @Index String domainName;
 
   /** When this token was created. */
+  @Column(nullable = false)
   CreateAutoTimestamp creationTime = CreateAutoTimestamp.create(null);
 
   /** Allowed registrar client IDs for this token, or null if all registrars are allowed. */
-  @Nullable Set<String> allowedClientIds;
+  @Column(name = "allowedRegistrarIds")
+  @Nullable
+  Set<String> allowedClientIds;
 
   /** Allowed TLDs for this token, or null if all TLDs are allowed. */
   @Nullable Set<String> allowedTlds;
@@ -108,9 +129,23 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
    */
   double discountFraction;
 
+  /** Whether the discount fraction (if any) also applies to premium names. Defaults to false. */
+  boolean discountPremiums;
+
+  /** Up to how many years of initial creation receive the discount (if any). Defaults to 1. */
+  int discountYears = 1;
+
   /** The type of the token, either single-use or unlimited-use. */
-  // TODO(b/130301183): this should not be nullable, we can remove this once we're sure it isn't
-  @Nullable TokenType tokenType;
+  @Enumerated(EnumType.STRING)
+  TokenType tokenType;
+
+  // TODO: Remove onLoad once all allocation tokens are migrated to have a discountYears of 1.
+  @OnLoad
+  void onLoad() {
+    if (discountYears == 0) {
+      discountYears = 1;
+    }
+  }
 
   /**
    * Promotional token validity periods.
@@ -146,8 +181,8 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
     return token;
   }
 
-  public Key<HistoryEntry> getRedemptionHistoryEntry() {
-    return redemptionHistoryEntry;
+  public Optional<VKey<HistoryEntry>> getRedemptionHistoryEntry() {
+    return Optional.ofNullable(redemptionHistoryEntry);
   }
 
   public boolean isRedeemed() {
@@ -162,7 +197,7 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
     return Optional.ofNullable(creationTime.getTimestamp());
   }
 
-  public ImmutableSet<String> getAllowedClientIds() {
+  public ImmutableSet<String> getAllowedRegistrarIds() {
     return nullToEmptyImmutableCopy(allowedClientIds);
   }
 
@@ -174,6 +209,16 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
     return discountFraction;
   }
 
+  public boolean shouldDiscountPremiums() {
+    return discountPremiums;
+  }
+
+  public int getDiscountYears() {
+    // Allocation tokens created prior to the addition of the discountYears field will have a value
+    // of 0 for it, but it should be the default value of 1 to retain the previous behavior.
+    return Math.max(1, discountYears);
+  }
+
   public TokenType getTokenType() {
     return tokenType;
   }
@@ -183,7 +228,7 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
   }
 
   public VKey<AllocationToken> createVKey() {
-    return VKey.create(getClass(), getToken(), Key.create(this));
+    return VKey.create(AllocationToken.class, getToken(), Key.create(this));
   }
 
   @Override
@@ -193,6 +238,7 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
 
   /** A builder for constructing {@link AllocationToken} objects, since they are immutable. */
   public static class Builder extends Buildable.Builder<AllocationToken> {
+
     public Builder() {}
 
     private Builder(AllocationToken instance) {
@@ -210,6 +256,12 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
           getInstance().redemptionHistoryEntry == null
               || TokenType.SINGLE_USE.equals(getInstance().tokenType),
           "Redemption history entry can only be specified for SINGLE_USE tokens");
+      checkArgument(
+          getInstance().discountFraction > 0 || !getInstance().discountPremiums,
+          "Discount premiums can only be specified along with a discount fraction");
+      checkArgument(
+          getInstance().discountFraction > 0 || getInstance().discountYears == 1,
+          "Discount years can only be specified along with a discount fraction");
       if (getInstance().domainName != null) {
         try {
           DomainFlowUtils.validateDomainName(getInstance().domainName);
@@ -228,7 +280,7 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
       return this;
     }
 
-    public Builder setRedemptionHistoryEntry(Key<HistoryEntry> redemptionHistoryEntry) {
+    public Builder setRedemptionHistoryEntry(VKey<HistoryEntry> redemptionHistoryEntry) {
       getInstance().redemptionHistoryEntry =
           checkArgumentNotNull(redemptionHistoryEntry, "Redemption history entry must not be null");
       return this;
@@ -247,8 +299,8 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
       return this;
     }
 
-    public Builder setAllowedClientIds(Set<String> allowedClientIds) {
-      getInstance().allowedClientIds = forceEmptyToNull(allowedClientIds);
+    public Builder setAllowedRegistrarIds(Set<String> allowedRegistrarIds) {
+      getInstance().allowedClientIds = forceEmptyToNull(allowedRegistrarIds);
       return this;
     }
 
@@ -258,10 +310,26 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
     }
 
     public Builder setDiscountFraction(double discountFraction) {
+      checkArgument(
+          Range.closed(0.0d, 1.0d).contains(discountFraction),
+          "Discount fraction must be between 0 and 1 inclusive");
       getInstance().discountFraction = discountFraction;
       return this;
     }
 
+    public Builder setDiscountPremiums(boolean discountPremiums) {
+      getInstance().discountPremiums = discountPremiums;
+      return this;
+    }
+
+    public Builder setDiscountYears(int discountYears) {
+      checkArgument(
+          Range.closed(1, 10).contains(discountYears),
+          "Discount years must be between 1 and 10 inclusive");
+      getInstance().discountYears = discountYears;
+      return this;
+    }
+
     public Builder setTokenType(TokenType tokenType) {
       checkState(getInstance().tokenType == null, "Token type can only be set once");
       getInstance().tokenType = tokenType;

core/src/main/java/google/registry/model/eppinput/EppInput.java

@@ -50,6 +50,7 @@ import google.registry.model.domain.secdns.SecDnsCreateExtension;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.domain.superuser.DomainDeleteSuperuserExtension;
 import google.registry.model.domain.superuser.DomainTransferRequestSuperuserExtension;
+import google.registry.model.domain.superuser.DomainUpdateSuperuserExtension;
 import google.registry.model.domain.token.AllocationTokenExtension;
 import google.registry.model.eppinput.ResourceCommand.ResourceCheck;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
@@ -309,53 +310,62 @@ public class EppInput extends ImmutableObject {
   @XmlType(propOrder = {"command", "extension", "clTRID"})
   public static class CommandWrapper extends ImmutableObject {
     @XmlElements({
-        @XmlElement(name = "check", type = Check.class),
-        @XmlElement(name = "create", type = Create.class),
-        @XmlElement(name = "delete", type = Delete.class),
-        @XmlElement(name = "info", type = Info.class),
-        @XmlElement(name = "login", type = Login.class),
-        @XmlElement(name = "logout", type = Logout.class),
-        @XmlElement(name = "poll", type = Poll.class),
-        @XmlElement(name = "renew", type = Renew.class),
-        @XmlElement(name = "transfer", type = Transfer.class),
-        @XmlElement(name = "update", type = Update.class) })
+      @XmlElement(name = "check", type = Check.class),
+      @XmlElement(name = "create", type = Create.class),
+      @XmlElement(name = "delete", type = Delete.class),
+      @XmlElement(name = "info", type = Info.class),
+      @XmlElement(name = "login", type = Login.class),
+      @XmlElement(name = "logout", type = Logout.class),
+      @XmlElement(name = "poll", type = Poll.class),
+      @XmlElement(name = "renew", type = Renew.class),
+      @XmlElement(name = "transfer", type = Transfer.class),
+      @XmlElement(name = "update", type = Update.class)
+    })
     InnerCommand command;
 
     /** Zero or more command extensions. */
     @XmlElementRefs({
-        // allocation token extension
-        @XmlElementRef(type = AllocationTokenExtension.class),
-        // fee extension version 0.6
-        @XmlElementRef(type = FeeCheckCommandExtensionV06.class),
-        @XmlElementRef(type = FeeInfoCommandExtensionV06.class),
-        @XmlElementRef(type = FeeCreateCommandExtensionV06.class),
-        @XmlElementRef(type = FeeRenewCommandExtensionV06.class),
-        @XmlElementRef(type = FeeTransferCommandExtensionV06.class),
-        @XmlElementRef(type = FeeUpdateCommandExtensionV06.class),
-        // fee extension version 0.11
-        @XmlElementRef(type = FeeCheckCommandExtensionV11.class),
-        @XmlElementRef(type = FeeCreateCommandExtensionV11.class),
-        @XmlElementRef(type = FeeRenewCommandExtensionV11.class),
-        @XmlElementRef(type = FeeTransferCommandExtensionV11.class),
-        @XmlElementRef(type = FeeUpdateCommandExtensionV11.class),
-        // fee extension version 0.12
-        @XmlElementRef(type = FeeCheckCommandExtensionV12.class),
-        @XmlElementRef(type = FeeCreateCommandExtensionV12.class),
-        @XmlElementRef(type = FeeRenewCommandExtensionV12.class),
-        @XmlElementRef(type = FeeTransferCommandExtensionV12.class),
-        @XmlElementRef(type = FeeUpdateCommandExtensionV12.class),
-        // other extensions
-        @XmlElementRef(type = LaunchCheckExtension.class),
-        @XmlElementRef(type = LaunchCreateExtension.class),
-        @XmlElementRef(type = LaunchDeleteExtension.class),
-        @XmlElementRef(type = LaunchInfoExtension.class),
-        @XmlElementRef(type = LaunchUpdateExtension.class),
-        @XmlElementRef(type = MetadataExtension.class),
-        @XmlElementRef(type = RgpUpdateExtension.class),
-        @XmlElementRef(type = SecDnsCreateExtension.class),
-        @XmlElementRef(type = SecDnsUpdateExtension.class),
-        @XmlElementRef(type = DomainTransferRequestSuperuserExtension.class),
-        @XmlElementRef(type = DomainDeleteSuperuserExtension.class) })
+      // Fee extension version 0.6
+      @XmlElementRef(type = FeeCheckCommandExtensionV06.class),
+      @XmlElementRef(type = FeeInfoCommandExtensionV06.class),
+      @XmlElementRef(type = FeeCreateCommandExtensionV06.class),
+      @XmlElementRef(type = FeeRenewCommandExtensionV06.class),
+      @XmlElementRef(type = FeeTransferCommandExtensionV06.class),
+      @XmlElementRef(type = FeeUpdateCommandExtensionV06.class),
+
+      // Fee extension version 0.11
+      @XmlElementRef(type = FeeCheckCommandExtensionV11.class),
+      @XmlElementRef(type = FeeCreateCommandExtensionV11.class),
+      @XmlElementRef(type = FeeRenewCommandExtensionV11.class),
+      @XmlElementRef(type = FeeTransferCommandExtensionV11.class),
+      @XmlElementRef(type = FeeUpdateCommandExtensionV11.class),
+
+      // Fee extension version 0.12
+      @XmlElementRef(type = FeeCheckCommandExtensionV12.class),
+      @XmlElementRef(type = FeeCreateCommandExtensionV12.class),
+      @XmlElementRef(type = FeeRenewCommandExtensionV12.class),
+      @XmlElementRef(type = FeeTransferCommandExtensionV12.class),
+      @XmlElementRef(type = FeeUpdateCommandExtensionV12.class),
+
+      // Launch phase extensions
+      @XmlElementRef(type = LaunchCheckExtension.class),
+      @XmlElementRef(type = LaunchCreateExtension.class),
+      @XmlElementRef(type = LaunchDeleteExtension.class),
+      @XmlElementRef(type = LaunchInfoExtension.class),
+      @XmlElementRef(type = LaunchUpdateExtension.class),
+
+      // Superuser extensions
+      @XmlElementRef(type = DomainDeleteSuperuserExtension.class),
+      @XmlElementRef(type = DomainTransferRequestSuperuserExtension.class),
+      @XmlElementRef(type = DomainUpdateSuperuserExtension.class),
+
+      // Other extensions
+      @XmlElementRef(type = AllocationTokenExtension.class),
+      @XmlElementRef(type = MetadataExtension.class),
+      @XmlElementRef(type = RgpUpdateExtension.class),
+      @XmlElementRef(type = SecDnsCreateExtension.class),
+      @XmlElementRef(type = SecDnsUpdateExtension.class)
+    })
     @XmlElementWrapper
     List<CommandExtension> extension;
 

core/src/main/java/google/registry/model/host/HostBase.java

@@ -22,7 +22,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.condition.IfNull;
@@ -126,7 +125,9 @@ public class HostBase extends EppResource {
 
   @Override
   public VKey<? extends HostBase> createVKey() {
-    return VKey.create(HostBase.class, getRepoId(), Key.create(this));
+    throw new UnsupportedOperationException(
+        "HostBase is not an actual persisted entity you can create a key to;"
+            + " use HostResource instead");
   }
 
   @Deprecated

core/src/main/java/google/registry/model/host/HostHistory.java

@@ -15,11 +15,20 @@
 package google.registry.model.host;
 
 import com.googlecode.objectify.Key;
+import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PostLoad;
 
 /**
  * A persisted history entry representing an EPP modification to a host.
@@ -37,17 +46,33 @@ import javax.persistence.Entity;
       @javax.persistence.Index(columnList = "historyType"),
       @javax.persistence.Index(columnList = "historyModificationTime")
     })
+@EntitySubclass
+@Access(AccessType.FIELD)
 public class HostHistory extends HistoryEntry {
 
   // Store HostBase instead of HostResource so we don't pick up its @Id
-  HostBase hostBase;
+  @Nullable HostBase hostBase;
 
   @Column(nullable = false)
   VKey<HostResource> hostRepoId;
 
-  /** The state of the {@link HostBase} object at this point in time. */
-  public HostBase getHostBase() {
-    return hostBase;
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
+  @Column(name = "historyRevisionId")
+  @Access(AccessType.PROPERTY)
+  @Override
+  public long getId() {
+    return super.getId();
+  }
+
+  /**
+   * The values of all the fields on the {@link HostBase} object after the action represented by
+   * this history object was executed.
+   *
+   * <p>Will be absent for objects created prior to the Registry 3.0 SQL migration.
+   */
+  public Optional<HostBase> getHostBase() {
+    return Optional.ofNullable(hostBase);
   }
 
   /** The key to the {@link google.registry.model.host.HostResource} this is based off of. */
@@ -55,6 +80,19 @@ public class HostHistory extends HistoryEntry {
     return hostRepoId;
   }
 
+  @PostLoad
+  void postLoad() {
+    // Normally Hibernate would see that the host fields are all null and would fill hostBase
+    // with a null object. Unfortunately, the updateTimestamp is never null in SQL.
+    if (hostBase != null && hostBase.getHostName() == null) {
+      hostBase = null;
+    }
+    // Fill in the full, symmetric, parent repo ID key
+    Key<HostResource> parentKey = Key.create(HostResource.class, (String) hostRepoId.getSqlKey());
+    parent = parentKey;
+    hostRepoId = VKey.create(HostResource.class, hostRepoId.getSqlKey(), parentKey);
+  }
+
   @Override
   public Builder asBuilder() {
     return new Builder(clone(this));
@@ -83,7 +121,8 @@ public class HostHistory extends HistoryEntry {
     @Override
     public Builder setParent(Key<? extends EppResource> parent) {
       super.setParent(parent);
-      getInstance().hostRepoId = VKey.create(HostResource.class, parent.getName(), parent);
+      getInstance().hostRepoId =
+          VKey.create(HostResource.class, parent.getName(), (Key<HostResource>) parent);
       return this;
     }
   }

core/src/main/java/google/registry/model/host/HostResource.java

@@ -32,7 +32,7 @@ import javax.persistence.AccessType;
  */
 @ReportedOn
 @Entity
-@javax.persistence.Entity
+@javax.persistence.Entity(name = "Host")
 @ExternalMessagingName("host")
 @WithStringVKey
 @Access(AccessType.FIELD) // otherwise it'll use the default if the repoId (property)

core/src/main/java/google/registry/model/index/EppResourceIndex.java

@@ -17,6 +17,7 @@ package google.registry.model.index;
 import static google.registry.util.TypeUtils.instantiate;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
@@ -25,11 +26,13 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.EppResource;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 
 /** An index that allows for quick enumeration of all EppResource entities (e.g. via map reduce). */
 @ReportedOn
 @Entity
-public class EppResourceIndex extends BackupGroupRoot {
+public class EppResourceIndex extends BackupGroupRoot implements DatastoreEntity {
 
   @Id
   String id;
@@ -74,4 +77,9 @@ public class EppResourceIndex extends BackupGroupRoot {
   public static <T extends EppResource> EppResourceIndex create(Key<T> resourceKey) {
     return create(EppResourceIndexBucket.getBucketKey(resourceKey), resourceKey);
   }
+
+  @Override
+  public ImmutableList<SqlEntity> toSqlEntities() {
+    return ImmutableList.of(); // not relevant in SQL
+  }
 }

core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java

@@ -24,16 +24,23 @@ import com.googlecode.objectify.annotation.Id;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.VirtualEntity;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 
 /** A virtual entity to represent buckets to which EppResourceIndex objects are randomly added. */
 @Entity
 @VirtualEntity
-public class EppResourceIndexBucket extends ImmutableObject {
+public class EppResourceIndexBucket extends ImmutableObject implements DatastoreEntity {
 
   @SuppressWarnings("unused")
   @Id
   private long bucketId;
 
+  @Override
+  public ImmutableList<SqlEntity> toSqlEntities() {
+    return ImmutableList.of(); // not relevant in SQL
+  }
+
   /**
    * Deterministic function that returns a bucket id based on the resource's roid.
    * NB: At the moment, nothing depends on this being deterministic, so we have the ability to

core/src/main/java/google/registry/model/index/ForeignKeyIndex.java

@@ -43,6 +43,8 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 import google.registry.util.NonFinalForTesting;
 import java.util.Map;
 import java.util.Optional;
@@ -61,28 +63,44 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
   /** The {@link ForeignKeyIndex} type for {@link ContactResource} entities. */
   @ReportedOn
   @Entity
-  public static class ForeignKeyContactIndex extends ForeignKeyIndex<ContactResource> {}
+  public static class ForeignKeyContactIndex extends ForeignKeyIndex<ContactResource>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }
 
   /** The {@link ForeignKeyIndex} type for {@link DomainBase} entities. */
   @ReportedOn
   @Entity
-  public static class ForeignKeyDomainIndex extends ForeignKeyIndex<DomainBase> {}
+  public static class ForeignKeyDomainIndex extends ForeignKeyIndex<DomainBase>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }
 
   /** The {@link ForeignKeyIndex} type for {@link HostResource} entities. */
   @ReportedOn
   @Entity
-  public static class ForeignKeyHostIndex extends ForeignKeyIndex<HostResource> {}
+  public static class ForeignKeyHostIndex extends ForeignKeyIndex<HostResource>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }
 
-  static final ImmutableMap<
-          Class<? extends EppResource>, Class<? extends ForeignKeyIndex<?>>>
+  static final ImmutableMap<Class<? extends EppResource>, Class<? extends ForeignKeyIndex<?>>>
       RESOURCE_CLASS_TO_FKI_CLASS =
           ImmutableMap.of(
               ContactResource.class, ForeignKeyContactIndex.class,
               DomainBase.class, ForeignKeyDomainIndex.class,
               HostResource.class, ForeignKeyHostIndex.class);
 
-  @Id
-  String foreignKey;
+  @Id String foreignKey;
 
   /**
    * The deletion time of this {@link ForeignKeyIndex}.
@@ -90,8 +108,7 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
    * <p>This will generally be equal to the deletion time of {@link #topReference}. However, in the
    * case of a {@link HostResource} that was renamed, this field will hold the time of the rename.
    */
-  @Index
-  DateTime deletionTime;
+  @Index DateTime deletionTime;
 
   /**
    * The referenced resource.

core/src/main/java/google/registry/model/ofy/DatastoreTransactionManager.java

@@ -24,13 +24,16 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.googlecode.objectify.Key;
+import google.registry.model.contact.ContactHistory;
+import google.registry.model.host.HostHistory;
+import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.TransactionManager;
-import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
 /** Datastore implementation of {@link TransactionManager}. */
@@ -98,31 +101,28 @@ public class DatastoreTransactionManager implements TransactionManager {
   }
 
   @Override
-  public void saveNew(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+  public void insert(Object entity) {
+    saveEntity(entity);
   }
 
   @Override
-  public void saveAllNew(ImmutableCollection<?> entities) {
+  public void insertAll(ImmutableCollection<?> entities) {
     getOfy().save().entities(entities);
   }
 
   @Override
-  public void saveNewOrUpdate(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+  public void put(Object entity) {
+    saveEntity(entity);
   }
 
   @Override
-  public void saveNewOrUpdateAll(ImmutableCollection<?> entities) {
+  public void putAll(ImmutableCollection<?> entities) {
     getOfy().save().entities(entities);
   }
 
   @Override
   public void update(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+    saveEntity(entity);
   }
 
   @Override
@@ -131,13 +131,13 @@ public class DatastoreTransactionManager implements TransactionManager {
   }
 
   @Override
-  public boolean checkExists(Object entity) {
+  public boolean exists(Object entity) {
     return getOfy().load().key(Key.create(entity)).now() != null;
   }
 
   @Override
-  public <T> boolean checkExists(VKey<T> key) {
-    return getOfy().load().key(key.getOfyKey()).now() != null;
+  public <T> boolean exists(VKey<T> key) {
+    return loadNullable(key) != null;
   }
 
   // TODO: add tests for these methods.  They currently have some degree of test coverage because
@@ -146,12 +146,12 @@ public class DatastoreTransactionManager implements TransactionManager {
   // interface tests that are applied to both the datastore and SQL implementations.
   @Override
   public <T> Optional<T> maybeLoad(VKey<T> key) {
-    return Optional.ofNullable(getOfy().load().key(key.getOfyKey()).now());
+    return Optional.ofNullable(loadNullable(key));
   }
 
   @Override
   public <T> T load(VKey<T> key) {
-    T result = getOfy().load().key(key.getOfyKey()).now();
+    T result = loadNullable(key);
     if (result == null) {
       throw new NoSuchElementException(key.toString());
     }
@@ -167,7 +167,10 @@ public class DatastoreTransactionManager implements TransactionManager {
             .collect(toImmutableMap(key -> (Key<T>) key.getOfyKey(), Functions.identity()));
 
     return getOfy().load().keys(keyMap.keySet()).entrySet().stream()
-        .collect(ImmutableMap.toImmutableMap(entry -> keyMap.get(entry.getKey()), Entry::getValue));
+        .collect(
+            toImmutableMap(
+                entry -> keyMap.get(entry.getKey()),
+                entry -> toChildHistoryEntryIfPossible(entry.getValue())));
   }
 
   @Override
@@ -191,4 +194,37 @@ public class DatastoreTransactionManager implements TransactionManager {
             .collect(toImmutableList());
     getOfy().delete().keys(list).now();
   }
+
+  /**
+   * The following three methods exist due to the migration to Cloud SQL.
+   *
+   * <p>In Cloud SQL, {@link HistoryEntry} objects are represented instead as {@link DomainHistory},
+   * {@link ContactHistory}, and {@link HostHistory} objects. During the migration, we do not wish
+   * to change the Datastore schema so all of these objects are stored in Datastore as HistoryEntry
+   * objects. They are converted to/from the appropriate classes upon retrieval, and converted to
+   * HistoryEntry on save. See go/r3.0-history-objects for more details.
+   */
+  private void saveEntity(Object entity) {
+    checkArgumentNotNull(entity, "entity must be specified");
+    if (entity instanceof HistoryEntry) {
+      entity = ((HistoryEntry) entity).asHistoryEntry();
+    }
+    getOfy().save().entity(entity);
+  }
+
+  @SuppressWarnings("unchecked")
+  private <T> T toChildHistoryEntryIfPossible(@Nullable T obj) {
+    // NB: The Key of the object in question may not necessarily be the resulting class that we
+    // wish to have. Because all *History classes are @EntitySubclasses, their Keys will have type
+    // HistoryEntry -- even if you create them based off the *History class.
+    if (obj != null && HistoryEntry.class.isAssignableFrom(obj.getClass())) {
+      return (T) ((HistoryEntry) obj).toChildHistoryEntity();
+    }
+    return obj;
+  }
+
+  @Nullable
+  private <T> T loadNullable(VKey<T> key) {
+    return toChildHistoryEntryIfPossible(getOfy().load().key(key.getOfyKey()).now());
+  }
 }

core/src/main/java/google/registry/model/poll/PollMessage.java

@@ -45,6 +45,7 @@ import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
+import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.List;
 import java.util.Optional;
 import javax.persistence.AttributeOverride;
@@ -92,7 +93,7 @@ import org.joda.time.DateTime;
       @javax.persistence.Index(columnList = "eventTime")
     })
 public abstract class PollMessage extends ImmutableObject
-    implements Buildable, TransferServerApproveEntity {
+    implements Buildable, DatastoreAndSqlEntity, TransferServerApproveEntity {
 
   /** Entity id. */
   @Id
@@ -155,15 +156,7 @@ public abstract class PollMessage extends ImmutableObject
   public abstract VKey<? extends PollMessage> createVKey();
 
   public static VKey<PollMessage> createVKey(Key<PollMessage> key) {
-    // TODO(b/159207551): As it stands, the SQL key generated here doesn't mesh with the primary key
-    // type for the table, which is a single long integer.  Also note that the class id is not
-    // correct here and as such the resulting key will not be loadable from SQL.
-    if (key == null) {
-      return null;
-    }
-    String path =
-        key.getParent().getParent().getName() + "/" + key.getParent().getId() + key.getId();
-    return VKey.create(PollMessage.class, path, key);
+    return VKey.create(PollMessage.class, key.getId(), key);
   }
 
   /** Override Buildable.asBuilder() to give this method stronger typing. */
@@ -309,7 +302,7 @@ public abstract class PollMessage extends ImmutableObject
 
     @Override
     public VKey<OneTime> createVKey() {
-      return VKey.create(this.getClass(), getId(), Key.create(this));
+      return VKey.create(OneTime.class, getId(), Key.create(this));
     }
 
     @Override
@@ -410,7 +403,7 @@ public abstract class PollMessage extends ImmutableObject
 
     @Override
     public VKey<Autorenew> createVKey() {
-      return VKey.create(this.getClass(), getId(), Key.create(this));
+      return VKey.create(Autorenew.class, getId(), Key.create(this));
     }
 
     @Override

core/src/main/java/google/registry/model/registrar/Registrar.java

@@ -73,6 +73,7 @@ import google.registry.model.annotations.ReportedOn;
 import google.registry.model.common.EntityGroupRoot;
 import google.registry.model.registrar.Registrar.BillingAccountEntry.CurrencyMapper;
 import google.registry.model.registry.Registry;
+import google.registry.persistence.VKey;
 import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.util.CidrAddressBlock;
 import java.security.cert.CertificateParsingException;
@@ -703,6 +704,10 @@ public class Registrar extends ImmutableObject
     return new Builder(clone(this));
   }
 
+  public VKey<Registrar> createVKey() {
+    return VKey.create(Registrar.class, clientIdentifier, Key.create(this));
+  }
+
   /** A builder for constructing {@link Registrar}, since it is immutable. */
   public static class Builder extends Buildable.Builder<Registrar> {
     public Builder() {}

core/src/main/java/google/registry/model/registrar/RegistrarContact.java

@@ -20,6 +20,7 @@ import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.io.BaseEncoding.base64;
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.registrar.Registrar.checkValidEmail;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -35,20 +36,26 @@ import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
+import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.Index;
+import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.JsonMapBuilder;
 import google.registry.model.Jsonifiable;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.model.registrar.RegistrarContact.RegistrarPocId;
+import google.registry.persistence.VKey;
 import google.registry.schema.replay.DatastoreAndSqlEntity;
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.persistence.Column;
+import javax.persistence.IdClass;
+import javax.persistence.PostLoad;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -59,16 +66,17 @@ import javax.persistence.Transient;
  * <p>IMPORTANT NOTE: Any time that you change, update, or delete RegistrarContact entities, you
  * *MUST* also modify the persisted Registrar entity with {@link Registrar#contactsRequireSyncing}
  * set to true.
+ *
+ * <p>TODO(b/163366543): Rename the class name to RegistrarPoc after database migration
  */
 @ReportedOn
 @Entity
-@javax.persistence.Entity
+@javax.persistence.Entity(name = "RegistrarPoc")
 @Table(
-    name = "RegistrarPoc",
     indexes = {
       @javax.persistence.Index(columnList = "gaeUserId", name = "registrarpoc_gae_user_id_idx")
     })
-// TODO(shicong): Rename the class name to RegistrarPoc after database migration
+@IdClass(RegistrarPocId.class)
 public class RegistrarContact extends ImmutableObject
     implements DatastoreAndSqlEntity, Jsonifiable {
 
@@ -113,9 +121,10 @@ public class RegistrarContact extends ImmutableObject
   /** The email address of the contact. */
   @Id
   @javax.persistence.Id
-  @Column(nullable = false)
   String emailAddress;
 
+  @Ignore @javax.persistence.Id String registrarId;
+
   /** External email address of this contact used for registry lock confirmations. */
   String registryLockEmailAddress;
 
@@ -342,6 +351,39 @@ public class RegistrarContact extends ImmutableObject
         .build();
   }
 
+  /** Sets Cloud SQL specific fields when the entity is loaded from Datastore. */
+  @OnLoad
+  void onLoad() {
+    registrarId = parent.getName();
+  }
+
+  /** Sets Datastore specific fields when the entity is loaded from Cloud SQL. */
+  @PostLoad
+  void postLoad() {
+    parent = Key.create(getCrossTldKey(), Registrar.class, registrarId);
+  }
+
+  public VKey<RegistrarContact> createVKey() {
+    return VKey.create(
+        RegistrarContact.class, new RegistrarPocId(emailAddress, registrarId), Key.create(this));
+  }
+
+  /** Class to represent the composite primary key for {@link RegistrarContact} entity. */
+  static class RegistrarPocId extends ImmutableObject implements Serializable {
+
+    String emailAddress;
+
+    String registrarId;
+
+    // Hibernate requires this default constructor.
+    private RegistrarPocId() {}
+
+    RegistrarPocId(String emailAddress, String registrarId) {
+      this.emailAddress = emailAddress;
+      this.registrarId = registrarId;
+    }
+  }
+
   /** A builder for constructing a {@link RegistrarContact}, since it is immutable. */
   public static class Builder extends Buildable.Builder<RegistrarContact> {
     public Builder() {}
@@ -372,6 +414,7 @@ public class RegistrarContact extends ImmutableObject
             !isNullOrEmpty(getInstance().registryLockEmailAddress),
             "Registry lock email must not be null if allowing registry lock access");
       }
+      getInstance().registrarId = getInstance().parent.getName();
       return cloneEmptyToNull(super.build());
     }
 

core/src/main/java/google/registry/model/registry/Registry.java

@@ -70,6 +70,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.PostLoad;
+import javax.persistence.Transient;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -78,21 +85,31 @@ import org.joda.time.Duration;
 /** Persisted per-TLD configuration data. */
 @ReportedOn
 @Entity
+@javax.persistence.Entity(name = "Tld")
 public class Registry extends ImmutableObject implements Buildable {
 
-  @Parent Key<EntityGroupRoot> parent = getCrossTldKey();
+  @Parent @Transient Key<EntityGroupRoot> parent = getCrossTldKey();
 
   /**
    * The canonical string representation of the TLD associated with this {@link Registry}, which is
    * the standard ASCII for regular TLDs and punycoded ASCII for IDN TLDs.
    */
-  @Id String tldStrId;
+  @Id
+  @javax.persistence.Id
+  @Column(name = "tld_name", nullable = false)
+  String tldStrId;
 
   /**
    * A duplicate of {@link #tldStrId}, to simplify BigQuery reporting since the id field becomes
    * {@code __key__.name} rather than being exported as a named field.
    */
-  String tldStr;
+  @Transient String tldStr;
+
+  /** Sets the Datastore specific field, tldStr, when the entity is loaded from Cloud SQL */
+  @PostLoad
+  void postLoad() {
+    tldStr = tldStrId;
+  }
 
   /** The suffix that identifies roids as belonging to this specific tld, e.g. -HOW for .how. */
   String roidSuffix;
@@ -116,6 +133,7 @@ public class Registry extends ImmutableObject implements Buildable {
   public static final Money DEFAULT_RENEW_BILLING_COST = Money.of(USD, 8);
   public static final Money DEFAULT_RESTORE_BILLING_COST = Money.of(USD, 100);
   public static final Money DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST = Money.of(USD, 20);
+  public static final Money DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST = Money.of(USD, 0);
 
   /** The type of TLD, which determines things like backups and escrow policy. */
   public enum TldType {
@@ -289,6 +307,7 @@ public class Registry extends ImmutableObject implements Buildable {
    * <p>All entries of this list must be valid keys for the map of {@code DnsWriter}s injected by
    * <code>@Inject Map<String, DnsWriter></code>
    */
+  @Column(nullable = false)
   Set<String> dnsWriters;
 
   /**
@@ -312,6 +331,7 @@ public class Registry extends ImmutableObject implements Buildable {
    * <p>Failure to do so can result in parallel writes to the {@link
    * google.registry.dns.writer.DnsWriter}, which may be dangerous depending on your implementation.
    */
+  @Column(nullable = false)
   int numDnsPublishLocks;
 
   /** Updates an unset numDnsPublishLocks (0) to the standard default of 1. */
@@ -327,6 +347,7 @@ public class Registry extends ImmutableObject implements Buildable {
    * <p>This will be equal to {@link #tldStr} for ASCII TLDs, but will be non-ASCII for IDN TLDs. We
    * store this in a field so that it will be retained upon import into BigQuery.
    */
+  @Column(nullable = false)
   String tldUnicode;
 
   /**
@@ -334,31 +355,37 @@ public class Registry extends ImmutableObject implements Buildable {
    *
    * <p>This is optional; if not configured, then information won't be exported for this TLD.
    */
-  String driveFolderId;
+  @Nullable String driveFolderId;
 
   /** The type of the TLD, whether it's real or for testing. */
+  @Column(nullable = false)
+  @Enumerated(EnumType.STRING)
   TldType tldType = TldType.REAL;
 
   /**
-   * Whether to disable invoicing for a {@link TldType#REAL} TLD.
+   * Whether to enable invoicing for this TLD.
    *
-   * <p>Note that invoicing is always disabled for {@link TldType#TEST} TLDs. Setting this field has
-   * no effect for {@link TldType#TEST} TLDs.
+   * <p>Note that this boolean is the sole determiner on whether invoices should be generated for a
+   * TLD. This applies to {@link TldType#TEST} TLDs as well.
    */
-  boolean disableInvoicing = false;
+  @Column(nullable = false)
+  boolean invoicingEnabled = false;
 
   /**
    * A property that transitions to different TldStates at different times. Stored as a list of
    * TldStateTransition embedded objects using the @Mapify annotation.
    */
+  @Column(nullable = false)
   @Mapify(TimedTransitionProperty.TimeMapper.class)
   TimedTransitionProperty<TldState, TldStateTransition> tldStateTransitions =
       TimedTransitionProperty.forMapify(DEFAULT_TLD_STATE, TldStateTransition.class);
 
   /** An automatically managed creation timestamp. */
+  @Column(nullable = false)
   CreateAutoTimestamp creationTime = CreateAutoTimestamp.create(null);
 
   /** The set of reserved lists that are applicable to this registry. */
+  @Column(name = "reserved_list_names", nullable = false)
   Set<Key<ReservedList>> reservedLists;
 
   /** Retrieves an ImmutableSet of all ReservedLists associated with this tld. */
@@ -367,12 +394,15 @@ public class Registry extends ImmutableObject implements Buildable {
   }
 
   /** The static {@link PremiumList} for this TLD, if there is one. */
+  @Column(name = "premium_list_name", nullable = true)
   Key<PremiumList> premiumList;
 
   /** Should RDE upload a nightly escrow deposit for this TLD? */
+  @Column(nullable = false)
   boolean escrowEnabled = DEFAULT_ESCROW_ENABLED;
 
   /** Whether the pull queue that writes to authoritative DNS is paused for this TLD. */
+  @Column(nullable = false)
   boolean dnsPaused = DEFAULT_DNS_PAUSED;
 
   /**
@@ -381,41 +411,85 @@ public class Registry extends ImmutableObject implements Buildable {
    * <p>Domain deletes are free and effective immediately so long as they take place within this
    * amount of time following creation.
    */
+  @Column(nullable = false)
   Duration addGracePeriodLength = DEFAULT_ADD_GRACE_PERIOD;
 
   /** The length of the anchor tenant add grace period for this TLD. */
+  @Column(nullable = false)
   Duration anchorTenantAddGracePeriodLength = DEFAULT_ANCHOR_TENANT_ADD_GRACE_PERIOD;
 
   /** The length of the auto renew grace period for this TLD. */
+  @Column(nullable = false)
   Duration autoRenewGracePeriodLength = DEFAULT_AUTO_RENEW_GRACE_PERIOD;
 
   /** The length of the redemption grace period for this TLD. */
+  @Column(nullable = false)
   Duration redemptionGracePeriodLength = DEFAULT_REDEMPTION_GRACE_PERIOD;
 
   /** The length of the renew grace period for this TLD. */
+  @Column(nullable = false)
   Duration renewGracePeriodLength = DEFAULT_RENEW_GRACE_PERIOD;
 
   /** The length of the transfer grace period for this TLD. */
+  @Column(nullable = false)
   Duration transferGracePeriodLength = DEFAULT_TRANSFER_GRACE_PERIOD;
 
   /** The length of time before a transfer is automatically approved for this TLD. */
+  @Column(nullable = false)
   Duration automaticTransferLength = DEFAULT_AUTOMATIC_TRANSFER_LENGTH;
 
   /** The length of time a domain spends in the non-redeemable pending delete phase for this TLD. */
+  @Column(nullable = false)
   Duration pendingDeleteLength = DEFAULT_PENDING_DELETE_LENGTH;
 
   /** The currency unit for all costs associated with this TLD. */
+  @Column(nullable = false)
   CurrencyUnit currency = DEFAULT_CURRENCY;
 
   /** The per-year billing cost for registering a new domain name. */
+  @AttributeOverrides({
+    @AttributeOverride(
+        name = "money.amount",
+        column = @Column(name = "create_billing_cost_amount")),
+    @AttributeOverride(
+        name = "money.currency",
+        column = @Column(name = "create_billing_cost_currency"))
+  })
   Money createBillingCost = DEFAULT_CREATE_BILLING_COST;
 
   /** The one-time billing cost for restoring a domain name from the redemption grace period. */
+  @AttributeOverrides({
+    @AttributeOverride(
+        name = "money.amount",
+        column = @Column(name = "restore_billing_cost_amount")),
+    @AttributeOverride(
+        name = "money.currency",
+        column = @Column(name = "restore_billing_cost_currency"))
+  })
   Money restoreBillingCost = DEFAULT_RESTORE_BILLING_COST;
 
   /** The one-time billing cost for changing the server status (i.e. lock). */
+  @AttributeOverrides({
+    @AttributeOverride(
+        name = "money.amount",
+        column = @Column(name = "server_status_change_billing_cost_amount")),
+    @AttributeOverride(
+        name = "money.currency",
+        column = @Column(name = "server_status_change_billing_cost_currency"))
+  })
   Money serverStatusChangeBillingCost = DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST;
 
+  /** The one-time billing cost for a registry lock/unlock action initiated by a registrar. */
+  @AttributeOverrides({
+      @AttributeOverride(
+          name = "money.amount",
+          column = @Column(name = "registry_lock_or_unlock_cost_amount")),
+      @AttributeOverride(
+          name = "money.currency",
+          column = @Column(name = "registry_lock_or_unlock_cost_currency"))
+  })
+  Money registryLockOrUnlockBillingCost = DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST;
+
   /**
    * A property that transitions to different renew billing costs at different times. Stored as a
    * list of BillingCostTransition embedded objects using the @Mapify annotation.
@@ -424,11 +498,13 @@ public class Registry extends ImmutableObject implements Buildable {
    * name. This cost is also used to compute costs for transfers, since each transfer includes a
    * renewal to ensure transfers have a cost.
    */
+  @Column(nullable = false)
   @Mapify(TimedTransitionProperty.TimeMapper.class)
   TimedTransitionProperty<Money, BillingCostTransition> renewBillingCostTransitions =
       TimedTransitionProperty.forMapify(DEFAULT_RENEW_BILLING_COST, BillingCostTransition.class);
 
   /** A property that tracks the EAP fee schedule (if any) for the TLD. */
+  @Column(nullable = false)
   @Mapify(TimedTransitionProperty.TimeMapper.class)
   TimedTransitionProperty<Money, BillingCostTransition> eapFeeSchedule =
       TimedTransitionProperty.forMapify(DEFAULT_EAP_BILLING_COST, BillingCostTransition.class);
@@ -437,13 +513,14 @@ public class Registry extends ImmutableObject implements Buildable {
   String lordnUsername;
 
   /** The end of the claims period (at or after this time, claims no longer applies). */
+  @Column(nullable = false)
   DateTime claimsPeriodEnd = END_OF_TIME;
 
   /** An allow list of clients allowed to be used on domains on this TLD (ignored if empty). */
-  Set<String> allowedRegistrantContactIds;
+  @Nullable Set<String> allowedRegistrantContactIds;
 
   /** An allow list of hosts allowed to be used on domains on this TLD (ignored if empty). */
-  Set<String> allowedFullyQualifiedHostNames;
+  @Nullable Set<String> allowedFullyQualifiedHostNames;
 
   public String getTldStr() {
     return tldStr;
@@ -566,6 +643,11 @@ public class Registry extends ImmutableObject implements Buildable {
     return serverStatusChangeBillingCost;
   }
 
+  /** Returns the cost of a registry lock/unlock. */
+  public Money getRegistryLockOrUnlockBillingCost() {
+    return registryLockOrUnlockBillingCost;
+  }
+
   public ImmutableSortedMap<DateTime, TldState> getTldStateTransitions() {
     return tldStateTransitions.toValueMap();
   }
@@ -646,8 +728,8 @@ public class Registry extends ImmutableObject implements Buildable {
       return this;
     }
 
-    public Builder setDisableInvoicing(boolean disableInvoicing) {
-      getInstance().disableInvoicing = disableInvoicing;
+    public Builder setInvoicingEnabled(boolean invoicingEnabled) {
+      getInstance().invoicingEnabled = invoicingEnabled;
       return this;
     }
 
@@ -867,6 +949,12 @@ public class Registry extends ImmutableObject implements Buildable {
       return this;
     }
 
+    public Builder setRegistryLockOrUnlockBillingCost(Money amount) {
+      checkArgument(amount.isPositiveOrZero(), "Registry lock/unlock cost cannot be negative");
+      getInstance().registryLockOrUnlockBillingCost = amount;
+      return this;
+    }
+
     public Builder setLordnUsername(String username) {
       getInstance().lordnUsername = username;
       return this;
@@ -918,6 +1006,9 @@ public class Registry extends ImmutableObject implements Buildable {
       checkArgument(
           instance.getServerStatusChangeCost().getCurrencyUnit().equals(instance.currency),
           "Server status change cost must be in the registry's currency");
+      checkArgument(
+          instance.getRegistryLockOrUnlockBillingCost().getCurrencyUnit().equals(instance.currency),
+          "Registry lock/unlock cost must be in the registry's currency");
       Predicate<Money> currencyCheck =
           (Money money) -> money.getCurrencyUnit().equals(instance.currency);
       checkArgument(

core/src/main/java/google/registry/model/registry/label/PremiumList.java

@@ -114,7 +114,7 @@ public final class PremiumList extends BaseDomainLabelList<Money, PremiumList.Pr
   /** Virtual parent entity for premium list entry entities associated with a single revision. */
   @ReportedOn
   @Entity
-  public static class PremiumListRevision extends ImmutableObject {
+  public static class PremiumListRevision extends ImmutableObject implements DatastoreEntity {
 
     @Parent Key<PremiumList> parent;
 
@@ -171,6 +171,11 @@ public final class PremiumList extends BaseDomainLabelList<Money, PremiumList.Pr
       }
       return revision;
     }
+
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not persisted in SQL
+    }
   }
 
   /**

core/src/main/java/google/registry/model/registry/label/ReservedListDualWriteDao.java

@@ -43,7 +43,7 @@ public class ReservedListDualWriteDao {
 
   /** Persist a new reserved list to Cloud SQL. */
   public static void save(ReservedList reservedList) {
-    ofyTm().transact(() -> ofyTm().saveNewOrUpdate(reservedList));
+    ofyTm().transact(() -> ofyTm().put(reservedList));
     try {
       logger.atInfo().log("Saving reserved list %s to Cloud SQL", reservedList.getName());
       ReservedListSqlDao.save(reservedList);

core/src/main/java/google/registry/model/registry/label/ReservedListSqlDao.java

@@ -31,7 +31,7 @@ public class ReservedListSqlDao {
   /** Persist a new reserved list to Cloud SQL. */
   public static void save(ReservedList reservedList) {
     checkArgumentNotNull(reservedList, "Must specify reservedList");
-    jpaTm().transact(() -> jpaTm().saveNew(reservedList));
+    jpaTm().transact(() -> jpaTm().insert(reservedList));
   }
 
   /**